From 63926ccd4a52488b66d9f5b94b1aa9b49bbdfc7e Mon Sep 17 00:00:00 2001 From: abel1502 Date: Mon, 30 Sep 2024 23:04:14 +0300 Subject: [PATCH 1/2] Add strand caster unclogging upgrade --- .../ContainerMachineStrandCaster.java | 14 +++- src/main/java/com/hbm/items/ModItems.java | 3 + .../hbm/items/machine/ItemMachineUpgrade.java | 6 ++ .../java/com/hbm/main/CraftingManager.java | 2 + .../TileEntityMachineStrandCaster.java | 63 +++++++++++------- src/main/resources/assets/hbm/lang/de_DE.lang | 1 + src/main/resources/assets/hbm/lang/en_US.lang | 1 + src/main/resources/assets/hbm/lang/it_IT.lang | 1 + src/main/resources/assets/hbm/lang/pl_PL.lang | 1 + src/main/resources/assets/hbm/lang/ru_RU.lang | 1 + src/main/resources/assets/hbm/lang/zh_CN.lang | 1 + .../gui/processing/gui_strand_caster.png | Bin 11637 -> 12535 bytes .../hbm/textures/items/upgrade_unclog.png | Bin 0 -> 759 bytes 13 files changed, 67 insertions(+), 27 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/upgrade_unclog.png diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java b/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java index 6c503f6ce..8850edf6f 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java @@ -2,6 +2,9 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotCraftingOutput; import com.hbm.inventory.SlotNonRetarded; +import com.hbm.inventory.SlotUpgrade; +import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.tileentity.machine.TileEntityMachineStrandCaster; import com.hbm.util.InventoryUtil; import net.minecraft.entity.player.EntityPlayer; @@ -27,6 +30,9 @@ public class ContainerMachineStrandCaster extends Container { } } + //unstacking upgrade + this.addSlotToContainer(new SlotUpgrade(this.caster, 7, 57, 25)); + for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { @@ -48,13 +54,17 @@ public class ContainerMachineStrandCaster extends Container { ItemStack originalStack = slot.getStack(); stack = originalStack.copy(); - if (index <= 6) { - if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 7, this.inventorySlots.size(), true)) { + if (index <= 7) { + if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 8, this.inventorySlots.size(), true)) { return null; } slot.onSlotChange(originalStack, stack); + } else if (stack.getItem() == ModItems.upgrade_unclog) { + // Doesn't matter if it suceeds + this.mergeItemStack(originalStack, 7, 8, false); + return null; } else if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 1, 2, false)) { return null; } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f14c4b01a..c1f57f7f0 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1849,6 +1849,7 @@ public class ModItems { public static Item upgrade_gc_speed; public static Item upgrade_5g; public static Item upgrade_stack; + public static Item upgrade_unclog; public static Item upgrade_ejector; public static Item ingot_euphemium; @@ -4401,6 +4402,7 @@ public class ModItems { upgrade_gc_speed = new ItemMachineUpgrade().setUnlocalizedName("upgrade_gc_speed").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_gc_speed"); upgrade_5g = new ItemMachineUpgrade().setUnlocalizedName("upgrade_5g").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_5g"); upgrade_stack = new ItemMetaUpgrade(3).setUnlocalizedName("upgrade_stack").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_stack"); + upgrade_unclog = new ItemMachineUpgrade().setUnlocalizedName("upgrade_unclog").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_unclog"); upgrade_ejector = new ItemMetaUpgrade(3).setUnlocalizedName("upgrade_ejector").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_ejector"); wand = new ItemWand().setUnlocalizedName("wand_k").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand"); @@ -6389,6 +6391,7 @@ public class ModItems { GameRegistry.registerItem(upgrade_gc_speed, upgrade_gc_speed.getUnlocalizedName()); GameRegistry.registerItem(upgrade_5g, upgrade_5g.getUnlocalizedName()); GameRegistry.registerItem(upgrade_stack, upgrade_stack.getUnlocalizedName()); + GameRegistry.registerItem(upgrade_unclog, upgrade_unclog.getUnlocalizedName()); GameRegistry.registerItem(upgrade_ejector, upgrade_ejector.getUnlocalizedName()); //Machine Templates diff --git a/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java b/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java index 99619f968..9eb813a43 100644 --- a/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java +++ b/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java @@ -107,6 +107,12 @@ public class ItemMachineUpgrade extends Item { list.add("Allows for total isotopic separation of HEUF6"); list.add(EnumChatFormatting.YELLOW + "also your centrifuge goes sicko mode"); } + + if(this == ModItems.upgrade_unclog) { + list.add(EnumChatFormatting.RED + "Strand Caster Upgrade"); + list.add("Stops the buffer from constantly clogging up"); + list.add("by allowing to periodically drain its contents"); + } } public static enum UpgradeType { diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index cce77298b..9ddedab8e 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -14,6 +14,7 @@ import com.hbm.config.GeneralConfig; import com.hbm.crafting.*; import com.hbm.crafting.handlers.*; import com.hbm.inventory.OreDictManager; +import com.hbm.inventory.OreDictManager.DictFrame; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.Mats; @@ -795,6 +796,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.upgrade_stack, 1, 0), new Object[] { " C ", "PUP", " C ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC), 'U', ModItems.upgrade_template }); addRecipeAuto(new ItemStack(ModItems.upgrade_stack, 1, 1), new Object[] { " C ", "PUP", " C ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_HYDRAULIC), 'U', new ItemStack(ModItems.upgrade_stack, 1, 0) }); addRecipeAuto(new ItemStack(ModItems.upgrade_stack, 1, 2), new Object[] { " C ", "PUP", " C ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_ELECTRIC), 'U', new ItemStack(ModItems.upgrade_stack, 1, 1) }); + addRecipeAuto(new ItemStack(ModItems.upgrade_unclog, 1), new Object[] { " B ", "TUT", " B ", 'B', new ItemStack(ModItems.tank_steel), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC), 'U', ModItems.upgrade_template }); addRecipeAuto(new ItemStack(ModItems.upgrade_ejector, 1, 0), new Object[] { " C ", "PUP", " C ", 'C', ModItems.plate_copper, 'P', ModItems.motor, 'U', ModItems.upgrade_template }); addRecipeAuto(new ItemStack(ModItems.upgrade_ejector, 1, 1), new Object[] { " C ", "PUP", " C ", 'C', ModItems.plate_gold, 'P', ModItems.motor, 'U', new ItemStack(ModItems.upgrade_ejector, 1, 0) }); addRecipeAuto(new ItemStack(ModItems.upgrade_ejector, 1, 2), new Object[] { " C ", "PUP", " C ", 'C', ModItems.plate_saturnite, 'P', ModItems.motor, 'U', new ItemStack(ModItems.upgrade_ejector, 1, 1) }); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java index d27f59aac..b67d2d8bb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java @@ -35,6 +35,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase public FluidTank water; public FluidTank steam; + private long lastCastTick = 0; public String getName() { return "container.machineStrandCaster"; @@ -46,7 +47,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase } public TileEntityMachineStrandCaster() { - super(7); + super(8); water = new FluidTank(Fluids.WATER, 64_000); steam = new FluidTank(Fluids.SPENTSTEAM, 64_000); } @@ -81,31 +82,41 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase ItemMold.Mold mold = this.getInstalledMold(); if(canProcess()) { - - int itemsCasted = Math.min(amount / mold.getCost(), 9); - - for(int j = 0; j < itemsCasted; j++) { - this.amount -= mold.getCost(); - - ItemStack out = mold.getOutput(type); - - for(int i = 1; i < 7; i++) { - if(slots[i] == null) { - slots[i] = out.copy(); - break; - } - - if(slots[i].isItemEqual(out) && slots[i].stackSize + out.stackSize <= out.getMaxStackSize()) { - slots[i].stackSize += out.stackSize; - break; - } - - } + int minAmount = mold.getCost() * 9; + + // The upgrade makes it flush the buffers after 10 seconds of inactivity + if(slots[7] != null && slots[7].getItem() == ModItems.upgrade_unclog && worldObj.getWorldTime() >= lastCastTick + 200) { + minAmount = mold.getCost(); } - markChanged(); - water.setFill(water.getFill() - getWaterRequired() * itemsCasted); - steam.setFill(steam.getFill() + getWaterRequired() * itemsCasted); + if(this.amount >= minAmount) { + int itemsCasted = amount / mold.getCost(); + + for(int j = 0; j < itemsCasted; j++) { + this.amount -= mold.getCost(); + + ItemStack out = mold.getOutput(type); + + for(int i = 1; i < 7; i++) { + if(slots[i] == null) { + slots[i] = out.copy(); + break; + } + + if(slots[i].isItemEqual(out) && slots[i].stackSize + out.stackSize <= out.getMaxStackSize()) { + slots[i].stackSize += out.stackSize; + break; + } + + } + } + markChanged(); + + water.setFill(water.getFill() - getWaterRequired() * itemsCasted); + steam.setFill(steam.getFill() + getWaterRequired() * itemsCasted); + + lastCastTick = worldObj.getWorldTime(); + } } } @@ -120,7 +131,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase public boolean canProcess() { ItemMold.Mold mold = this.getInstalledMold(); - if(type != null && mold != null && this.amount >= mold.getCost() * 9 && mold.getOutput(type) != null) { + if(type != null && mold != null && mold.getOutput(type) != null) { for(int i = 1; i < 7; i++) { if(slots[i] == null || slots[i].isItemEqual(mold.getOutput(type)) && slots[i].stackSize + mold.getOutput(type).stackSize <= mold.getOutput(type).getMaxStackSize()) return water.getFill() >= getWaterRequired() && steam.getFill() < steam.getMaxFill(); @@ -270,6 +281,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase super.writeToNBT(nbt); water.writeToNBT(nbt, "w"); steam.writeToNBT(nbt, "s"); + nbt.setLong("t", lastCastTick); } @Override @@ -277,6 +289,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase super.readFromNBT(nbt); water.readFromNBT(nbt, "w"); steam.readFromNBT(nbt, "s"); + lastCastTick = nbt.getLong("t"); } @Override diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 89177e7b7..fa95fdc2c 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3515,6 +3515,7 @@ item.upgrade_speed_3.name=Geschwindigkeitsupgrade Mk.III item.upgrade_stack_1.name=Stapelupgrade Mk.I item.upgrade_stack_2.name=Stapelupgrade Mk.II item.upgrade_stack_3.name=Stapelupgrade Mk.III +item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Maschinenupgrade-Vorlage item.volcanic_pickaxe.name=Geschmolzene Spitzhacke item.wand_d.name=Debug-Zauberstab diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index be8bb0358..b91a80313 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -4532,6 +4532,7 @@ item.upgrade_speed_3.name=Speed Upgrade Mk.III item.upgrade_stack_1.name=Stack Ejection Upgrade Mk.I item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III +item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Machine Upgrade Template item.volcanic_axe.name=Molten Axe item.volcanic_pickaxe.name=Molten Pickaxe diff --git a/src/main/resources/assets/hbm/lang/it_IT.lang b/src/main/resources/assets/hbm/lang/it_IT.lang index 1143e0318..acac9eb4a 100644 --- a/src/main/resources/assets/hbm/lang/it_IT.lang +++ b/src/main/resources/assets/hbm/lang/it_IT.lang @@ -4711,6 +4711,7 @@ item.upgrade_speed_3.name=Speed Upgrade Mk.III item.upgrade_stack_1.name=Stack Ejection Upgrade Mk.I item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III +item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Machine Upgrade Template item.volcanic_axe.name=Molten Axe item.volcanic_pickaxe.name=Molten Pickaxe diff --git a/src/main/resources/assets/hbm/lang/pl_PL.lang b/src/main/resources/assets/hbm/lang/pl_PL.lang index 1307d0b8b..3cdfabd06 100644 --- a/src/main/resources/assets/hbm/lang/pl_PL.lang +++ b/src/main/resources/assets/hbm/lang/pl_PL.lang @@ -4137,6 +4137,7 @@ item.upgrade_speed_3.name=Speed Upgrade Mk.III item.upgrade_stack_1.name=Stack Ejection Upgrade Mk.I item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III +item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Machine Upgrade Template item.v1.name=V1 item.volcanic_pickaxe.name=Molten Pickaxe diff --git a/src/main/resources/assets/hbm/lang/ru_RU.lang b/src/main/resources/assets/hbm/lang/ru_RU.lang index 93e77b657..a5b9d9a4a 100644 --- a/src/main/resources/assets/hbm/lang/ru_RU.lang +++ b/src/main/resources/assets/hbm/lang/ru_RU.lang @@ -3965,6 +3965,7 @@ item.upgrade_ejector_3.name=Улучшение извлекателя "Скор item.upgrade_stack_1.name=Улучшение извлекателя "Количество стака" I уровня item.upgrade_stack_2.name=Улучшение извлекателя "Количество стака" II уровня item.upgrade_stack_3.name=Улучшение извлекателя "Количество стака" III уровня +item.upgrade_unclog.name=Улучшение машины непрерывного литья "Частичный слив" item.fusion_core.name=Ядерный блок item.energy_core.name=Импровизированный энергоблок diff --git a/src/main/resources/assets/hbm/lang/zh_CN.lang b/src/main/resources/assets/hbm/lang/zh_CN.lang index 3190e942c..511d554b6 100644 --- a/src/main/resources/assets/hbm/lang/zh_CN.lang +++ b/src/main/resources/assets/hbm/lang/zh_CN.lang @@ -4407,6 +4407,7 @@ item.upgrade_speed_3=三级红色机器升级 item.upgrade_stack_1=一级堆叠弹出升级 item.upgrade_stack_2=二级堆叠弹出升级 item.upgrade_stack_3=三级堆叠弹出升级 +item.upgrade_unclog.name=Unclogging upgrade item.upgrade_template=机器升级模板 item.volcanic_axe=熔岩斧 item.volcanic_pickaxe=熔岩镐 diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_strand_caster.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_strand_caster.png index 2af67e09eb749ed526c61c2ef58bd3f7ff5bd5e1..de357deddd8ca359bb3ec47fac1e24a7ceff1d2c 100644 GIT binary patch literal 12535 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 F{{kb*75xAJ literal 11637 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 diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_unclog.png b/src/main/resources/assets/hbm/textures/items/upgrade_unclog.png new file mode 100644 index 0000000000000000000000000000000000000000..9ff526c640cac058ffb9286d08404125485d5b3c GIT binary patch literal 759 zcmV zG|^3f5&Q||SktqUF>0>&8$7yRhjg#n_x@ciDZ^3VX%rq+mR%HxFigTNY`oL9Bv zHk__Q$DNh16W@|gw%0V_`50Q`&~^pQi`&IW0|{rm;O1t7nH zoVWa^0a%e~^iKwc_l*q8XJ#{W?LP`uROV<6X9sF1GpI^RFhsIn0Gjrkf$5}848xv9 zM-kQnH6J^R;9j_J0V^A%=j6$Im|+0(D=q+Ye*KEIV7*KrFZ{2t{!d6FG5~o2r00K# z(tj3^7r@aIZh)fb=kr@&`tIA0U|LJZ6h$871zu)gELc2-c;l3;G)gqWG%5@8WA#SV zGl)JGcq{C&ffe^sz1@uIMFD77KU_wr|APJE3Kp5s!7@KGS^4o4H pXbwbT;{uqu5g0HazhSU(006;%sgg@XZ_@w(002ovPDHLkV1fZvPM81y literal 0 HcmV?d00001 From 4b59c55c5a61b4932391194328d225845f668e58 Mon Sep 17 00:00:00 2001 From: abel1502 Date: Tue, 1 Oct 2024 00:18:24 +0300 Subject: [PATCH 2/2] Remove the upgrade, just change the caster --- .../ContainerMachineStrandCaster.java | 14 ++------------ src/main/java/com/hbm/items/ModItems.java | 3 --- .../hbm/items/machine/ItemMachineUpgrade.java | 6 ------ .../java/com/hbm/main/CraftingManager.java | 2 -- .../TileEntityMachineStrandCaster.java | 18 +++++++++--------- src/main/resources/assets/hbm/lang/de_DE.lang | 1 - src/main/resources/assets/hbm/lang/en_US.lang | 1 - src/main/resources/assets/hbm/lang/it_IT.lang | 1 - src/main/resources/assets/hbm/lang/pl_PL.lang | 1 - src/main/resources/assets/hbm/lang/ru_RU.lang | 1 - src/main/resources/assets/hbm/lang/zh_CN.lang | 1 - .../gui/processing/gui_strand_caster.png | Bin 12535 -> 11637 bytes .../hbm/textures/items/upgrade_unclog.png | Bin 759 -> 0 bytes 13 files changed, 11 insertions(+), 38 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/items/upgrade_unclog.png diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java b/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java index 8850edf6f..6c503f6ce 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineStrandCaster.java @@ -2,9 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotCraftingOutput; import com.hbm.inventory.SlotNonRetarded; -import com.hbm.inventory.SlotUpgrade; -import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.tileentity.machine.TileEntityMachineStrandCaster; import com.hbm.util.InventoryUtil; import net.minecraft.entity.player.EntityPlayer; @@ -30,9 +27,6 @@ public class ContainerMachineStrandCaster extends Container { } } - //unstacking upgrade - this.addSlotToContainer(new SlotUpgrade(this.caster, 7, 57, 25)); - for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { @@ -54,17 +48,13 @@ public class ContainerMachineStrandCaster extends Container { ItemStack originalStack = slot.getStack(); stack = originalStack.copy(); - if (index <= 7) { - if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 8, this.inventorySlots.size(), true)) { + if (index <= 6) { + if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 7, this.inventorySlots.size(), true)) { return null; } slot.onSlotChange(originalStack, stack); - } else if (stack.getItem() == ModItems.upgrade_unclog) { - // Doesn't matter if it suceeds - this.mergeItemStack(originalStack, 7, 8, false); - return null; } else if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 1, 2, false)) { return null; } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index c1f57f7f0..f14c4b01a 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1849,7 +1849,6 @@ public class ModItems { public static Item upgrade_gc_speed; public static Item upgrade_5g; public static Item upgrade_stack; - public static Item upgrade_unclog; public static Item upgrade_ejector; public static Item ingot_euphemium; @@ -4402,7 +4401,6 @@ public class ModItems { upgrade_gc_speed = new ItemMachineUpgrade().setUnlocalizedName("upgrade_gc_speed").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_gc_speed"); upgrade_5g = new ItemMachineUpgrade().setUnlocalizedName("upgrade_5g").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_5g"); upgrade_stack = new ItemMetaUpgrade(3).setUnlocalizedName("upgrade_stack").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_stack"); - upgrade_unclog = new ItemMachineUpgrade().setUnlocalizedName("upgrade_unclog").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_unclog"); upgrade_ejector = new ItemMetaUpgrade(3).setUnlocalizedName("upgrade_ejector").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_ejector"); wand = new ItemWand().setUnlocalizedName("wand_k").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand"); @@ -6391,7 +6389,6 @@ public class ModItems { GameRegistry.registerItem(upgrade_gc_speed, upgrade_gc_speed.getUnlocalizedName()); GameRegistry.registerItem(upgrade_5g, upgrade_5g.getUnlocalizedName()); GameRegistry.registerItem(upgrade_stack, upgrade_stack.getUnlocalizedName()); - GameRegistry.registerItem(upgrade_unclog, upgrade_unclog.getUnlocalizedName()); GameRegistry.registerItem(upgrade_ejector, upgrade_ejector.getUnlocalizedName()); //Machine Templates diff --git a/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java b/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java index 9eb813a43..99619f968 100644 --- a/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java +++ b/src/main/java/com/hbm/items/machine/ItemMachineUpgrade.java @@ -107,12 +107,6 @@ public class ItemMachineUpgrade extends Item { list.add("Allows for total isotopic separation of HEUF6"); list.add(EnumChatFormatting.YELLOW + "also your centrifuge goes sicko mode"); } - - if(this == ModItems.upgrade_unclog) { - list.add(EnumChatFormatting.RED + "Strand Caster Upgrade"); - list.add("Stops the buffer from constantly clogging up"); - list.add("by allowing to periodically drain its contents"); - } } public static enum UpgradeType { diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 9ddedab8e..cce77298b 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -14,7 +14,6 @@ import com.hbm.config.GeneralConfig; import com.hbm.crafting.*; import com.hbm.crafting.handlers.*; import com.hbm.inventory.OreDictManager; -import com.hbm.inventory.OreDictManager.DictFrame; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.Mats; @@ -796,7 +795,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.upgrade_stack, 1, 0), new Object[] { " C ", "PUP", " C ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC), 'U', ModItems.upgrade_template }); addRecipeAuto(new ItemStack(ModItems.upgrade_stack, 1, 1), new Object[] { " C ", "PUP", " C ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_HYDRAULIC), 'U', new ItemStack(ModItems.upgrade_stack, 1, 0) }); addRecipeAuto(new ItemStack(ModItems.upgrade_stack, 1, 2), new Object[] { " C ", "PUP", " C ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_ELECTRIC), 'U', new ItemStack(ModItems.upgrade_stack, 1, 1) }); - addRecipeAuto(new ItemStack(ModItems.upgrade_unclog, 1), new Object[] { " B ", "TUT", " B ", 'B', new ItemStack(ModItems.tank_steel), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC), 'U', ModItems.upgrade_template }); addRecipeAuto(new ItemStack(ModItems.upgrade_ejector, 1, 0), new Object[] { " C ", "PUP", " C ", 'C', ModItems.plate_copper, 'P', ModItems.motor, 'U', ModItems.upgrade_template }); addRecipeAuto(new ItemStack(ModItems.upgrade_ejector, 1, 1), new Object[] { " C ", "PUP", " C ", 'C', ModItems.plate_gold, 'P', ModItems.motor, 'U', new ItemStack(ModItems.upgrade_ejector, 1, 0) }); addRecipeAuto(new ItemStack(ModItems.upgrade_ejector, 1, 2), new Object[] { " C ", "PUP", " C ", 'C', ModItems.plate_saturnite, 'P', ModItems.motor, 'U', new ItemStack(ModItems.upgrade_ejector, 1, 1) }); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java index b67d2d8bb..c05bfe3fe 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java @@ -47,7 +47,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase } public TileEntityMachineStrandCaster() { - super(8); + super(7); water = new FluidTank(Fluids.WATER, 64_000); steam = new FluidTank(Fluids.SPENTSTEAM, 64_000); } @@ -84,34 +84,34 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase if(canProcess()) { int minAmount = mold.getCost() * 9; - // The upgrade makes it flush the buffers after 10 seconds of inactivity - if(slots[7] != null && slots[7].getItem() == ModItems.upgrade_unclog && worldObj.getWorldTime() >= lastCastTick + 200) { + // Makes it flush the buffers after 10 seconds of inactivity + if(worldObj.getWorldTime() >= lastCastTick + 200) { minAmount = mold.getCost(); } if(this.amount >= minAmount) { int itemsCasted = amount / mold.getCost(); - + for(int j = 0; j < itemsCasted; j++) { this.amount -= mold.getCost(); - + ItemStack out = mold.getOutput(type); - + for(int i = 1; i < 7; i++) { if(slots[i] == null) { slots[i] = out.copy(); break; } - + if(slots[i].isItemEqual(out) && slots[i].stackSize + out.stackSize <= out.getMaxStackSize()) { slots[i].stackSize += out.stackSize; break; } - + } } markChanged(); - + water.setFill(water.getFill() - getWaterRequired() * itemsCasted); steam.setFill(steam.getFill() + getWaterRequired() * itemsCasted); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index fa95fdc2c..89177e7b7 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3515,7 +3515,6 @@ item.upgrade_speed_3.name=Geschwindigkeitsupgrade Mk.III item.upgrade_stack_1.name=Stapelupgrade Mk.I item.upgrade_stack_2.name=Stapelupgrade Mk.II item.upgrade_stack_3.name=Stapelupgrade Mk.III -item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Maschinenupgrade-Vorlage item.volcanic_pickaxe.name=Geschmolzene Spitzhacke item.wand_d.name=Debug-Zauberstab diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index b91a80313..be8bb0358 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -4532,7 +4532,6 @@ item.upgrade_speed_3.name=Speed Upgrade Mk.III item.upgrade_stack_1.name=Stack Ejection Upgrade Mk.I item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III -item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Machine Upgrade Template item.volcanic_axe.name=Molten Axe item.volcanic_pickaxe.name=Molten Pickaxe diff --git a/src/main/resources/assets/hbm/lang/it_IT.lang b/src/main/resources/assets/hbm/lang/it_IT.lang index acac9eb4a..1143e0318 100644 --- a/src/main/resources/assets/hbm/lang/it_IT.lang +++ b/src/main/resources/assets/hbm/lang/it_IT.lang @@ -4711,7 +4711,6 @@ item.upgrade_speed_3.name=Speed Upgrade Mk.III item.upgrade_stack_1.name=Stack Ejection Upgrade Mk.I item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III -item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Machine Upgrade Template item.volcanic_axe.name=Molten Axe item.volcanic_pickaxe.name=Molten Pickaxe diff --git a/src/main/resources/assets/hbm/lang/pl_PL.lang b/src/main/resources/assets/hbm/lang/pl_PL.lang index 3cdfabd06..1307d0b8b 100644 --- a/src/main/resources/assets/hbm/lang/pl_PL.lang +++ b/src/main/resources/assets/hbm/lang/pl_PL.lang @@ -4137,7 +4137,6 @@ item.upgrade_speed_3.name=Speed Upgrade Mk.III item.upgrade_stack_1.name=Stack Ejection Upgrade Mk.I item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III -item.upgrade_unclog.name=Unclogging Upgrade item.upgrade_template.name=Machine Upgrade Template item.v1.name=V1 item.volcanic_pickaxe.name=Molten Pickaxe diff --git a/src/main/resources/assets/hbm/lang/ru_RU.lang b/src/main/resources/assets/hbm/lang/ru_RU.lang index a5b9d9a4a..93e77b657 100644 --- a/src/main/resources/assets/hbm/lang/ru_RU.lang +++ b/src/main/resources/assets/hbm/lang/ru_RU.lang @@ -3965,7 +3965,6 @@ item.upgrade_ejector_3.name=Улучшение извлекателя "Скор item.upgrade_stack_1.name=Улучшение извлекателя "Количество стака" I уровня item.upgrade_stack_2.name=Улучшение извлекателя "Количество стака" II уровня item.upgrade_stack_3.name=Улучшение извлекателя "Количество стака" III уровня -item.upgrade_unclog.name=Улучшение машины непрерывного литья "Частичный слив" item.fusion_core.name=Ядерный блок item.energy_core.name=Импровизированный энергоблок diff --git a/src/main/resources/assets/hbm/lang/zh_CN.lang b/src/main/resources/assets/hbm/lang/zh_CN.lang index 511d554b6..3190e942c 100644 --- a/src/main/resources/assets/hbm/lang/zh_CN.lang +++ b/src/main/resources/assets/hbm/lang/zh_CN.lang @@ -4407,7 +4407,6 @@ item.upgrade_speed_3=三级红色机器升级 item.upgrade_stack_1=一级堆叠弹出升级 item.upgrade_stack_2=二级堆叠弹出升级 item.upgrade_stack_3=三级堆叠弹出升级 -item.upgrade_unclog.name=Unclogging upgrade item.upgrade_template=机器升级模板 item.volcanic_axe=熔岩斧 item.volcanic_pickaxe=熔岩镐 diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_strand_caster.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_strand_caster.png index de357deddd8ca359bb3ec47fac1e24a7ceff1d2c..2af67e09eb749ed526c61c2ef58bd3f7ff5bd5e1 100644 GIT binary patch literal 11637 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 literal 12535 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 F{{kb*75xAJ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_unclog.png b/src/main/resources/assets/hbm/textures/items/upgrade_unclog.png deleted file mode 100644 index 9ff526c640cac058ffb9286d08404125485d5b3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 zcmV zG|^3f5&Q||SktqUF>0>&8$7yRhjg#n_x@ciDZ^3VX%rq+mR%HxFigTNY`oL9Bv zHk__Q$DNh16W@|gw%0V_`50Q`&~^pQi`&IW0|{rm;O1t7nH zoVWa^0a%e~^iKwc_l*q8XJ#{W?LP`uROV<6X9sF1GpI^RFhsIn0Gjrkf$5}848xv9 zM-kQnH6J^R;9j_J0V^A%=j6$Im|+0(D=q+Ye*KEIV7*KrFZ{2t{!d6FG5~o2r00K# z(tj3^7r@aIZh)fb=kr@&`tIA0U|LJZ6h$871zu)gELc2-c;l3;G)gqWG%5@8WA#SV zGl)JGcq{C&ffe^sz1@uIMFD77KU_wr|APJE3Kp5s!7@KGS^4o4H pXbwbT;{uqu5g0HazhSU(006;%sgg@XZ_@w(002ovPDHLkV1fZvPM81y