Skip to content

Commit

Permalink
moved classes to org.gtreimagined.gt5r package
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Nov 5, 2024
1 parent 321cf9b commit dc7c6d2
Show file tree
Hide file tree
Showing 282 changed files with 2,655 additions and 2,614 deletions.
1,491 changes: 0 additions & 1,491 deletions common/src/main/java/muramasa/gregtech/data/GT5RMaterialEvents.java
View file

This file was deleted.

2 changes: 0 additions & 2 deletions common/src/main/java/muramasa/gregtech/loader/SimpleMachineLoader.java
View file

This file was deleted.

11 changes: 0 additions & 11 deletions common/src/main/java/muramasa/gregtech/loader/machines/FermenterLoader.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...in/java/muramasa/gregtech/GT5RConfig.java → ...ava/org/gtreimagined/gt5r/GT5RConfig.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech;
package org.gtreimagined.gt5r;

import carbonconfiglib.config.Config;
import carbonconfiglib.config.ConfigEntry;
Expand Down
6 changes: 3 additions & 3 deletions .../muramasa/gregtech/GT5RPostRegistrar.java → .../gtreimagined/gt5r/GT5RPostRegistrar.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package muramasa.gregtech;
package org.gtreimagined.gt5r;

import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.event.MaterialEvent;
import muramasa.antimatter.registration.IAntimatterRegistrar;
import muramasa.antimatter.registration.RegistrationEvent;
import muramasa.antimatter.registration.Side;
import muramasa.antimatter.util.AntimatterPlatformUtils;
import muramasa.gregtech.data.GT5RMaterialEvents;
import muramasa.gregtech.material.GregTechMaterialEvent;
import org.gtreimagined.gt5r.data.GT5RMaterialEvents;
import org.gtreimagined.gt5r.material.GregTechMaterialEvent;

