diff options
Diffstat (limited to 'src/Java/miscutil/gregtech')
5 files changed, 26 insertions, 13 deletions
diff --git a/src/Java/miscutil/gregtech/enums/GregtechItemList.java b/src/Java/miscutil/gregtech/enums/GregtechItemList.java index 9e663e05c8..1e980a3c5d 100644 --- a/src/Java/miscutil/gregtech/enums/GregtechItemList.java +++ b/src/Java/miscutil/gregtech/enums/GregtechItemList.java @@ -28,15 +28,19 @@ public enum GregtechItemList implements GregtechItemContainer { Credit_Greg_Platinum, Credit_Greg_Osmium, Credit_Greg_Naquadah, - Energy_Buffer_CREATIVE, + Energy_Buffer_CREATIVE, //Energy Buffes Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX, + //Cobble Generators Cobble_Generator_ULV, Cobble_Generator_LV, Cobble_Generator_MV, Cobble_Generator_HV, Cobble_Generator_EV, Cobble_Generator_IV, Cobble_Generator_LuV, Cobble_Generator_ZPM, Cobble_Generator_UV, Cobble_Generator_MAX, - Condensor_MAX; + //The max Steam condenser + Condensor_MAX, + //Player owned Safes + GT_Safe_ULV, GT_Safe_LV, GT_Safe_MV, GT_Safe_HV, GT_Safe_EV, GT_Safe_IV, GT_Safe_LuV, GT_Safe_ZPM, GT_Safe_UV, GT_Safe_MAX; public static final GregtechItemList[] - DYE_ONLY_ITEMS = { - Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV }; + DYE_ONLY_ITEMS = { + Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV }; private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java b/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java index c466839c9d..26715d0801 100644 --- a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java +++ b/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java @@ -20,7 +20,8 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine this.mSteamCapacity = aSteamCapacity; } - public void addSlots(InventoryPlayer aInventoryPlayer) + @Override +public void addSlots(InventoryPlayer aInventoryPlayer) { addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62)); addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26)); @@ -28,12 +29,14 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26)); } - public int getSlotCount() + @Override +public int getSlotCount() { return 4; } - public int getShiftClickSlotCount() + @Override +public int getShiftClickSlotCount() { return 1; } @@ -45,7 +48,8 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine private final int mSteamCapacity; public long mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI; - public void detectAndSendChanges() + @Override +public void detectAndSendChanges() { super.detectAndSendChanges(); if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) { @@ -73,7 +77,8 @@ public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine } } - @SideOnly(Side.CLIENT) + @Override +@SideOnly(Side.CLIENT) public void updateProgressBar(int par1, int par2) { super.updateProgressBar(par1, par2); diff --git a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java index 3825acd239..0b57023286 100644 --- a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java +++ b/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java @@ -14,7 +14,8 @@ public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine super(new CONTAINER_SteamCondenser(aInventoryPlayer, aTileEntity, aSteamCapacity), CORE.MODID + ":" + "textures/gui/" + aTextureName); } - protected void drawGuiContainerForegroundLayer(int par1, int par2) + @Override +protected void drawGuiContainerForegroundLayer(int par1, int par2) { this.fontRendererObj.drawString("Condenser", 8, 4, 4210752); if (!CORE.DEBUG){ @@ -23,7 +24,8 @@ public class GUI_SteamCondenser extends GT_GUIContainerMetaTile_Machine } } - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) + @Override +protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { super.drawGuiContainerBackgroundLayer(par1, par2, par3); int x = (this.width - this.xSize) / 2; diff --git a/src/Java/miscutil/gregtech/init/InitGregtech.java b/src/Java/miscutil/gregtech/init/InitGregtech.java index 635443e70d..a6b6277e9d 100644 --- a/src/Java/miscutil/gregtech/init/InitGregtech.java +++ b/src/Java/miscutil/gregtech/init/InitGregtech.java @@ -4,6 +4,7 @@ import static miscutil.core.lib.LoadedMods.Gregtech; import miscutil.core.util.Utils; import miscutil.gregtech.init.machines.GregtechConduits; import miscutil.gregtech.init.machines.GregtechEnergyBuffer; +import miscutil.gregtech.init.machines.GregtechSafeBlock; import miscutil.gregtech.init.machines.GregtechSteamCondenser; public class InitGregtech { @@ -24,6 +25,7 @@ public class InitGregtech { GregtechEnergyBuffer.run(); GregtechConduits.run(); GregtechSteamCondenser.run(); + GregtechSafeBlock.run(); } } diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java b/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java index 767321de7b..79abce9fce 100644 --- a/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java +++ b/src/Java/miscutil/gregtech/init/machines/GregtechSteamCondenser.java @@ -25,8 +25,8 @@ public class GregtechSteamCondenser private static void run1() { //Steam Condensors - GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensor(780, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Condensor_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),OrePrefixes.wireGt04.get(Materials.Nickel),Character.valueOf('T'), ItemList.Pump_MV }); + GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L)); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Condensor_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),OrePrefixes.wireGt04.get(Materials.ElectricalSteel),Character.valueOf('T'), ItemList.Electric_Pump_MV }); /*Steam Condensors GregtechItemList.Condensor_MAX.set(new GregtechMetaCondensorII(780, "steamcondensor.01.tier.single", "Steam CondensorII").getStackForm(1L)); GT_ModHandler.addCraftingRecipe(GregtechItemList.Condensor_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),OrePrefixes.wireGt04.get(Materials.Nickel),Character.valueOf('T'), ItemList.Pump_MV }); |