aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/common/tileentities
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/common/tileentities')
-rw-r--r--src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java15
-rw-r--r--src/main/java/common/tileentities/GTMTE_ItemServer.java7
-rw-r--r--src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java11
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java4
-rw-r--r--src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java4
-rw-r--r--src/main/java/common/tileentities/TE_TFFTMultiHatch.java16
6 files changed, 26 insertions, 31 deletions
diff --git a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
index d362342366..98e0fabe80 100644
--- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
+++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
@@ -21,6 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.input.Keyboard;
+import common.Blocks;
import common.blocks.*;
import util.MultiBlockTooltipBuilder;
import util.Vector3i;
@@ -33,13 +34,13 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
private final static String glassNameAE2 = "tile.appliedenergistics2.BlockQuartzGlass";
private final static String glassNameStained = "tile.stainedGlass";
- private final static Block CASING = Block_TFFTCasing.getInstance();
- private final static Block_TFFTStorageFieldBlockT1 STORAGE_FIELD1 = Block_TFFTStorageFieldBlockT1.getInstance();
- private final static Block_TFFTStorageFieldBlockT2 STORAGE_FIELD2 = Block_TFFTStorageFieldBlockT2.getInstance();
- private final static Block_TFFTStorageFieldBlockT3 STORAGE_FIELD3 = Block_TFFTStorageFieldBlockT3.getInstance();
- private final static Block_TFFTStorageFieldBlockT4 STORAGE_FIELD4 = Block_TFFTStorageFieldBlockT4.getInstance();
- private final static Block_TFFTStorageFieldBlockT5 STORAGE_FIELD5 = Block_TFFTStorageFieldBlockT5.getInstance();
- private final static Block MULTI_HATCH = Block_TFFTMultiHatch.getInstance();
+ private final static Block CASING = Blocks.tfftCasing;
+ private final static Block_TFFTStorageFieldBlockT1 STORAGE_FIELD1 = (Block_TFFTStorageFieldBlockT1) Blocks.tfftStorageField1;
+ private final static Block_TFFTStorageFieldBlockT2 STORAGE_FIELD2 = (Block_TFFTStorageFieldBlockT2) Blocks.tfftStorageField2;
+ private final static Block_TFFTStorageFieldBlockT3 STORAGE_FIELD3 = (Block_TFFTStorageFieldBlockT3) Blocks.tfftStorageField3;
+ private final static Block_TFFTStorageFieldBlockT4 STORAGE_FIELD4 = (Block_TFFTStorageFieldBlockT4) Blocks.tfftStorageField4;
+ private final static Block_TFFTStorageFieldBlockT5 STORAGE_FIELD5 = (Block_TFFTStorageFieldBlockT5) Blocks.tfftStorageField5;
+ private final static Block MULTI_HATCH = Blocks.tfftMultiHatch;
private final static int CASING_TEXTURE_ID = 176;
private MultiFluidHandler mfh;
diff --git a/src/main/java/common/tileentities/GTMTE_ItemServer.java b/src/main/java/common/tileentities/GTMTE_ItemServer.java
index 2dabe19d3d..cfff360ce4 100644
--- a/src/main/java/common/tileentities/GTMTE_ItemServer.java
+++ b/src/main/java/common/tileentities/GTMTE_ItemServer.java
@@ -5,6 +5,7 @@ import java.util.HashSet;
import org.lwjgl.input.Keyboard;
+import common.Blocks;
import common.blocks.Block_ItemServerDrive;
import common.blocks.Block_ItemServerIOPort;
import common.blocks.Block_ItemServerRackCasing;
@@ -31,9 +32,9 @@ public class GTMTE_ItemServer extends GT_MetaTileEntity_MultiBlockBase {
private static final int BASE_PER_ITEM_CAPACITY = 1024;
private static final int BASE_ITEM_TYPES_PER_SEGMENT = 4;
- private final Block_ItemServerDrive DRIVE = Block_ItemServerDrive.getInstance();
- private final Block_ItemServerRackCasing CASING = Block_ItemServerRackCasing.getInstance();
- private final Block_ItemServerIOPort IO_PORT = Block_ItemServerIOPort.getInstance();
+ private final Block_ItemServerDrive DRIVE = (Block_ItemServerDrive) Blocks.itemServerDrive;
+ private final Block_ItemServerRackCasing CASING = (Block_ItemServerRackCasing) Blocks.itemServerRackCasing;
+ private final Block_ItemServerIOPort IO_PORT = (Block_ItemServerIOPort) Blocks.itemServerIOPort;
private final String ALU_FRAME_BOX_NAME = "gt.blockmachines";
private final int ALU_FRAME_BOX_META = 6;
private final int CASING_TEXTURE_ID = 176;
diff --git a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
index e08c383997..dd912c0d04 100644
--- a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
+++ b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
@@ -3,13 +3,10 @@ package common.tileentities;
import org.joml.Vector3i;
import org.lwjgl.input.Keyboard;
-import common.blocks.Block_ControlRod;
-import common.blocks.Block_ReactorChamber_OFF;
-import common.blocks.Block_ReactorChamber_ON;
+import common.Blocks;
import container.GUIContainer_ModularNuclearReactor;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -27,9 +24,9 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas
private final int CASING_META = 12;
private final int CASING_TEXTURE_ID = 44;
- private final Block CHAMBER_OFF = Block_ReactorChamber_OFF.getInstance();
- private final Block CHAMBER_ON = Block_ReactorChamber_ON.getInstance();
- private final Block CONTROL_ROD = Block_ControlRod.getInstance();
+ private final Block CHAMBER_OFF = Blocks.reactorChamberOFF;
+ private final Block CHAMBER_ON = Blocks.reactorChamberON;
+ private final Block CONTROL_ROD = Blocks.reactorControlRod;
private boolean euMode = true;
diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
index ee8fb9352f..76536f0e50 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
import org.lwjgl.input.Keyboard;
-import common.blocks.Block_YSZUnit;
+import common.Blocks;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
@@ -230,7 +230,7 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase {
final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z);
if(X == 0 && Y == 0) {
if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
- .equals(Block_YSZUnit.getInstance().getUnlocalizedName())) {
+ .equals(Blocks.yszUnit.getUnlocalizedName())) {
formationChecklist = false;
}
continue;
diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
index b9ca6aa25b..fb3fb7e9c7 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
import org.lwjgl.input.Keyboard;
-import common.blocks.Block_GDCUnit;
+import common.Blocks;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
@@ -230,7 +230,7 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase {
final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z);
if(X == 0 && Y == 0) {
if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
- .equals(Block_GDCUnit.getInstance().getUnlocalizedName())) {
+ .equals(Blocks.gdcUnit.getUnlocalizedName())) {
formationChecklist = false;
}
continue;
diff --git a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
index 217ff2ad8f..74f5d7d2d2 100644
--- a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
@@ -3,11 +3,7 @@ package common.tileentities;
import java.util.Iterator;
import java.util.List;
-import common.blocks.Block_TFFTStorageFieldBlockT1;
-import common.blocks.Block_TFFTStorageFieldBlockT2;
-import common.blocks.Block_TFFTStorageFieldBlockT3;
-import common.blocks.Block_TFFTStorageFieldBlockT4;
-import common.blocks.Block_TFFTStorageFieldBlockT5;
+import common.Blocks;
import kekztech.MultiFluidHandler;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
@@ -101,11 +97,11 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler {
final Block b = this.getWorldObj().getBlock(this.xCoord + direction.offsetX, this.yCoord + direction.offsetY, this.zCoord + direction.offsetZ);
if(b != null && (
- b.equals(Block_TFFTStorageFieldBlockT1.getInstance())
- || b.equals(Block_TFFTStorageFieldBlockT2.getInstance())
- || b.equals(Block_TFFTStorageFieldBlockT3.getInstance())
- || b.equals(Block_TFFTStorageFieldBlockT4.getInstance())
- || b.equals(Block_TFFTStorageFieldBlockT5.getInstance()))) {
+ b.equals(Blocks.tfftStorageField1)
+ || b.equals(Blocks.tfftStorageField2)
+ || b.equals(Blocks.tfftStorageField3)
+ || b.equals(Blocks.tfftStorageField4)
+ || b.equals(Blocks.tfftStorageField5))) {
return direction.getOpposite();
}
}
generated by cgit (git 2.46.0) at 2025-03-07 08:30:34 +0000