public class GT5RPostRegistrar implements IAntimatterRegistrar {
public GT5RPostRegistrar(){
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/muramasa/gregtech/GT5RRef.java → ...n/java/org/gtreimagined/gt5r/GT5RRef.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech;
package org.gtreimagined.gt5r;

import muramasa.antimatter.Ref;

Expand Down
41 changes: 25 additions & 16 deletions ...java/muramasa/gregtech/GT5Reimagined.java → .../org/gtreimagined/gt5r/GT5Reimagined.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
package muramasa.gregtech;
package org.gtreimagined.gt5r;

import org.gtreimagined.gt5r.client.GT5RModelManager;
import gtreimagined.gt5r.data.*;
import gtreimagined.gt5r.datagen.*;
import org.gtreimagined.gt5r.data.*;
import org.gtreimagined.gt5r.datagen.*;
import org.gtreimagined.gt5r.loader.crafting.*;
import org.gtreimagined.gt5r.loader.machines.*;
import org.gtreimagined.gt5r.loader.multi.*;
import org.gtreimagined.gt5r.proxy.CommonHandler;
import org.gtreimagined.gt5r.integration.AppliedEnergisticsRegistrar;
import org.gtreimagined.gt5r.integration.SpaceModRegistrar;
import org.gtreimagined.gt5r.integration.rei.REIRegistrar;
import org.gtreimagined.datagen.*;
import org.gtreimagined.gt5r.loader.machines.generator.Fuels;
import org.gtreimagined.gt5r.loader.machines.generator.LargeBoilerLoader;
import org.gtreimagined.gt5r.loader.machines.generator.SolidFuelBoilerLoader;
import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.AntimatterMod;
import muramasa.antimatter.Ref;
Expand All @@ -20,27 +36,20 @@
import muramasa.antimatter.registration.Side;
import muramasa.antimatter.tool.IAntimatterTool;
import muramasa.antimatter.util.AntimatterPlatformUtils;
import muramasa.gregtech.block.BlockAsphalt;
import muramasa.gregtech.client.GT5RModelManager;
import muramasa.gregtech.data.*;
import muramasa.gregtech.datagen.*;
import muramasa.gregtech.integration.AppliedEnergisticsRegistrar;
import muramasa.gregtech.integration.SpaceModRegistrar;
import muramasa.gregtech.integration.rei.REIRegistrar;
import muramasa.gregtech.loader.crafting.*;
import muramasa.gregtech.loader.items.Circuitry;
import muramasa.gregtech.loader.machines.*;
import muramasa.gregtech.loader.machines.generator.Fuels;
import muramasa.gregtech.loader.machines.generator.LargeBoilerLoader;
import muramasa.gregtech.loader.machines.generator.SolidFuelBoilerLoader;
import muramasa.gregtech.loader.multi.*;
import muramasa.gregtech.proxy.CommonHandler;
import org.gtreimagined.gt5r.block.BlockAsphalt;
import muramasa.gt5r.data.*;
import muramasa.gt5r.datagen.*;
import muramasa.gt5r.loader.crafting.*;
import org.gtreimagined.gt5r.loader.items.Circuitry;
import muramasa.gt5r.loader.machines.*;
import muramasa.gt5r.loader.multi.*;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.level.block.state.BlockState;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.gtreimagined.data.*;
import org.gtreimagined.gtcore.data.GTCoreItems;

import java.util.Arrays;
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/muramasa/gregtech/GTRemapping.java → ...va/org/gtreimagined/gt5r/GTRemapping.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech;
package org.gtreimagined.gt5r;

import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
import muramasa.antimatter.AntimatterAPI;
Expand All @@ -10,7 +10,7 @@

import java.util.Map;

import static muramasa.gregtech.data.Machines.*;
import static org.gtreimagined.gt5r.data.Machines.*;

public class GTRemapping {
private static final Map<String, String> REMAPPING_MAP = new Object2ObjectArrayMap<>();
Expand Down
4 changes: 2 additions & 2 deletions ...muramasa/gregtech/block/BlockAsphalt.java → ...gtreimagined/gt5r/block/BlockAsphalt.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import org.gtreimagined.gt5r.GT5RRef;
import muramasa.antimatter.block.BlockBasic;
import muramasa.antimatter.registration.IColorHandler;
import muramasa.antimatter.texture.Texture;
import muramasa.gregtech.GT5RRef;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
Expand Down
4 changes: 2 additions & 2 deletions ...masa/gregtech/block/BlockAsphaltSlab.java → ...imagined/gt5r/block/BlockAsphaltSlab.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import org.gtreimagined.gt5r.GT5RRef;
import muramasa.antimatter.block.BlockBasicSlab;
import muramasa.antimatter.registration.IColorHandler;
import muramasa.antimatter.texture.Texture;
import muramasa.gregtech.GT5RRef;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
Expand Down
4 changes: 2 additions & 2 deletions ...asa/gregtech/block/BlockAsphaltStair.java → ...magined/gt5r/block/BlockAsphaltStair.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import org.gtreimagined.gt5r.GT5RRef;
import muramasa.antimatter.block.BlockBasicStair;
import muramasa.antimatter.registration.IColorHandler;
import muramasa.antimatter.texture.Texture;
import muramasa.gregtech.GT5RRef;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
Expand Down
2 changes: 1 addition & 1 deletion .../muramasa/gregtech/block/BlockCasing.java → .../gtreimagined/gt5r/block/BlockCasing.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...va/muramasa/gregtech/block/BlockCoil.java → ...rg/gtreimagined/gt5r/block/BlockCoil.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import muramasa.antimatter.block.BlockBasic;
import muramasa.antimatter.texture.Texture;
Expand Down
4 changes: 2 additions & 2 deletions ...masa/gregtech/block/BlockColoredWall.java → ...imagined/gt5r/block/BlockColoredWall.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import org.gtreimagined.gt5r.GT5RRef;
import muramasa.antimatter.block.BlockFakeTile;
import muramasa.antimatter.material.Material;
import muramasa.antimatter.registration.IColorHandler;
import muramasa.antimatter.texture.Texture;
import muramasa.gregtech.GT5RRef;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
Expand Down
2 changes: 1 addition & 1 deletion ...amasa/gregtech/block/BlockFakeCasing.java → ...eimagined/gt5r/block/BlockFakeCasing.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import muramasa.antimatter.block.BlockFakeTile;
import muramasa.antimatter.texture.Texture;
Expand Down
8 changes: 4 additions & 4 deletions ...amasa/gregtech/block/BlockMiningPipe.java → ...eimagined/gt5r/block/BlockMiningPipe.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import org.gtreimagined.gt5r.GT5RRef;
import org.gtreimagined.gt5r.data.Materials;
import muramasa.antimatter.block.BlockBasic;
import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider;
import muramasa.antimatter.registration.IColorHandler;
import muramasa.antimatter.registration.IItemBlockProvider;
import muramasa.antimatter.texture.Texture;
import muramasa.gregtech.GT5RRef;
import muramasa.gregtech.data.GT5RBlocks;
import muramasa.gregtech.data.Materials;
import org.gtreimagined.gt5r.data.GT5RBlocks;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerLevel;
Expand Down
4 changes: 2 additions & 2 deletions ...asa/gregtech/block/BlockPowderBarrel.java → ...magined/gt5r/block/BlockPowderBarrel.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import org.gtreimagined.gt5r.GT5RRef;
import muramasa.antimatter.block.BlockBasic;
import muramasa.antimatter.texture.Texture;
import muramasa.gregtech.GT5RRef;
import net.minecraft.core.BlockPos;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
Expand Down
2 changes: 1 addition & 1 deletion ...masa/gregtech/block/BlockSidedCasing.java → ...imagined/gt5r/block/BlockSidedCasing.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.block;
package org.gtreimagined.gt5r.block;

import muramasa.antimatter.texture.Texture;
import net.minecraft.world.item.context.BlockPlaceContext;
Expand Down
2 changes: 1 addition & 1 deletion ...miniportals/BlockEntityMiniEndPortal.java → ...miniportals/BlockEntityMiniEndPortal.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.miniportals;
package org.gtreimagined.gt5r.blockentity.miniportals;

import muramasa.antimatter.machine.MachineState;
import muramasa.antimatter.machine.types.Machine;
Expand Down
2 changes: 1 addition & 1 deletion ...iportals/BlockEntityMiniNetherPortal.java → ...iportals/BlockEntityMiniNetherPortal.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.miniportals;
package org.gtreimagined.gt5r.blockentity.miniportals;

import muramasa.antimatter.machine.MachineState;
import muramasa.antimatter.machine.types.Machine;
Expand Down
2 changes: 1 addition & 1 deletion ...ty/miniportals/BlockEntityMiniPortal.java → ...ty/miniportals/BlockEntityMiniPortal.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.miniportals;
package org.gtreimagined.gt5r.blockentity.miniportals;

import muramasa.antimatter.blockentity.BlockEntityMachine;
import muramasa.antimatter.blockentity.IExtendingBlockEntity;
Expand Down
4 changes: 2 additions & 2 deletions ...ortals/BlockEntityMiniTwilightPortal.java → ...ortals/BlockEntityMiniTwilightPortal.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package muramasa.gregtech.blockentity.miniportals;
package org.gtreimagined.gt5r.blockentity.miniportals;

import muramasa.antimatter.data.AntimatterMaterials;
import muramasa.antimatter.machine.MachineState;
import muramasa.antimatter.machine.types.Machine;
import muramasa.antimatter.tool.AntimatterToolType;
import muramasa.gregtech.loader.WorldGenLoader;
import org.gtreimagined.gt5r.loader.WorldGenLoader;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
Expand Down
2 changes: 1 addition & 1 deletion ...ntity/multi/BlockEntityAdvancedMiner.java → ...ntity/multi/BlockEntityAdvancedMiner.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
import muramasa.antimatter.machine.types.Machine;
Expand Down
6 changes: 3 additions & 3 deletions ...kentity/multi/BlockEntityCharcoalPit.java → ...kentity/multi/BlockEntityCharcoalPit.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import muramasa.antimatter.blockentity.BlockEntityMachine;
import muramasa.antimatter.machine.MachineState;
Expand All @@ -7,8 +7,8 @@
import muramasa.antimatter.tool.AntimatterToolType;
import muramasa.antimatter.util.Utils;
import muramasa.antimatter.util.int3;
import muramasa.gregtech.data.GT5RBlocks;
import muramasa.gregtech.data.Machines;
import org.gtreimagined.gt5r.data.GT5RBlocks;
import org.gtreimagined.gt5r.data.Machines;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
Expand Down
2 changes: 1 addition & 1 deletion ...lockentity/multi/BlockEntityCokeOven.java → ...lockentity/multi/BlockEntityCokeOven.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine;
import muramasa.antimatter.machine.types.Machine;
Expand Down
6 changes: 3 additions & 3 deletions ...ty/multi/BlockEntityCombustionEngine.java → ...ty/multi/BlockEntityCombustionEngine.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import com.mojang.blaze3d.vertex.PoseStack;
import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
Expand All @@ -19,8 +19,8 @@
import java.util.List;

import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT;
import static muramasa.gregtech.data.Materials.Lubricant;
import static muramasa.gregtech.data.Materials.Oxygen;
import static org.gtreimagined.gt5r.data.Materials.Lubricant;
import static org.gtreimagined.gt5r.data.Materials.Oxygen;

public class BlockEntityCombustionEngine extends BlockEntityMultiMachine<BlockEntityCombustionEngine> {

Expand Down
2 changes: 1 addition & 1 deletion ...y/multi/BlockEntityDistillationTower.java → ...y/multi/BlockEntityDistillationTower.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
import muramasa.antimatter.capability.IComponentHandler;
Expand Down
4 changes: 2 additions & 2 deletions ...ulti/BlockEntityElectricBlastFurnace.java → ...ulti/BlockEntityElectricBlastFurnace.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import muramasa.antimatter.Ref;
import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
import muramasa.antimatter.capability.machine.MachineRecipeHandler;
import muramasa.antimatter.machine.types.Machine;
import muramasa.antimatter.recipe.IRecipe;
import muramasa.antimatter.util.Utils;
import muramasa.gregtech.block.BlockCoil;
import org.gtreimagined.gt5r.block.BlockCoil;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.state.BlockState;

Expand Down
8 changes: 4 additions & 4 deletions ...ntity/multi/BlockEntityFusionReactor.java → ...ntity/multi/BlockEntityFusionReactor.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import com.mojang.blaze3d.vertex.PoseStack;
import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
Expand All @@ -12,7 +12,7 @@
import muramasa.antimatter.machine.types.Machine;
import muramasa.antimatter.recipe.IRecipe;
import muramasa.antimatter.texture.Texture;
import muramasa.gregtech.GT5RRef;
import org.gtreimagined.gt5r.GT5RRef;
import net.minecraft.client.gui.Font;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand All @@ -22,8 +22,8 @@
import net.minecraft.world.level.block.state.BlockState;
import tesseract.TesseractGraphWrappers;

import static muramasa.gregtech.data.Materials.DistilledWater;
import static muramasa.gregtech.data.Materials.Steam;
import static org.gtreimagined.gt5r.data.Materials.DistilledWater;
import static org.gtreimagined.gt5r.data.Materials.Steam;

public class BlockEntityFusionReactor extends BlockEntityMultiMachine<BlockEntityFusionReactor> {

Expand Down
2 changes: 1 addition & 1 deletion ...multi/BlockEntityImplosionCompressor.java → ...multi/BlockEntityImplosionCompressor.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
import muramasa.antimatter.machine.types.Machine;
Expand Down
6 changes: 3 additions & 3 deletions ...tity/multi/BlockEntityLargeAutoclave.java → ...tity/multi/BlockEntityLargeAutoclave.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import com.mojang.blaze3d.vertex.PoseStack;
import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler;
import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
import muramasa.antimatter.gui.GuiInstance;
import muramasa.antimatter.gui.ICanSyncData;
Expand All @@ -10,8 +11,7 @@
import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer;
import muramasa.antimatter.machine.MachineState;
import muramasa.antimatter.machine.types.Machine;
import muramasa.gregtech.block.BlockCoil;
import muramasa.gregtech.machine.caps.ParallelRecipeHandler;
import org.gtreimagined.gt5r.block.BlockCoil;
import net.minecraft.client.gui.Font;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.state.BlockState;
Expand Down
4 changes: 2 additions & 2 deletions ...ockentity/multi/BlockEntityLargeBath.java → ...ockentity/multi/BlockEntityLargeBath.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package muramasa.gregtech.blockentity.multi;
package org.gtreimagined.gt5r.blockentity.multi;

import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler;
import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
import muramasa.antimatter.machine.types.Machine;
import muramasa.gregtech.machine.caps.ParallelRecipeHandler;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.state.BlockState;

Expand Down
Loading

0 comments on commit dc7c6d2

Please sign in to comment.