diff --git a/changelog b/changelog index d413388bb..09ed08cf0 100644 --- a/changelog +++ b/changelog @@ -3,6 +3,13 @@ * In addition, there is now an alternate recipe combining four times the material, yielding larger steel scraps, allowing for higher throughput * The new autogen wire items now use texture overrides, restoring the original textures * Arc furnaces now start burning on the inside as the electrodes are inserted, making the process look a lot more violent +* Arc furnaces in liquid mode will now immediately start draining their contents as soon as the lid starts lifting, instead of waiting until the lid is fully lifted +* The arc furnace's lid now moves faster depending on the upgrade (each upgrade adds 50% movement speed). Do note that this shortens the timespan for cycling items, so to utilize it fully you will need multiple or upgraded conveyors. +* Doubled the arc furnace's pouring speed to a full ingot per tick +* Demand for hard plastic per versatile circuit has been reduced from 4 to 2 bars per board +* The autocrafter now uses vacuum tubes instead of microchips +* Buoyant items (fish spawned by fishing dynamite) now sink in flowing water (i.e. in a tank of non-source blocks) +* Retextured all explosive sticks ## Fixed * Removed sand to silicon AE2 compat recipe which caused sand to be shreddable into the new silicon wafers, skipping the arc furnace entirely diff --git a/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java b/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java index 2579bc81d..df4c0c8f4 100644 --- a/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java @@ -78,7 +78,7 @@ public class SolderingRecipes extends SerializableRecipe { new ComparableStack(ModItems.circuit, 24, EnumCircuitType.CAPACITOR)}, new AStack[] { new ComparableStack(ModItems.circuit, 12, EnumCircuitType.PCB), - new OreDictStack(ANY_HARDPLASTIC.ingot(), 1)}, + new OreDictStack(ANY_HARDPLASTIC.ingot(), 2)}, new AStack[] { new OreDictStack(PB.wireFine(), 12)} )); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 7b2b073e1..7758ffcb8 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -283,7 +283,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.mass_storage, 1, 1), new Object[] { "PCP", "PMP", "PPP", 'P', DESH.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'M', new ItemStack(ModBlocks.mass_storage, 1, 0) }); addRecipeAuto(new ItemStack(ModBlocks.mass_storage, 1, 2), new Object[] { "PCP", "PMP", "PPP", 'P', ANY_RESISTANTALLOY.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'M', new ItemStack(ModBlocks.mass_storage, 1, 1) }); addRecipeAuto(new ItemStack(ModBlocks.mass_storage, 1, 3), new Object[] { "PPP", "PIP", "PPP", 'P', KEY_PLANKS, 'I', IRON.plate() }); - addRecipeAuto(new ItemStack(ModBlocks.machine_autocrafter, 1), new Object[] { "SCS", "MWM", "SCS", 'S', STEEL.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'M', ModItems.motor, 'W', Blocks.crafting_table }); + addRecipeAuto(new ItemStack(ModBlocks.machine_autocrafter, 1), new Object[] { "SCS", "MWM", "SCS", 'S', STEEL.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'M', ModItems.motor, 'W', Blocks.crafting_table }); addRecipeAuto(new ItemStack(ModBlocks.machine_funnel, 1), new Object[] { "S S", "SRS", " S ", 'S', STEEL.ingot(), 'R', REDSTONE.dust() }); addRecipeAuto(new ItemStack(ModBlocks.machine_waste_drum, 1), new Object[] { "LRL", "BRB", "LRL", 'L', PB.ingot(), 'B', Blocks.iron_bars, 'R', ModItems.rod_quad_empty }); addRecipeAuto(new ItemStack(ModBlocks.machine_press, 1), new Object[] { "IRI", "IPI", "IBI", 'I', IRON.ingot(), 'R', Blocks.furnace, 'B', IRON.block(), 'P', Blocks.piston }); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java index fd280bc61..5b07aa03a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java @@ -113,7 +113,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl if(ingredients && electrodes && delay <= 0 && this.liquids.isEmpty()) { if(lid > 0) { - lid -= 1F/60F; + lid -= 1F / (60F / (upgrade * 0.5 + 1)); if(lid < 0) lid = 0; this.progress = 0; } else { @@ -126,7 +126,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl if(this.progress >= 1F) { this.process(); this.progress = 0; - this.delay = 120; + this.delay = (int) (120 / (upgrade * 0.5 + 1)); PollutionHandler.incrementPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT, 15F); } } @@ -135,7 +135,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl if(this.delay > 0) delay--; this.progress = 0; if(lid < 1 && this.electrodes[0] != 0 && this.electrodes[1] != 0 && this.electrodes[2] != 0) { - lid += 1F/60F; + lid += 1F / (60F / (upgrade * 0.5 + 1)); if(lid > 1) lid = 1; } } @@ -147,12 +147,12 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl if(!hasMaterial) hasMaterial = this.hasIngredients(); - if(!this.liquids.isEmpty() && this.lid >= 1F) { + if(!this.liquids.isEmpty() && this.lid > 0F) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - 10); Vec3 impact = Vec3.createVectorHelper(0, 0, 0); - MaterialStack didPour = CrucibleUtil.pourFullStack(worldObj, xCoord + 0.5D + dir.offsetX * 2.875D, yCoord + 1.25D, zCoord + 0.5D + dir.offsetZ * 2.875D, 6, true, this.liquids, MaterialShapes.INGOT.q(1, 2), impact); + MaterialStack didPour = CrucibleUtil.pourFullStack(worldObj, xCoord + 0.5D + dir.offsetX * 2.875D, yCoord + 1.25D, zCoord + 0.5D + dir.offsetZ * 2.875D, 6, true, this.liquids, MaterialShapes.INGOT.q(1), impact); if(didPour != null) { NBTTagCompound data = new NBTTagCompound(); diff --git a/src/main/resources/assets/hbm/textures/items/ammo_12gauge_percussion.png b/src/main/resources/assets/hbm/textures/items/ammo_12gauge_percussion.png index f010e6675..1b60046f7 100644 Binary files a/src/main/resources/assets/hbm/textures/items/ammo_12gauge_percussion.png and b/src/main/resources/assets/hbm/textures/items/ammo_12gauge_percussion.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.png b/src/main/resources/assets/hbm/textures/items/circuit.png index d2ac0d1b3..d735d753d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit.png and b/src/main/resources/assets/hbm/textures/items/circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stick_dynamite.png b/src/main/resources/assets/hbm/textures/items/stick_dynamite.png index cc31285e0..2596ba765 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stick_dynamite.png and b/src/main/resources/assets/hbm/textures/items/stick_dynamite.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stick_dynamite_fishing.png b/src/main/resources/assets/hbm/textures/items/stick_dynamite_fishing.png index 973506281..6bc5abb43 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stick_dynamite_fishing.png and b/src/main/resources/assets/hbm/textures/items/stick_dynamite_fishing.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stick_tatb.png b/src/main/resources/assets/hbm/textures/items/stick_tatb.png index 6dd88af75..f012d4464 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stick_tatb.png and b/src/main/resources/assets/hbm/textures/items/stick_tatb.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stick_tnt.png b/src/main/resources/assets/hbm/textures/items/stick_tnt.png index 6fa5a5518..7ca995a46 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stick_tnt.png and b/src/main/resources/assets/hbm/textures/items/stick_tnt.png differ