diff --git a/changelog b/changelog index 682553da7..696da46e0 100644 --- a/changelog +++ b/changelog @@ -1,27 +1,10 @@ -## Added -* New assembly factory - * Once again four recipe units at double the base speed - * Upgrades and stats are identical to the chemical factory - * Comes with an improved version of the old assemfac animations - ## Changed -* Updated chinese localization -* Added more QMAW manual pages -* WIAJ presentations now use the same configurable keybind as QMAW - * Shift has to be held for the presentations, while F1 will open the standard QMAW page -* Double UZIs no longer render weirdly when dropped -* Added keyboard controls to the recipe selector's scroll function - * Up and down keys scroll by one line - * PgUp and PgDown scroll by 5 lines (full page) - * Pos1 and End keys scroll to the top and bottom of the list respectively -* C4, like semtex, is now edible -* Assembly machines can now be made with the assembly machine - * The recipe is similar to the anvil recipe, but it uses only half as much steel, and one analog circuit instead of four vacuum tubes +* Added a (LEGACY) tag to the schrabidium transmutator +* Existing schrabidium transmutators are now way slower + * get souped +* Removed the schraranium tooltip mentioning the transmutator +* Changed the last remaining recipes that use the old steel pipes item, as well as the recipe for the steel pipes + * Any remaining steel pipes can be either smelted in a crucible or shredded ## Fixed -* Fixed fusion reactor item IO being broken -* Fixed issue with the chemical factory where the declogging feature would be triggered by a recipe processor that doesn't even own the reported slot -* Fixed the new PA not triggering the omega-12 achievement - * In addition to granting the achievement to nearby players on recipe completion, it is also granted when taking it out of the output slot -* Fixed the PUREX recipe for processing ZIRNOX MEU fuel not yielding technetium as it should -* Fixed turbofans pulling in players even when disabled via redstone \ No newline at end of file +* Fixed various issues with the localization \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 77f883e59..4272a5935 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5453 +mod_build_number=5454 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 291cc2341..e6b9fc306 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -123,7 +123,6 @@ public class AnvilRecipes extends SerializableRecipe { smithingRecipes.add(new AnvilSmithingMold(10, new OreDictStack(IRON.ingot(), 9), new OreDictStack("ingot", 9))); smithingRecipes.add(new AnvilSmithingMold(11, new OreDictStack(IRON.plate(), 9), new OreDictStack("plate", 9))); smithingRecipes.add(new AnvilSmithingMold(12, new OreDictStack(IRON.block()), new OreDictStack("block"))); - smithingRecipes.add(new AnvilSmithingMold(13, new ComparableStack(ModItems.pipes_steel), new ItemStack[] {new ItemStack(ModItems.pipes_steel)})); smithingRecipes.add(new AnvilSmithingMold(20, new OreDictStack(ALLOY.wireDense(), 1), new OreDictStack("wireDense", 1))); smithingRecipes.add(new AnvilSmithingMold(21, new OreDictStack(ALLOY.wireDense(), 9), new OreDictStack("wireDense", 9))); diff --git a/src/main/java/com/hbm/items/bomb/ItemSolinium.java b/src/main/java/com/hbm/items/bomb/ItemSolinium.java index 9951a7111..26e8f45ae 100644 --- a/src/main/java/com/hbm/items/bomb/ItemSolinium.java +++ b/src/main/java/com/hbm/items/bomb/ItemSolinium.java @@ -14,7 +14,7 @@ public class ItemSolinium extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { list.add(I18nUtil.resolveKey("item.bomb_part.used_in")); - list.add(ModBlocks.nuke_solinium.getLocalizedName() + " name"); + list.add(ModBlocks.nuke_solinium.getLocalizedName()); super.addInformation(itemstack, player, list, bool); } } diff --git a/src/main/java/com/hbm/items/food/ItemLemon.java b/src/main/java/com/hbm/items/food/ItemLemon.java index 2d211ff2f..12dc09817 100644 --- a/src/main/java/com/hbm/items/food/ItemLemon.java +++ b/src/main/java/com/hbm/items/food/ItemLemon.java @@ -35,10 +35,10 @@ public class ItemLemon extends ItemFood { } if(this == ModItems.med_ipecac) { - String[] lines = I18nUtil.resolveKeyArray("item.med_ipecac.desc"); + String[] lines = I18nUtil.resolveKeyArray("item.med_ipecac.desс"); for (String line : lines) { list.add(line); - } + } } if(this == ModItems.med_ptsd) { diff --git a/src/main/java/com/hbm/items/machine/ItemMold.java b/src/main/java/com/hbm/items/machine/ItemMold.java index 25b273d4f..7d6b0a092 100644 --- a/src/main/java/com/hbm/items/machine/ItemMold.java +++ b/src/main/java/com/hbm/items/machine/ItemMold.java @@ -75,7 +75,7 @@ public class ItemMold extends Item { registerMold(new MoldShape( 11, L, "plates", MaterialShapes.PLATE, 9)); registerMold(new MoldShape( 21, L, "wires_dense", MaterialShapes.DENSEWIRE, 9)); registerMold(new MoldBlock( 12, L, "block", MaterialShapes.BLOCK)); - registerMold(new MoldSingle( 13, L, "pipes", new ItemStack(ModItems.pipes_steel), Mats.MAT_STEEL, MaterialShapes.BLOCK.q(3))); + //registerMold(new MoldSingle( 13, L, "pipes", new ItemStack(ModItems.pipes_steel), Mats.MAT_STEEL, MaterialShapes.BLOCK.q(3))); registerMold(new MoldMulti( 16, S, "c9", MaterialShapes.PLATE.q(1, 4), Mats.MAT_GUNMETAL, DictFrame.fromOne(ModItems.casing, EnumCasingType.SMALL), diff --git a/src/main/java/com/hbm/items/special/ItemHotDusted.java b/src/main/java/com/hbm/items/special/ItemHotDusted.java index 0c9f3f86d..8a4d75202 100644 --- a/src/main/java/com/hbm/items/special/ItemHotDusted.java +++ b/src/main/java/com/hbm/items/special/ItemHotDusted.java @@ -14,7 +14,7 @@ public class ItemHotDusted extends ItemHot { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { - list.add(String.format(I18nUtil.resolveKey("item.hot_dusted.forged"), stack.getItemDamage())); + list.add(I18nUtil.resolveKey("item.hot_dusted.forged", stack.getItemDamage())); } public static int getMaxHeat(ItemStack stack) { diff --git a/src/main/java/com/hbm/items/special/ItemSchraranium.java b/src/main/java/com/hbm/items/special/ItemSchraranium.java index 4e092b9a6..d3644a682 100644 --- a/src/main/java/com/hbm/items/special/ItemSchraranium.java +++ b/src/main/java/com/hbm/items/special/ItemSchraranium.java @@ -40,9 +40,6 @@ public class ItemSchraranium extends ItemCustomLore { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - if(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMFullSchrab) - list.add("pankæk"); - else - super.addInformation(itemstack, player, list, bool); + if(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMFullSchrab) list.add("pankæk"); } } diff --git a/src/main/java/com/hbm/items/weapon/ItemCustomMissile.java b/src/main/java/com/hbm/items/weapon/ItemCustomMissile.java index 6d428a401..1dba37387 100644 --- a/src/main/java/com/hbm/items/weapon/ItemCustomMissile.java +++ b/src/main/java/com/hbm/items/weapon/ItemCustomMissile.java @@ -65,33 +65,33 @@ public class ItemCustomMissile extends Item { ItemCustomMissilePart thruster = (ItemCustomMissilePart) Item.getItemById(readFromNBT(stack, "thruster")); // warhead name - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.warhead") + ": " + EnumChatFormatting.GRAY + warhead.getWarhead((WarheadType)warhead.attributes[0])); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.warhead") + ": " + EnumChatFormatting.GRAY + warhead.getWarhead((WarheadType)warhead.attributes[0])); // strength - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.strength") + ": " + EnumChatFormatting.GRAY + (Float)warhead.attributes[1]); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.strength") + ": " + EnumChatFormatting.GRAY + (Float)warhead.attributes[1]); // fuel type & amount - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.fuelType") + ": " + EnumChatFormatting.GRAY + fuselage.getFuel((FuelType)fuselage.attributes[0])); - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.fuelAmount") + ": " + EnumChatFormatting.GRAY + (Float)fuselage.attributes[1] + "l"); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.fuelType") + ": " + EnumChatFormatting.GRAY + fuselage.getFuel((FuelType)fuselage.attributes[0])); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.fuelAmount") + ": " + EnumChatFormatting.GRAY + (Float)fuselage.attributes[1] + "l"); // chip inaccuracy - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.chipInaccuracy") + ": " + EnumChatFormatting.GRAY + (Float)chip.attributes[0] * 100 + "%"); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.chipInaccuracy") + ": " + EnumChatFormatting.GRAY + (Float)chip.attributes[0] * 100 + "%"); // fin inaccuracy if(stability != null) - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.finInaccuracy") + ": " + EnumChatFormatting.GRAY + (Float)stability.attributes[0] * 100 + "%"); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.finInaccuracy") + ": " + EnumChatFormatting.GRAY + (Float)stability.attributes[0] * 100 + "%"); else - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.finInaccuracy") + ": " + EnumChatFormatting.GRAY + "100%"); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.finInaccuracy") + ": " + EnumChatFormatting.GRAY + "100%"); // size - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.size") + ": " + EnumChatFormatting.GRAY + fuselage.getSize(fuselage.top) + "/" + fuselage.getSize(fuselage.bottom)); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.size") + ": " + EnumChatFormatting.GRAY + fuselage.getSize(fuselage.top) + "/" + fuselage.getSize(fuselage.bottom)); // health float health = warhead.health + fuselage.health + thruster.health; if(stability != null) health += stability.health; - list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("gui.missile.health") + ": " + EnumChatFormatting.GRAY + health + "HP"); + list.add(EnumChatFormatting.BOLD + I18nUtil.resolveKey("item.missile.desc.health") + ": " + EnumChatFormatting.GRAY + health + "HP"); } catch(Exception ex) { list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("error.generic")); diff --git a/src/main/java/com/hbm/items/weapon/ItemCustomMissilePart.java b/src/main/java/com/hbm/items/weapon/ItemCustomMissilePart.java index 29b391eaf..ab2b40f42 100644 --- a/src/main/java/com/hbm/items/weapon/ItemCustomMissilePart.java +++ b/src/main/java/com/hbm/items/weapon/ItemCustomMissilePart.java @@ -305,7 +305,7 @@ public class ItemCustomMissilePart extends Item { case SOLID: return EnumChatFormatting.GOLD + I18nUtil.resolveKey("item.missile.fuel.solid"); case HYDROGEN: - return EnumChatFormatting.DARK_AQUA + I18nUtil.resolveKey("item.missile.fuel.ethanol_peroxide"); // closest match + return EnumChatFormatting.DARK_AQUA + I18nUtil.resolveKey("item.missile.fuel.hydrogen"); // closest match case XENON: return EnumChatFormatting.DARK_PURPLE + I18nUtil.resolveKey("item.missile.fuel.xenon"); case BALEFIRE: diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 5b17eb388..95f5a80bc 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5453)"; + public static final String VERSION = "1.0.27 BETA (5454)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 2a51edc27..da4758b0d 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -97,7 +97,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.hazmat_cloth_grey, 1), new Object[] { " P ", "ICI", " L ", 'C', ModItems.hazmat_cloth_red, 'P', IRON.plate(), 'L', PB.plate(), 'I', ANY_RUBBER.ingot() }); addRecipeAuto(new ItemStack(ModItems.asbestos_cloth, 8), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', BR.dust(), 'C', Blocks.wool }); addRecipeAuto(new ItemStack(ModItems.bolt_spike, 2), new Object[] { "BB", "B ", "B ", 'B', STEEL.bolt()}); - addRecipeAuto(new ItemStack(ModItems.pipes_steel, 1), new Object[] { "B", "B", "B", 'B', STEEL.block() }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_PLASTIC.ingot() }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_RUBBER.ingot() }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 16), new Object[] { "DD", 'D', FIBER.ingot()}); @@ -355,7 +354,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.stamp_desh_flat, 1), new Object[] { "BDB", "DSD", "BDB", 'B', brick, 'D', DESH.ingot(), 'S', FERRO.ingot() }); } - addRecipeAuto(new ItemStack(ModBlocks.watz_pump, 1), new Object[] { "MPM", "PCP", "PSP", 'M', ModItems.motor_desh, 'P', ANY_RESISTANTALLOY.plateCast(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID), 'S', ModItems.pipes_steel }); + addRecipeAuto(new ItemStack(ModBlocks.watz_pump, 1), new Object[] { "MPM", "PCP", "PSP", 'M', ModItems.motor_desh, 'P', ANY_RESISTANTALLOY.plateCast(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID), 'S', DURA.pipe() }); addRecipeAuto(new ItemStack(ModBlocks.reinforced_stone, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.cobblestone, 'B', Blocks.stone }); addRecipeAuto(new ItemStack(ModBlocks.brick_light, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block }); @@ -755,7 +754,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.dfc_core, 1), new Object[] { "DLD", "LML", "DLD", 'D', ModItems.ingot_bismuth, 'L', DNT.block(), 'M', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID) }); addRecipeAuto(new ItemStack(ModBlocks.dfc_emitter, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModBlocks.machine_transformer_dnt, 'X', ModItems.crystal_xen, 'L', ModItems.sat_head_laser }); addRecipeAuto(new ItemStack(ModBlocks.dfc_receiver, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModBlocks.machine_transformer_dnt, 'X', ModBlocks.block_dineutronium, 'L', STEEL.shell() }); - addRecipeAuto(new ItemStack(ModBlocks.dfc_injector, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', CMB.plate(), 'T', ModBlocks.machine_fluidtank, 'X', ModItems.motor, 'L', ModItems.pipes_steel }); + addRecipeAuto(new ItemStack(ModBlocks.dfc_injector, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', CMB.plate(), 'T', ModBlocks.machine_fluidtank, 'X', ModItems.motor, 'L', STEEL.pipe() }); addRecipeAuto(new ItemStack(ModBlocks.dfc_stabilizer, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModItems.singularity_spark, 'X', ModBlocks.fusion_conductor, 'L', ModItems.crystal_xen }); addRecipeAuto(new ItemStack(ModBlocks.barrel_plastic, 1), new Object[] { "IPI", "I I", "IPI", 'I', ModItems.plate_polymer, 'P', AL.plate() }); addRecipeAuto(new ItemStack(ModBlocks.barrel_iron, 1), new Object[] { "IPI", "I I", "IPI", 'I', IRON.plate(), 'P', IRON.ingot() }); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java index 6f9016127..206645805 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java @@ -29,7 +29,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntityMachineB public long power = 0; public int process = 0; public static final long maxPower = 5000000; - public static final int processSpeed = 600; + public static final int processSpeed = 6000; private AudioWrapper audio; diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java index 3d3213d2c..cba7bf1f0 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java @@ -101,13 +101,10 @@ public class TileEntityMassStorage extends TileEntityCrateBase implements IBufPa } public boolean quickInsert(ItemStack stack) { - if (!canInsert(stack)) - return false; - - int remaining = getCapacity() - getStockpile(); + if(!canInsert(stack)) return false; - if (remaining < stack.stackSize) - return false; + int remaining = getCapacity() - getStockpile(); + if(remaining < stack.stackSize) return false; this.stack += stack.stackSize; stack.stackSize = 0; @@ -117,15 +114,12 @@ public class TileEntityMassStorage extends TileEntityCrateBase implements IBufPa } public ItemStack quickExtract() { - if (!output) { - return null; - } + if(!output) return null; int amount = getType().getMaxStackSize(); - if (getStockpile() < amount) - return null; - + if(getStockpile() < amount) return null; + ItemStack result = slots[1].copy(); result.stackSize = amount; this.stack -= amount; @@ -138,18 +132,17 @@ public class TileEntityMassStorage extends TileEntityCrateBase implements IBufPa public int getTotalStockpile() { ItemStack type = getType(); - if (type == null) - return 0; + if(type == null) return 0; int result = getStockpile(); ItemStack inStack = slots[0]; - if (inStack != null && ItemStackUtil.areStacksCompatible(type, inStack)) { - result += inStack.stackSize; - } + if(inStack != null && ItemStackUtil.areStacksCompatible(type, inStack)) { + result += inStack.stackSize; + } ItemStack outStack = slots[2]; - if (outStack != null && ItemStackUtil.areStacksCompatible(type, outStack)) { + if(outStack != null && ItemStackUtil.areStacksCompatible(type, outStack)) { result += outStack.stackSize; } @@ -170,9 +163,7 @@ public class TileEntityMassStorage extends TileEntityCrateBase implements IBufPa private int changeTotalStockpile(int amount, boolean actually, int sign) { ItemStack type = getType(); - - if (type == null) - return amount; + if(type == null) return amount; int stockpileAvail = sign > 0 ? getCapacity() - getStockpile() : getStockpile(); @@ -186,21 +177,21 @@ public class TileEntityMassStorage extends TileEntityCrateBase implements IBufPa int inputAvail = 0; ItemStack inStack = slots[0]; - if (inStack != null && ItemStackUtil.areStacksCompatible(type, inStack)) { + if(inStack != null && ItemStackUtil.areStacksCompatible(type, inStack)) { inputAvail = sign > 0 ? inStack.getMaxStackSize() - inStack.stackSize : inStack.stackSize; - } else if (inStack == null) { + } else if(inStack == null) { inputAvail = sign > 0 ? type.getMaxStackSize() : 0; } - if (amount > 0 && inputAvail > 0) { + if(amount > 0 && inputAvail > 0) { int depositInput = Math.min(amount, inputAvail); - if (actually) { - if (slots[0] == null) { // Only possible with sign == +1 + if(actually) { + if(slots[0] == null) { // Only possible with sign == +1 slots[0] = slots[1].copy(); slots[0].stackSize = 0; } slots[0].stackSize += sign * depositInput; - if (slots[0].stackSize == 0) { + if(slots[0].stackSize == 0) { slots[0] = null; } } @@ -209,28 +200,28 @@ public class TileEntityMassStorage extends TileEntityCrateBase implements IBufPa int outputAvail = 0; ItemStack outStack = slots[2]; - if (outStack != null && ItemStackUtil.areStacksCompatible(type, outStack)) { + if(outStack != null && ItemStackUtil.areStacksCompatible(type, outStack)) { outputAvail = sign > 0 ? outStack.getMaxStackSize() - outStack.stackSize : outStack.stackSize; - } else if (outStack == null) { + } else if(outStack == null) { outputAvail = sign > 0 ? type.getMaxStackSize() : 0; } - if (amount > 0 && outputAvail > 0) { + if(amount > 0 && outputAvail > 0) { int depositOutput = Math.min(amount, outputAvail); - if (actually) { - if (slots[2] == null) { // Only possible with sign == +1 + if(actually) { + if(slots[2] == null) { // Only possible with sign == +1 slots[2] = slots[1].copy(); slots[2].stackSize = 0; } slots[2].stackSize += sign * depositOutput; - if (slots[2].stackSize == 0) { + if(slots[2].stackSize == 0) { slots[2] = null; } } amount -= depositOutput; } - if (actually) { + if(actually) { this.markDirty(); } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 2e54e7e49..ee010eec8 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -4504,7 +4504,7 @@ tile.machine_satlinker.name=Satelliten-ID-Manager tile.machine_sawmill.name=Stirling-Sägemühle tile.machine_sawmill.desc=Benötigt externe Hitzequelle.$Wärmestransferrate: T*0.1 TU/t$Minimalaufnahme: 100 TU/t, Maximalaufnahme: 300 TU/t tile.machine_schrabidium_battery.name=Schrabidium-Energiespeicherblock -tile.machine_schrabidium_transmutator.name=Schrabidium-Transmutationsgerät +tile.machine_schrabidium_transmutator.name=Schrabidium-Transmutationsgerät (LEGACY) tile.machine_selenium.name=Hochleistungs-Sternmotor tile.machine_shredder.name=Brecher tile.machine_silex.name=Laser-Isotopentrenner (SILEX) diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 4157a22a5..fe825c74c 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -3389,8 +3389,9 @@ item.missile_emp_strong.name=Strong EMP Missile item.missile_endo.name=Endothermic Missile item.missile_exo.name=Exothermic Missile item.missile.fuel.balefire=BF Rocket Fuel -item.missile.fuel.jetfuel_loxy=Jet Fuel / Liquid Oxygen item.missile.fuel.ethanol_peroxide=Ethanol / Hydrogen Peroxide +item.missile.fuel.hydrogen=Liquid Hydrogen / Liquid Oxygen +item.missile.fuel.jetfuel_loxy=Jet Fuel / Liquid Oxygen item.missile.fuel.kerosene_loxy=Kerosene / Liquid Oxygen item.missile.fuel.kerosene_peroxide=Kerosene / Hydrogen Peroxide item.missile.fuel.solid=Solid Fuel @@ -5642,8 +5643,8 @@ tile.machine_arc_welder.name=Arc Welder tile.machine_armor_table.name=Armor Modification Table tile.machine_ashpit.name=Ashpit tile.machine_ashpit.desc=Collects ashes from fireboxes and heating ovens -tile.machine_assembler.name=Assembly Machine (Legacy) -tile.machine_assemfac.name=Assembly Factory (Legacy) +tile.machine_assembler.name=Assembly Machine (LEGACY) +tile.machine_assemfac.name=Assembly Factory (LEGACY) tile.machine_assembly_factory.name=Assembly Factory tile.machine_assembly_factory.desc=Quadruple assembly machine.$Recipes process twice as fast,$but need twice as much power.$Needs to be cooled with water,$produces low-pressure steam. tile.machine_assembly_machine.name=Assembly Machine @@ -5662,11 +5663,11 @@ tile.machine_boiler_off.name=Old Boiler tile.machine_catalytic_cracker.name=Catalytic Cracking Tower tile.machine_catalytic_reformer.name=Catalytic Reformer tile.machine_centrifuge.name=Centrifuge -tile.machine_chemfac.name=Chemical Factory (Legacy) +tile.machine_chemfac.name=Chemical Factory (LEGACY) tile.machine_chemical_factory.name=Chemical Factory tile.machine_chemical_factory.desc=Quadruple chemical plant.$Recipes process twice as fast,$but need twice as much power.$Needs to be cooled with water,$produces low-pressure steam. tile.machine_chemical_plant.name=Chemical Plant -tile.machine_chemplant.name=Chemical Plant (Legacy) +tile.machine_chemplant.name=Chemical Plant (LEGACY) tile.machine_chungus.name=Leviathan Steam Turbine tile.machine_chungus.desc=Efficiency: 85%% tile.machine_coal_off.name=Combustion Generator @@ -5769,7 +5770,7 @@ tile.machine_satlinker.name=Satellite ID Manager tile.machine_sawmill.name=Stirling Sawmill tile.machine_sawmill.desc=Requires external heat source.$Heat transfer rate: T*0.1 TU/t$Min intake: 100 TU/t, Max intake: 300 TU/t tile.machine_schrabidium_battery.name=Schrabidium Energy Storage Block -tile.machine_schrabidium_transmutator.name=Schrabidium Transmutation Device +tile.machine_schrabidium_transmutator.name=Schrabidium Transmutation Device (LEGACY) tile.machine_selenium.name=Radial Performance Engine tile.machine_shredder.name=Shredder tile.machine_silex.name=Laser Isotope Separation Chamber (SILEX) @@ -5842,6 +5843,7 @@ tile.nuke_n45.name=N45 Naval Mine tile.nuke_prototype.name=The Prototype tile.nuke_solinium.name=The Blue Rinse tile.nuke_tsar.name=Tsar Bomba +tile.oc_cable_paintable.name=Paintable Network Cable tile.oil_duct.name=Oil Pipe tile.oil_duct_solid.name=Coated Oil Pipe tile.oil_pipe.name=Crude Oil Extraction Pipe @@ -6445,5 +6447,3 @@ desc.gui.upgrade.effectiveness= * §aEffectiveness§r: Stacks to level 3 desc.gui.upgrade.overdrive= * §7Overdrive§r: Stacks to level 3 desc.gui.upgrade.power= * §1Power-Saving§r: Stacks to level 3 desc.gui.upgrade.speed= * §4Speed§r: Stacks to level 3 - -tile.oc_cable_paintable.name=Paintable Network Cable