From b4ee66356b06d0fcc75654506ed67aa57755393b Mon Sep 17 00:00:00 2001 From: Volence <32358820+Volence@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:04:23 -0400 Subject: Add multi lathe (#2783) * first few files outlining new lathe multi * MultiLathe: Attempt to add tiers based on pipes * MultiLathe: Added Item Pipe Casing blocks and tiers * MultiLathe: Finished Machine and its mechanics * MultiLathe: Add recipe map and recipes for new precision lathe mode * MultiLathe: Apply Spotless * Revert recipe map changes * remove a few more recipe additions * revert to basic lathe recipe map for the multi * fix imports and make them all explicit * remove a few more * imports, update tooltip info * Update src/main/java/gregtech/common/blocks/GT_Block_Casings11.java Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com> * Added to the texture list documentation for blocks --------- Co-authored-by: Martin Robertz Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com> --- .../gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 2 ++ .../java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 8 ++++++++ 2 files changed, 10 insertions(+) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 04412da4c7..f54f78f915 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -53,6 +53,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.blocks.GT_Block_Casings1; import gregtech.common.blocks.GT_Block_Casings10; +import gregtech.common.blocks.GT_Block_Casings11; import gregtech.common.blocks.GT_Block_Casings2; import gregtech.common.blocks.GT_Block_Casings3; import gregtech.common.blocks.GT_Block_Casings4; @@ -538,6 +539,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sBlockCasings8 = new GT_Block_Casings8(); GregTech_API.sBlockCasings9 = new GT_Block_Casings9(); GregTech_API.sBlockCasings10 = new GT_Block_Casings10(); + GregTech_API.sBlockCasings11 = new GT_Block_Casings11(); GregTech_API.sBlockGranites = new GT_Block_Granites(); GregTech_API.sBlockLongDistancePipes = new GT_Block_LongDistancePipe(); GregTech_API.sBlockConcretes = new GT_Block_Concretes(); 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 5bd342cc48..2a7c39d3e0 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -264,6 +264,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.MULTILOCK_PUMP_MKIII_CONTROLL 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_LATHE_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; @@ -568,6 +569,7 @@ import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbin 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_MultiLathe; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_NanoForge; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilCracker; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill1; @@ -1049,6 +1051,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_Multi_Canner.set( new GT_MetaTileEntity_MultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro") .getStackForm(1)); + + ItemList.Machine_Multi_Lathe.set( + new GT_MetaTileEntity_MultiLathe( + MULTI_LATHE_CONTROLLER.ID, + "multimachine.lathe", + "Industrial Precision Lathe").getStackForm(1)); } private static void registerSteamMachines() { -- cgit