diff options
Diffstat (limited to 'src/main/java/gregtech')
3 files changed, 396 insertions, 389 deletions
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java index 239a4867a5..45117773fe 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java @@ -21,8 +21,9 @@ import net.minecraft.world.World; import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap; import appeng.core.CreativeTab; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.multitileentity.base.MultiTileEntity; import gregtech.api.multitileentity.interfaces.IMultiTileEntity; @@ -70,8 +71,11 @@ public class MultiTileEntityRegistry { * @param aNameInternal the internal Name of the Item */ public MultiTileEntityRegistry(String aNameInternal, MultiTileEntityBlockInternal aBlock) { - if (!GregTech_API.sPreloadStarted || GregTech_API.sPreloadFinished) throw new IllegalStateException( - "The MultiTileEntity Registry must be initialised during Preload Phase and not before"); + if (!Loader.instance() + .isInState(LoaderState.PREINITIALIZATION)) { + throw new IllegalStateException( + "The MultiTileEntity Registry must be initialized during Preload Phase and not before"); + } mNameInternal = aNameInternal; mBlock = aBlock; GT_FML_LOGGER.info(aNameInternal + " " + Block.getIdFromBlock(aBlock) + "This is the answer"); diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java index 7314327af3..659e53e428 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java @@ -3,7 +3,7 @@ package gregtech.api.multitileentity.multiblock.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.*; -import static gregtech.loaders.preload.GT_Loader_MultiTileEntities.COMPONENT_CASING_REGISTRY; +import static gregtech.loaders.preload.GT_Loader_MultiTileEntities.COMPONENT_CASING_REGISTRY_NAME; import static mcp.mobius.waila.api.SpecialChars.*; import java.lang.ref.WeakReference; @@ -833,146 +833,146 @@ public abstract class Controller<T extends Controller<T>> extends MultiTileBasic protected <S> IStructureElementChain<S> addMotorCasings(int modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_Motor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_Motor.getId(), modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_Motor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_Motor.getId(), modes)); } protected <S> IStructureElementChain<S> addPumpCasings(int modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_Pump.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_Pump.getId(), modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_Pump.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_Pump.getId(), modes)); } protected <S> IStructureElementChain<S> addPistonCasings(int modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_Piston.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_Piston.getId(), modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_Piston.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_Piston.getId(), modes)); } protected <S> IStructureElementChain<S> addConveyorCasings(int modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_Conveyor.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_Conveyor.getId(), modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_Conveyor.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_Conveyor.getId(), modes)); } protected <S> IStructureElementChain<S> addRobotArmCasings(int modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_RobotArm.getId(), modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_RobotArm.getId(), modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_RobotArm.getId(), modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_RobotArm.getId(), modes)); } protected <S> IStructureElementChain<S> addSensorCasings(int Modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_Sensor.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_Sensor.getId(), Modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_Sensor.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_Sensor.getId(), Modes)); } protected <S> IStructureElementChain<S> addEmitterCasings(int Modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_Emitter.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_Emitter.getId(), Modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_Emitter.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_Emitter.getId(), Modes)); } protected <S> IStructureElementChain<S> addFieldGeneratorCasings(int Modes) { return ofChain( - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, HV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, EV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, IV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, LuV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, ZPM_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UHV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UEV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UIV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UMV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, UXV_FieldGenerator.getId(), Modes), - addMultiTileCasing(COMPONENT_CASING_REGISTRY, MAX_FieldGenerator.getId(), Modes)); + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, HV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, EV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, IV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, LuV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, ZPM_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UHV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UEV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UIV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UMV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, UXV_FieldGenerator.getId(), Modes), + addMultiTileCasing(COMPONENT_CASING_REGISTRY_NAME, MAX_FieldGenerator.getId(), Modes)); } protected void registerSpecialCasings(MultiBlockPart part) { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java index e8935c707d..4fb6fca88d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java @@ -29,9 +29,28 @@ import gregtech.common.tileentities.machines.multiblock.Macerator; public class GT_Loader_MultiTileEntities implements Runnable { - public static final String COMPONENT_CASING_REGISTRY = "gt.multitileentity.component.casings"; - public static final String CASING_REGISTRY = "gt.multitileentity.casings"; - public static final String MACHINE_REGISTRY = "gt.multitileentity.controllers"; + public static final String COMPONENT_CASING_REGISTRY_NAME = "gt.multitileentity.component.casings"; + public static final String CASING_REGISTRY_NAME = "gt.multitileentity.casings"; + public static final String MACHINE_REGISTRY_NAME = "gt.multitileentity.controllers"; + public static final MultiTileEntityRegistry MACHINE_REGISTRY = new MultiTileEntityRegistry(MACHINE_REGISTRY_NAME); + public static final MultiTileEntityBlock MACHINE_BLOCK = MultiTileEntityBlock + .getOrCreate("GregTech", "machine", Material.iron, Block.soundTypeMetal, "wrench", 0, 0, 15, true, true); + public static final MultiTileEntityRegistry CASING_REGISTRY = new MultiTileEntityRegistry(CASING_REGISTRY_NAME); + public static final MultiTileEntityBlock CASING_BLOCK = MultiTileEntityBlock + .getOrCreate("GregTech", "casing", Material.iron, Block.soundTypeMetal, "wrench", 0, 0, 15, true, true); + public static final MultiTileEntityRegistry COMPONENT_CASING_REGISTRY = new MultiTileEntityRegistry( + COMPONENT_CASING_REGISTRY_NAME); + public static final MultiTileEntityBlock COMPONENT_CASING_BLOCK = MultiTileEntityBlock.getOrCreate( + "GregTech", + "componentCasing", + Material.iron, + Block.soundTypeMetal, + "wrench", + 0, + 0, + 15, + true, + true); @Override public void run() { @@ -45,32 +64,29 @@ public class GT_Loader_MultiTileEntities implements Runnable { } private static void registerMachines() { - final MultiTileEntityRegistry machineRegistry = new MultiTileEntityRegistry(MACHINE_REGISTRY); - final MultiTileEntityBlock machine = MultiTileEntityBlock - .getOrCreate("GregTech", "machine", Material.iron, Block.soundTypeMetal, "wrench", 0, 0, 15, true, true); // Disable for now - machineRegistry.create(1000, Macerator.class) + MACHINE_REGISTRY.create(1000, Macerator.class) .name("Large Macerator") .category("Multiblock Controller") - .setBlock(machine) + .setBlock(MACHINE_BLOCK) .material(Materials.Iron) .textureFolder("macerator") .tankCapacity(128000L) .inputInventorySize(16) .outputInventorySize(16) .register(); - machineRegistry.create(0, CokeOven.class) + MACHINE_REGISTRY.create(0, CokeOven.class) .name("Coke Oven") .category("MultiblockController") - .setBlock(machine) + .setBlock(MACHINE_BLOCK) .textureFolder("cokeOven") .inputInventorySize(1) .outputInventorySize(1) .register(); - machineRegistry.create(1, AdvChemicalReactor.class) + MACHINE_REGISTRY.create(1, AdvChemicalReactor.class) .name("Advanced Chemical Reactor") .category("MultiblockController") - .setBlock(machine) + .setBlock(MACHINE_BLOCK) // TODO: Texture .textureFolder("advChemicalReactor") .inputInventorySize(16) @@ -80,25 +96,23 @@ public class GT_Loader_MultiTileEntities implements Runnable { } private static void registerCasings() { - final MultiTileEntityRegistry casingRegistry = new MultiTileEntityRegistry(CASING_REGISTRY); - final MultiTileEntityBlock casing = MultiTileEntityBlock - .getOrCreate("GregTech", "casing", Material.iron, Block.soundTypeMetal, "wrench", 0, 0, 15, true, true); - casingRegistry.create(CokeOven.getId(), WallShareablePart.class) + + CASING_REGISTRY.create(CokeOven.getId(), WallShareablePart.class) .name("Coke Oven Bricks") .category("MultiBlock Casing") - .setBlock(casing) + .setBlock(CASING_BLOCK) .textureFolder("cokeOven") .register(); - casingRegistry.create(Chemical.getId(), BasicCasing.class) + CASING_REGISTRY.create(Chemical.getId(), BasicCasing.class) .name("Chemical Casing") .category("MultiBlock Casing") - .setBlock(casing) + .setBlock(CASING_BLOCK) .textureFolder("advChemicalReactor") .register(); - casingRegistry.create(18000, BasicCasing.class) + CASING_REGISTRY.create(18000, BasicCasing.class) .name("Test Casing") .category("Multiblock Casing") - .setBlock(casing) + .setBlock(CASING_BLOCK) .material(Materials.Cobalt) .textureFolder("macerator") .register(); @@ -106,40 +120,29 @@ public class GT_Loader_MultiTileEntities implements Runnable { } private static void registerComponentCasings() { - final MultiTileEntityRegistry componentCasingRegistry = new MultiTileEntityRegistry(COMPONENT_CASING_REGISTRY); - final MultiTileEntityBlock componentCasing = MultiTileEntityBlock.getOrCreate( - "GregTech", - "componentCasing", - Material.iron, - Block.soundTypeMetal, - "wrench", - 0, - 0, - 15, - true, - true); - registerMotorCasings(componentCasingRegistry, componentCasing); - registerPumpCasings(componentCasingRegistry, componentCasing); - registerPistonCasings(componentCasingRegistry, componentCasing); - registerRobotArmCasings(componentCasingRegistry, componentCasing); - registerConveyorCasings(componentCasingRegistry, componentCasing); - registerEmitterCasings(componentCasingRegistry, componentCasing); - registerSensorCasings(componentCasingRegistry, componentCasing); - registerFieldGeneratorCasings(componentCasingRegistry, componentCasing); - componentCasingRegistry.create(20001, Inventory.class) + registerMotorCasings(); + registerPumpCasings(); + registerPistonCasings(); + registerRobotArmCasings(); + registerConveyorCasings(); + registerEmitterCasings(); + registerSensorCasings(); + registerFieldGeneratorCasings(); + + COMPONENT_CASING_REGISTRY.create(20001, Inventory.class) .name("Inventory Upgrade LV") .category("MultiBlock Upgrade Casing") - .setBlock(componentCasing) + .setBlock(COMPONENT_CASING_BLOCK) .material(MaterialsUEVplus.SpaceTime) .textureFolder("macerator") .upgradeInventorySize(16) .tier(1) .register(); - componentCasingRegistry.create(20002, Inventory.class) + COMPONENT_CASING_REGISTRY.create(20002, Inventory.class) .name("Inventory Upgrade MV") .category("MultiBlock Upgrade Casing") - .setBlock(componentCasing) + .setBlock(COMPONENT_CASING_BLOCK) .material(Materials.Neutronium) .textureFolder("macerator") .upgradeInventorySize(24) @@ -147,796 +150,796 @@ public class GT_Loader_MultiTileEntities implements Runnable { .register(); } - private static void registerMotorCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_Motor.getId(), Motor.class) + private static void registerMotorCasings() { + COMPONENT_CASING_REGISTRY.create(LV_Motor.getId(), Motor.class) .name("Motor Casing LV") .tier(1) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(MV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(MV_Motor.getId(), Motor.class) .name("Motor Casing MV") .tier(2) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(HV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(HV_Motor.getId(), Motor.class) .name("Motor Casing HV") .tier(3) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(EV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(EV_Motor.getId(), Motor.class) .name("Motor Casing EV") .tier(4) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(IV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(IV_Motor.getId(), Motor.class) .name("Motor Casing IV") .tier(5) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(LuV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(LuV_Motor.getId(), Motor.class) .name("Motor Casing LuV") .tier(6) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(ZPM_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(ZPM_Motor.getId(), Motor.class) .name("Motor Casing ZPM") .tier(7) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(UV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(UV_Motor.getId(), Motor.class) .name("Motor Casing UV") .tier(8) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(UHV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(UHV_Motor.getId(), Motor.class) .name("Motor Casing UHV") .tier(9) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(UEV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(UEV_Motor.getId(), Motor.class) .name("Motor Casing UEV") .tier(10) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(UIV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(UIV_Motor.getId(), Motor.class) .name("Motor Casing UIV") .tier(11) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(UMV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(UMV_Motor.getId(), Motor.class) .name("Motor Casing UMV") .tier(12) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(UXV_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(UXV_Motor.getId(), Motor.class) .name("Motor Casing UXV") .tier(13) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); - registry.create(MAX_Motor.getId(), Motor.class) + COMPONENT_CASING_REGISTRY.create(MAX_Motor.getId(), Motor.class) .name("Motor Casing MAX") .tier(14) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("motor") .register(); } - private static void registerPumpCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_Pump.getId(), Pump.class) + private static void registerPumpCasings() { + COMPONENT_CASING_REGISTRY.create(LV_Pump.getId(), Pump.class) .name("Pump Casing LV") .tier(1) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(MV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(MV_Pump.getId(), Pump.class) .name("Pump Casing MV") .tier(2) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(HV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(HV_Pump.getId(), Pump.class) .name("Pump Casing HV") .tier(3) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(EV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(EV_Pump.getId(), Pump.class) .name("Pump Casing EV") .tier(4) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(IV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(IV_Pump.getId(), Pump.class) .name("Pump Casing IV") .tier(5) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(LuV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(LuV_Pump.getId(), Pump.class) .name("Pump Casing LuV") .tier(6) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(LuV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(LuV_Pump.getId(), Pump.class) .name("Pump Casing LuV") .tier(6) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(ZPM_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(ZPM_Pump.getId(), Pump.class) .name("Pump Casing ZPM") .tier(7) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(UV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(UV_Pump.getId(), Pump.class) .name("Pump Casing UV") .tier(8) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(UHV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(UHV_Pump.getId(), Pump.class) .name("Pump Casing UHV") .tier(9) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(UEV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(UEV_Pump.getId(), Pump.class) .name("Pump Casing UEV") .tier(10) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(UIV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(UIV_Pump.getId(), Pump.class) .name("Pump Casing UIV") .tier(11) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(UMV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(UMV_Pump.getId(), Pump.class) .name("Pump Casing UMV") .tier(12) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(UXV_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(UXV_Pump.getId(), Pump.class) .name("Pump Casing UXV") .tier(13) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); - registry.create(MAX_Pump.getId(), Pump.class) + COMPONENT_CASING_REGISTRY.create(MAX_Pump.getId(), Pump.class) .name("Pump Casing MAX") .tier(14) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("pump") .register(); } - private static void registerPistonCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_Piston.getId(), Piston.class) + private static void registerPistonCasings() { + COMPONENT_CASING_REGISTRY.create(LV_Piston.getId(), Piston.class) .name("Piston Casing LV") .tier(1) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(MV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(MV_Piston.getId(), Piston.class) .name("Piston Casing MV") .tier(2) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(HV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(HV_Piston.getId(), Piston.class) .name("Piston Casing HV") .tier(3) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(EV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(EV_Piston.getId(), Piston.class) .name("Piston Casing EV") .tier(4) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(IV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(IV_Piston.getId(), Piston.class) .name("Piston Casing IV") .tier(5) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(LuV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(LuV_Piston.getId(), Piston.class) .name("Piston Casing LuV") .tier(6) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(ZPM_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(ZPM_Piston.getId(), Piston.class) .name("Piston Casing ZPM") .tier(7) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(UV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(UV_Piston.getId(), Piston.class) .name("Piston Casing UV") .tier(8) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(UHV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(UHV_Piston.getId(), Piston.class) .name("Piston Casing UHV") .tier(9) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(UEV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(UEV_Piston.getId(), Piston.class) .name("Piston Casing UEV") .tier(10) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(UIV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(UIV_Piston.getId(), Piston.class) .name("Piston Casing UIV") .tier(11) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(UMV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(UMV_Piston.getId(), Piston.class) .name("Piston Casing UMV") .tier(12) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(UXV_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(UXV_Piston.getId(), Piston.class) .name("Piston Casing UXV") .tier(13) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); - registry.create(MAX_Piston.getId(), Piston.class) + COMPONENT_CASING_REGISTRY.create(MAX_Piston.getId(), Piston.class) .name("Piston Casing MAX") .tier(14) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("piston") .register(); } - private static void registerConveyorCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_Conveyor.getId(), Conveyor.class) + private static void registerConveyorCasings() { + COMPONENT_CASING_REGISTRY.create(LV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing LV") .tier(1) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(MV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(MV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing MV") .tier(2) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(HV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(HV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing HV") .tier(3) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(EV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(EV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing EV") .tier(4) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(IV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(IV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing IV") .tier(5) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(LuV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(LuV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing LuV") .tier(6) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(ZPM_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(ZPM_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing ZPM") .tier(7) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(UV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(UV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing UV") .tier(8) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(UHV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(UHV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing UHV") .tier(9) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(UEV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(UEV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing UEV") .tier(10) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); - registry.create(UIV_Conveyor.getId(), Conveyor.class) + COMPONENT_CASING_REGISTRY.create(UIV_Conveyor.getId(), Conveyor.class) .name("Conveyor Casing UIV") .tier(11) .category("MultiBlock Structural Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("conveyor") .register(); } - private static void registerRobotArmCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_RobotArm.getId(), RobotArm.class) + private static void registerRobotArmCasings() { + COMPONENT_CASING_REGISTRY.create(LV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing LV") .tier(1) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(MV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(MV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing MV") .tier(2) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(HV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(HV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing HV") .tier(3) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(EV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(EV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing EV") .tier(4) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(IV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(IV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing IV") .tier(5) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(LuV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(LuV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing LuV") .tier(6) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(ZPM_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(ZPM_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing ZPM") .tier(7) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(UV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(UV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing UV") .tier(8) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(UHV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(UHV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing UHV") .tier(9) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(UEV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(UEV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing UEV") .tier(10) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(UIV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(UIV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing UIV") .tier(11) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(UMV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(UMV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing UMV") .tier(12) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(UXV_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(UXV_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing UXV") .tier(13) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); - registry.create(MAX_RobotArm.getId(), RobotArm.class) + COMPONENT_CASING_REGISTRY.create(MAX_RobotArm.getId(), RobotArm.class) .name("Robot Arm Casing MAX") .tier(14) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("robotArm") .register(); } - private static void registerSensorCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_Sensor.getId(), Sensor.class) + private static void registerSensorCasings() { + COMPONENT_CASING_REGISTRY.create(LV_Sensor.getId(), Sensor.class) .name("Sensor Casing LV") .tier(1) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(MV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(MV_Sensor.getId(), Sensor.class) .name("Sensor Casing MV") .tier(2) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(HV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(HV_Sensor.getId(), Sensor.class) .name("Sensor Casing HV") .tier(3) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(EV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(EV_Sensor.getId(), Sensor.class) .name("Sensor Casing EV") .tier(4) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(IV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(IV_Sensor.getId(), Sensor.class) .name("Sensor Casing IV") .tier(5) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(LuV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(LuV_Sensor.getId(), Sensor.class) .name("Sensor Casing LuV") .tier(6) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(ZPM_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(ZPM_Sensor.getId(), Sensor.class) .name("Sensor Casing ZPM") .tier(7) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(UV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(UV_Sensor.getId(), Sensor.class) .name("Sensor Casing UV") .tier(8) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(UHV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(UHV_Sensor.getId(), Sensor.class) .name("Sensor Casing UHV") .tier(9) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(UEV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(UEV_Sensor.getId(), Sensor.class) .name("Sensor Casing UEV") .tier(10) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(UIV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(UIV_Sensor.getId(), Sensor.class) .name("Sensor Casing UIV") .tier(11) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(UMV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(UMV_Sensor.getId(), Sensor.class) .name("Sensor Casing UMV") .tier(12) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(UXV_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(UXV_Sensor.getId(), Sensor.class) .name("Sensor Casing UXV") .tier(13) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); - registry.create(MAX_Sensor.getId(), Sensor.class) + COMPONENT_CASING_REGISTRY.create(MAX_Sensor.getId(), Sensor.class) .name("Sensor Casing MAX") .tier(14) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("sensor") .register(); } - private static void registerEmitterCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_Emitter.getId(), Emitter.class) + private static void registerEmitterCasings() { + COMPONENT_CASING_REGISTRY.create(LV_Emitter.getId(), Emitter.class) .name("Emitter Casing LV") .tier(1) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(MV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(MV_Emitter.getId(), Emitter.class) .name("Emitter Casing MV") .tier(2) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(HV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(HV_Emitter.getId(), Emitter.class) .name("Emitter Casing HV") .tier(3) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(EV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(EV_Emitter.getId(), Emitter.class) .name("Emitter Casing EV") .tier(4) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(IV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(IV_Emitter.getId(), Emitter.class) .name("Emitter Casing IV") .tier(5) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(LuV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(LuV_Emitter.getId(), Emitter.class) .name("Emitter Casing LuV") .tier(6) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(ZPM_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(ZPM_Emitter.getId(), Emitter.class) .name("Emitter Casing ZPM") .tier(7) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(UV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(UV_Emitter.getId(), Emitter.class) .name("Emitter Casing UV") .tier(8) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(UHV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(UHV_Emitter.getId(), Emitter.class) .name("Emitter Casing UHV") .tier(9) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(UEV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(UEV_Emitter.getId(), Emitter.class) .name("Emitter Casing UEV") .tier(10) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(UIV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(UIV_Emitter.getId(), Emitter.class) .name("Emitter Casing UIV") .tier(11) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(UMV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(UMV_Emitter.getId(), Emitter.class) .name("Emitter Casing UMV") .tier(12) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(UXV_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(UXV_Emitter.getId(), Emitter.class) .name("Emitter Casing UXV") .tier(13) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); - registry.create(MAX_Emitter.getId(), Emitter.class) + COMPONENT_CASING_REGISTRY.create(MAX_Emitter.getId(), Emitter.class) .name("Emitter Casing MAX") .tier(14) .category("MultiBlock Functional Casing") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("emitter") .register(); } - private static void registerFieldGeneratorCasings(MultiTileEntityRegistry registry, MultiTileEntityBlock casing) { - registry.create(LV_FieldGenerator.getId(), FieldGenerator.class) + private static void registerFieldGeneratorCasings() { + COMPONENT_CASING_REGISTRY.create(LV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator LV") .tier(1) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(MV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(MV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator MV") .tier(2) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(HV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(HV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator HV") .tier(3) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(EV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(EV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator EV") .tier(4) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(IV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(IV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator IV") .tier(5) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(LuV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(LuV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator LuV") .tier(6) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(ZPM_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(ZPM_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator ZPM") .tier(7) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(UV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(UV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator UV") .tier(8) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(UHV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(UHV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator UHV") .tier(9) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(UEV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(UEV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator UEV") .tier(10) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(UIV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(UIV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator UIV") .tier(11) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(UMV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(UMV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator UMV") .tier(12) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(UXV_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(UXV_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator UXV") .tier(13) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); - registry.create(MAX_FieldGenerator.getId(), FieldGenerator.class) + COMPONENT_CASING_REGISTRY.create(MAX_FieldGenerator.getId(), FieldGenerator.class) .name("Field Generator MAX") .tier(14) .category("Multiblock Energy Field") - .setBlock(casing) + .setBlock(COMPONENT_CASING_BLOCK) .textureFolder("fieldGenerator") .register(); } |