diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 40 |
2 files changed, 42 insertions, 0 deletions
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 4b412e2796..0b25dc76cd 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 @@ -87,6 +87,7 @@ import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.GT_NeutronReflector_Item; import gregtech.common.items.GT_TierDrone; import gregtech.common.items.GT_VolumetricFlask; +import gregtech.common.items.GT_WirelessHeadphones; import gregtech.common.tileentities.render.TileDrone; import gregtech.common.tileentities.render.TileLaser; import gregtech.common.tileentities.render.TileWormhole; @@ -160,6 +161,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { new GT_MetaGenerated_Item_99(); new GT_MetaGenerated_Tool_01(); new GT_FluidDisplayItem(); + new GT_WirelessHeadphones(); // Tiered recipe materials actually appear to be set in GT_MetaTileEntity_BasicMachine_GT_Recipe, making these // unused 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 c77e74eb1f..ab3ea53279 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -118,6 +118,11 @@ import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UIV; import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UMV; import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UV; import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.BETTER_JUKEBOX_EV; +import static gregtech.api.enums.MetaTileEntityIDs.BETTER_JUKEBOX_HV; +import static gregtech.api.enums.MetaTileEntityIDs.BETTER_JUKEBOX_IV; +import static gregtech.api.enums.MetaTileEntityIDs.BETTER_JUKEBOX_LV; +import static gregtech.api.enums.MetaTileEntityIDs.BETTER_JUKEBOX_MV; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_EV; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_HV; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_IV; @@ -986,6 +991,7 @@ import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME; import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME; import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_AdvSeismicProspector; +import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_BetterJukebox; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Boxinator; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Charger; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_IndustrialApiary; @@ -2569,6 +2575,39 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8).getStackForm(1L)); } + private static void registerBetterJukebox() { + ItemList.BetterJukebox_LV.set( + new GT_MetaTileEntity_BetterJukebox( + BETTER_JUKEBOX_LV.ID, + "basicmachine.betterjukebox.tier.01", + "Basic Electric Jukebox", + 1).getStackForm(1L)); + ItemList.BetterJukebox_MV.set( + new GT_MetaTileEntity_BetterJukebox( + BETTER_JUKEBOX_MV.ID, + "basicmachine.betterjukebox.tier.02", + "Advanced Electric Jukebox", + 2).getStackForm(1L)); + ItemList.BetterJukebox_HV.set( + new GT_MetaTileEntity_BetterJukebox( + BETTER_JUKEBOX_HV.ID, + "basicmachine.betterjukebox.tier.03", + "Advanced Electric Jukebox II", + 3).getStackForm(1L)); + ItemList.BetterJukebox_EV.set( + new GT_MetaTileEntity_BetterJukebox( + BETTER_JUKEBOX_EV.ID, + "basicmachine.betterjukebox.tier.04", + "Extreme Music Mixer", + 4).getStackForm(1L)); + ItemList.BetterJukebox_IV.set( + new GT_MetaTileEntity_BetterJukebox( + BETTER_JUKEBOX_IV.ID, + "basicmachine.betterjukebox.tier.05", + "Duke Mix'em 3D", + 5).getStackForm(1L)); + } + private static void registerChestBuffer() { ItemList.Automation_ChestBuffer_ULV.set( new GT_MetaTileEntity_ChestBuffer( @@ -10067,6 +10106,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC registerElectrolyzer(); registerCircuitAssembler(); registerTurboCharger4By4(); + registerBetterJukebox(); ItemList.AdvDebugStructureWriter.set( new GT_MetaTileEntity_AdvDebugStructureWriter( |