From 23b710deae7a0ddf15678bdc5f00dfef86e376ec Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 28 May 2024 16:30:14 +0200 Subject: [PATCH] let's get silly --- changelog | 7 +++++++ .../inventory/recipes/SolderingRecipes.java | 2 +- .../java/com/hbm/main/CraftingManager.java | 2 +- .../TileEntityMachineArcFurnaceLarge.java | 10 +++++----- .../items/ammo_12gauge_percussion.png | Bin 342 -> 307 bytes .../assets/hbm/textures/items/circuit.png | Bin 8579 -> 9214 bytes .../hbm/textures/items/stick_dynamite.png | Bin 214 -> 254 bytes .../textures/items/stick_dynamite_fishing.png | Bin 215 -> 356 bytes .../assets/hbm/textures/items/stick_tatb.png | Bin 223 -> 212 bytes .../assets/hbm/textures/items/stick_tnt.png | Bin 275 -> 263 bytes 10 files changed, 14 insertions(+), 7 deletions(-) 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 f010e6675197b6a28c64294a335cf77c41e16099..1b60046f7fc7144dc6c1eb9cd5143f6227bd72f6 100644 GIT binary patch delta 265 zcmV+k0rvjZ0Zq}6vpvCo{(j+MO`vkUNVQ>9=QMqVC@ld zfF2=x$DW{!a1X?kC4v#5Z0^()VMj&j(zjT)?4RHF;NR6*DSuYVZ@n*;n-lm{N>VA= zirj${_`Om9yzF+H5fMAQ4#Q?7Sx49_MJnaJlj|^Wn`d69DS!DDcm@d~yg_oACT{Z_ z#3{=%h!dSb4EeMcV@!ZVfi?1eIFRQ#S(XKe0C3Lv<+?;Zjz_fCjN^z9g0AZ@#$c`W zuo$9q&NodHowT*qYpv<~o}wtI>zcN0f9^i&V2xB&<-dP^s{Zu&QGEe~sB2!A^W&5N P0000ZrE5Jev-1zN4>tTe9BHm*&-lw5!V(B=p^ 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 R*bjOD>dHDwbqdxW{ttebP`3a8 literal 8579 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 M07*qoM6N<$f;Ng|asU7T delta 170 zcmV;b09F6~0oDPKG=GgrL_t(IjbmUKc_1z>?tffd+<%fZ-FA`s-_X#2q7lYsB1ZGO zUw;{*kIZ6FQc}W@$7=vg^N)WF4DWvZWpLax9YYNxF`A$M_{;F}=U;~W%kLRs&R?`> z5hG3mh}DeM08%t#gaJOyxBwHmnqkq%NUCO-MvOpQVIuOMfg^!|C}-mY6LkeiOQO^O Y0KJ-&*hjQylmGw#07*qoM6N<$g6Kv~egFUf 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 973506281c341fe739640eab0ef3e0a6354a8341..6bc5abb439b42f58d6d96d8ecaf13730280018db 100644 GIT binary patch delta 314 zcmV-A0mc5;0ptRZGk*aaNkl#q_MKrGLIm(n}9yS?mWS@nEXt#$*!HJnM0V9`< zB%RNZI3~M%==fT}R=C1u7SgXURA&&oQ=wix@1H?1guT3ZBzd}X1kYb?XXWMfzH@z( zLF~e^JV}_oUAym}Zpri9(7S;N#Rfip+9`!~YiY@EUmDNibnDTGh#LR!rdQ|W7Yi3S z3rEBLOEgV|YBO?!jfcHMhSge|3Z;dkgVqmV_Z4t_XeezP@cke33$bt7c&tr39smFU M07*qoM6N<$f-F^>J^%m! delta 172 zcmV;d08{_u0@neMGk*Y%NklgySll$0=}@f!fu%y8!;1H+vU3=QT9q&b`6_WS<~+aLUAn0(0000y8gxGXnzy0~4{DpTA;Yc>el7L(0$1DDrq+fU22+ z;l*nPhWyL#QS{(6fEdj<4IoxCRs%@Uj9~z&no$fOM>E_2ax68YxL~D|;C}`N(lld$ hiMoRS39F(q003UmhGZtY8+HHy002ovPDHLkV1jk_QKkR@ 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 6fa5a55186aee77733c86ebc9bc2949e8abceb69..7ca995a46dc4b3cfc7d570cb89e85395b9753388 100644 GIT binary patch delta 219 zcmV<103`pD0*3;SG=IKHL_t(Ijn$Dc3c^4XL|;U(4hTZ-kj^q#|Dkk%ojva^fI>71h?tzd;?bopTYorfUL0WPZprtRQFQ8+ij{}=?VaF Vi@S~RF1P>y002ovPDHLkV1i2_X|@0W delta 231 zcmV|iM^;L1c%!~j@I$$?|> zYS`zuC|~<98E_be41n*;o~BeMe{-xfy2~|O*L_)ARN>^Ru{crX&Egwu7JP~e4Fbnv h0F7`djb8Pu+yJ55i-ehV(W?Le002ovPDHLkV1nGzZ3X}U