aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-07-18 04:58:35 -0400
committerGitHub <noreply@github.com>2024-07-18 15:58:35 +0700
commit1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8 (patch)
tree5028aab9a20d65cdf7e7d3ac88a4dea91116971f /src/main/java/gregtech/loaders
parentde36e0a3fb2035c862b282440b23f4a6e2b6d392 (diff)
downloadGT5-Unofficial-1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8.tar.gz
GT5-Unofficial-1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8.tar.bz2
GT5-Unofficial-1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8.zip
Add a multiblock for Fluid Canner/Canner (#2729)
* Ported changes from canner-dev branch because I have thoroughly messed up my branch management. * Renamed multi, fixed textures, spotless
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index d1196552c6..31d917e868 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -261,6 +261,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.MULTIBLOCK_PUMP_MKI_CONTROLLE
import static gregtech.api.enums.MetaTileEntityIDs.MULTILOCK_PUMP_MKIII_CONTROLLER;
import static gregtech.api.enums.MetaTileEntityIDs.MULTILOCK_PUMP_MKII_CONTROLLER;
import static gregtech.api.enums.MetaTileEntityIDs.MULTILOCK_PUMP_MKIV_CONTROLLER;
+import static gregtech.api.enums.MetaTileEntityIDs.MULTI_CANNER_CONTROLLER;
import static gregtech.api.enums.MetaTileEntityIDs.MULTI_SMELTER_CONTROLLER;
import static gregtech.api.enums.MetaTileEntityIDs.NANO_FORGE_CONTROLLER;
import static gregtech.api.enums.MetaTileEntityIDs.NAQUADAH_REACTOR_EV;
@@ -561,6 +562,7 @@ import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbin
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_HPSteam;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Plasma;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Steam;
+import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiCanner;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiFurnace;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_NanoForge;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilCracker;
@@ -1035,6 +1037,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
ItemList.Machine_Multi_DroneCentre.set(
new GT_MetaTileEntity_DroneCentre(Drone_Centre.ID, "multimachine_DroneCentre", "Drone Centre")
.getStackForm(1));
+
+ ItemList.Machine_Multi_Canner.set(
+ new GT_MetaTileEntity_MultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro")
+ .getStackForm(1));
}
private static void registerSteamMachines() {