diff options
author | evgengoldwar <69961523+evgengoldwar@users.noreply.github.com> | 2024-08-23 19:02:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-23 16:02:20 +0000 |
commit | 03b9d86394140fbe9554232690e4e569f4b0754b (patch) | |
tree | d96a32f12eacc61cf4e2f4cbb91748cbd067829c /src/main/java/gtPlusPlus/xmod/gregtech/registration | |
parent | c3e8a2d325a4aeb8a65a888b3c91f0c6177a17e9 (diff) | |
download | GT5-Unofficial-03b9d86394140fbe9554232690e4e569f4b0754b.tar.gz GT5-Unofficial-03b9d86394140fbe9554232690e4e569f4b0754b.tar.bz2 GT5-Unofficial-03b9d86394140fbe9554232690e4e569f4b0754b.zip |
Added Steam mixer (#2915)
* Added Steam Mixer
* Added Steam Mixer
* Change logic and tooltip steam multi
* Change mixer tooltip
* Apply spotless
* Fixed updateTexture for InputHatch
* Added controller recipe for Steam Mixer
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration')
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java | 7 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/MetaTileEntityIDs.java | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java index ebffa24904..9b49bf8348 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ControllerSteamForgeHammer; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.ControllerSteamMixerMulti; import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_SteamCentrifugeMulti; import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_SteamCompressorMulti; import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Controller_SteamMaceratorMulti; @@ -16,6 +17,7 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.st import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamCompressor; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamForgeHammer; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamMacerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamMixer; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamWasher; public class GregtechSteamMultis { @@ -49,6 +51,11 @@ public class GregtechSteamMultis { ControllerSteamForgeHammer.ID, "gtpp.multimachine.steam.forge.hammer", "Steam Forge Hammer").getStackForm(1)); + GregtechItemList.Controller_SteamMixerMulti.set( + new GregtechMetaTileEntity_SteamMixer( + ControllerSteamMixerMulti.ID, + "gtpp.multimachine.steam.mixer", + "Steam Mixer").getStackForm(1)); GregtechItemList.Hatch_Input_Bus_Steam.set( new GT_MetaTileEntity_Hatch_Steam_BusInput( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/MetaTileEntityIDs.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/MetaTileEntityIDs.java index 42126abc0a..15f2037b6c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/MetaTileEntityIDs.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/MetaTileEntityIDs.java @@ -186,6 +186,7 @@ public enum MetaTileEntityIDs { Controller_SteamCentrifugeMulti(31080), Controller_SteamWasherMulti(31082), ControllerSteamForgeHammer(31083), + ControllerSteamMixerMulti(31084), GT4_Electric_Auto_Workbench_LV(31091), GT4_Electric_Auto_Workbench_MV(31092), GT4_Electric_Auto_Workbench_HV(31093), |