From bd4976f6f68edc05be5642bcb2ba31347fdb1fd6 Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 21 Oct 2022 15:08:53 +0200 Subject: [PATCH] better boiler explosion, blast furnace test --- .../hbm/blocks/machine/MachineDiFurnace.java | 17 ++++++++--------- .../java/com/hbm/crafting/MineralRecipes.java | 1 + .../inventory/recipes/anvil/AnvilRecipes.java | 3 +-- .../machine/TileEntityHeatBoiler.java | 12 +++++++++++- .../blocks/difurnace_front_off_alt.png | Bin 0 -> 588 bytes .../textures/blocks/difurnace_front_on_alt.png | Bin 0 -> 682 bytes .../hbm/textures/blocks/difurnace_side_alt.png | Bin 0 -> 597 bytes .../textures/blocks/difurnace_top_off_alt.png | Bin 0 -> 349 bytes .../textures/blocks/difurnace_top_on_alt.png | Bin 0 -> 522 bytes .../blocks/test_difurnace_front_off.png | Bin 402 -> 0 bytes .../blocks/test_difurnace_front_off_old.png | Bin 225 -> 0 bytes .../blocks/test_difurnace_front_on.png | Bin 404 -> 0 bytes .../blocks/test_difurnace_front_on_old.png | Bin 227 -> 0 bytes .../textures/blocks/test_difurnace_side.png | Bin 425 -> 0 bytes .../blocks/test_difurnace_side_old.png | Bin 208 -> 0 bytes .../textures/blocks/test_difurnace_top_off.png | Bin 430 -> 0 bytes .../blocks/test_difurnace_top_off_old.png | Bin 248 -> 0 bytes .../textures/blocks/test_difurnace_top_on.png | Bin 435 -> 0 bytes .../blocks/test_difurnace_top_on_old.png | Bin 248 -> 0 bytes 19 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/blocks/difurnace_front_off_alt.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/difurnace_front_on_alt.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/difurnace_side_alt.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/difurnace_top_off_alt.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/difurnace_top_on_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off_old.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on_old.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_side_old.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off_old.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on_old.png diff --git a/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java index c99c41064..3dd70b977 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java @@ -31,10 +31,9 @@ public class MachineDiFurnace extends BlockContainer { private final boolean isActive; private static boolean keepInventory; - @SideOnly(Side.CLIENT) - private IIcon iconFront; - @SideOnly(Side.CLIENT) - private IIcon iconTop; + @SideOnly(Side.CLIENT) private IIcon iconFront; + @SideOnly(Side.CLIENT) private IIcon iconTop; + @SideOnly(Side.CLIENT) private IIcon iconBottom; public MachineDiFurnace(boolean blockState) { super(Material.iron); @@ -44,16 +43,16 @@ public class MachineDiFurnace extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_top_on" : ":difurnace_top_off")); - this.iconFront = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_front_on" : ":difurnace_front_off")); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":difurnace_side"); + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_top_on_alt" : ":difurnace_top_off_alt")); + this.iconFront = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_front_on_alt" : ":difurnace_front_off_alt")); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":difurnace_side_alt"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":brick_fire"); } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { - //Reactivate in case of emergency - //return metadata == 0 && side == 3 ? this.iconFront : (side == metadata ? this.iconFront : this.iconTop); + if(side == 0) return iconBottom; return metadata == 0 && side == 3 ? this.iconFront : (side == metadata ? this.iconFront : (side == 1 ? this.iconTop : this.blockIcon)); } diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index e0a7f7179..84af77106 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -436,6 +436,7 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_am_mix, 1), new Object[] { "tinyAm241", "tinyAm241", "tinyAm241", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242" })); CraftingManager.addShapelessAuto(new ItemStack(ModItems.ball_fireclay, 4), new Object[] { Items.clay_ball, Items.clay_ball, Items.clay_ball, AL.dust() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ball_fireclay, 4), new Object[] { Items.clay_ball, Items.clay_ball, Items.clay_ball, AL.ore() }); } //Bundled 1/9 recipes 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 c0e9fd2f0..05feda2bd 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -211,8 +211,7 @@ public class AnvilRecipes { constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(Blocks.stonebrick, 4), - new OreDictStack(IRON.ingot(), 2), - new OreDictStack(W.ingot(), 4), + new ComparableStack(ModItems.ingot_firebrick, 4), new ComparableStack(ModItems.board_copper, 2) }, new AnvilOutput(new ItemStack(ModBlocks.machine_difurnace_off))).setTier(1)); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java index 40e65db2a..51a441b2f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java @@ -4,6 +4,10 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.BlockDummyable; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.standard.EntityProcessorStandard; +import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard; +import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.fluid.FluidType; @@ -143,7 +147,6 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IFluid if(outputOps == 0) { this.hasExploded = true; - worldObj.newExplosion(null, xCoord + 0.5, yCoord + 2, zCoord + 0.5, 5F, false, false); BlockDummyable.safeRem = true; for(int x = xCoord - 1; x <= xCoord + 1; x++) { for(int y = yCoord + 2; y <= yCoord + 3; y++) { @@ -153,6 +156,13 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IFluid } } worldObj.setBlockToAir(xCoord, yCoord + 1, zCoord); + + ExplosionVNT xnt = new ExplosionVNT(worldObj, xCoord + 0.5, yCoord + 2, zCoord + 0.5, 5F); + xnt.setEntityProcessor(new EntityProcessorStandard().withRangeMod(3F)); + xnt.setPlayerProcessor(new PlayerProcessorStandard()); + xnt.setSFX(new ExplosionEffectStandard()); + xnt.explode(); + BlockDummyable.safeRem = false; } } diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_front_off_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_front_off_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..6a79f43609fb85d42dcd4bc204fb60aa0b293bce GIT binary patch literal 588 zcmV-S0<-;zP)`m@wkXP3OO&&UG;!@2AWa-T4eXCgs_}1(F__z{hV@QLR?Qh^BSZx6n{3(7 zV>Z`%=D!}ubn_P}F%(vqa0NssMYVWbuo*7`#A_yN2 ze*mDn$v+1xLRr`621s2~MaLQd%%@Q^`yF5&0;x^t_xooCSd94dxI!r~J6qQg4T&)r zt+}#dc=4!N?~7?dQO;W1E|j%k*P04K@C<&9n*K$|CR6Hhffb?lo^F~l%o?3U8i6~Z zMnuTwpaHVUDcv+}MOyR;ENSAs$J*s7nccw=D9hKA0uc={LRB^vfB-~%2#D5z0vaw! a9De}to!ztshsRq00000Ynvq9nKjV$((KeMofVN__Jv__J&G4hld5L*XMlt;H|4Y`@5%n z^XQBHQKy7T#2AAn#e8>Oqh&?#mPHj<99aie9cWl32$yfZv}=Qck)eUABcUGuDNFe0cZg||0*ZudRL2v45BBm-ty zcvO|F3JUEo-AFLSj1fc5%FOPC+)wpD5iG|^>ElGxMEbj@|4Gm^6HPlZ#mvv!fpN^Z z`}gh;ykHU9b|N<;-#_}2s`6Cxz?2f2U{m+Je6?fOjF1I8U*QYI<(&Baj~cPCstV4| zw_MZ>i+O>yLg^h%KhgD(wvDvygzY19g>_>82kTwSom+?WePoP@gEXUUA_zEZh%qxx ziM~%{RbtA(K9=tBvkMT-oOpxPx#07*qoM6N<$f`U&$f&c&j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_side_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_side_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..223262e225d92035631a99e10ec7c424f1a81c54 GIT binary patch literal 597 zcmV-b0;>IqP)DzO=`%a7ZZ=Qy7T>xN=!5BlN4MIZj^bivAtUyQ( zppRd@=r2+Ww2F{Q;9USbs zC@IiVGPIhkZkZ;Q)@}R8-53G!_Vi`w1AqtuAp`+Wy64HQANxoL1N7^MN8N0|eARF~ zj?hYCBhAFdEJ}O8pB!}^+#jWUIRAnEy13c$oa%dDhv4kZP0H$%~ENg~}DdFz4qfl-k1(y z-aCW<{rt%zl!RDoin;-g0H~W58=L+NU}J;xW0aIgsrbCi(cU{Qe&4Whj!3D4s>@#s z9!w|Xb=`60U3W?;HjZu&mgSm}wfv2djj1=A1K}t-ETZQZS0Ez3tO}HpcOM>Z*TVw= j=RHbFK26EwsJvCNNVoNRO4;2fXa;q0GMqS6m)@VAC{|Sr=s!o*nc3;3s*@SC z8!ACEx-`c$drVvvH!r* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_top_on_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_top_on_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..6d44396626deb329b3ce70830a2f88cb921e928c GIT binary patch literal 522 zcmV+l0`>igP)3)75QV=p_WenSASgme6jT&QRCEX=-hoHW3s4}@kRoXi z4HYe-2ubeldhHpCo9t>MNW_t4Tk@Ql<1-o^e|Q9}^j0591(seyb0%r>a7r!rw zaKasLPDGFoA0P7O^;=|yvLO?gh+r2H2nY{aX_WJcv(q#3YP~{ctQUneWUNn^B`j-~ z-@t3bOQWqSN`{${EzOnFkokG}i}B$D`mQIXypy1LrPRXm@`@)1N3)`2WSJ;sP1k3- z{gD^%UU3(`fBuT)gsj{-|MkRC<&R!NFbpkQc9b^<@5JD#PP=` z08*Dxn>k3>y(RyGyw`8;W=fb{JAS)$|3LUQ&^+3IE0AqloDIX9qY$;$&BM)~Z=N2bZe?^J zG%heMIczh2P5=M_5J^NqR5(wSl1XlaFc3w3^K6l@AdCx!1qX;gLWpdl1O=MmRC#t0 zLU+soDZ-@JPJ+LSh w5dWJJ52Cn_b3h{SKjV}B7$On){{^k}7s?m?J$McCwg3PC07*qoM6N<$g0+C74gdfE diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off_old.png deleted file mode 100644 index 108e4671ee45a39ae9e08996a32e1797451fb918..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@pAWs*^5DWjM-Hv<*3^)$|_`lpdG;v{MNar@YMC~J-{kCu`h)gF-w(p-G$_joj>^5nT_N#2>EGl6%Bvt5qBN2bGJZ5=P}NEZT4 OXYh3Ob6Mw<&;$T8`9%!? diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on.png deleted file mode 100644 index 684d7d755d7e443fd3d53c8890e713d7dbeedc95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 404 zcmV;F0c-w=P)N2bZe?^J zG%heMIczh2P5=M_5=lfsR5(wSlFLqoFc60O1irFc5*m=}g3E#jFpv;}8>2*!%TxKa zgUC60lH<3S{L|9TKT}kaB(Cdft%D#)(=^MnJkN;&+V}mZZ}>)4RrO{WhG87XX_|=e z`WJB=EAH5{J1_@4&+EFbZCeBtiRixX&n8)Xwm6PsD$MhY6NGwvAbwiTl@CqBKbDRI zM=Am?4$wOuK!!lX&y^(>>$+~5X1BB~iwx)egj{)rX}TziJ-dU8DN*j$^RdN<0#LT=By}Z;C1rt33 zJ=4@yqg0@p5KkA!5DWjM-GO`u6nLDfMc>zZn7dy-)!}*d`%&ct^)E){?BanAsb2Y; zmG)d{OZolbW3Yqjl0$b7rZVO_2~4Rp<~Zrq!Rs03l;a|Hfi37Dzw``SzYA@r_AIR2 Q2Q;6-)78&qol`;+01R|U3jhEB diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side.png deleted file mode 100644 index 7b9aec7a89ee8319eca493cf1103830b0de3aa1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmV;a0apHrP)N2bZe?^J zG%heMIczh2P5=M_CrLy>R5(wKlFM#`Knz9s{79fso(moeKA-}DP`eowR3IT=)icoS(bHOiC}&s zO;ZmIJ^ce)aJ^o~aU9OPIdomuw(aY|<#MqdZnqmwwrz9gQP+oW)i;INtLV{1wL zJb6EmS7SK>mUK&Wzyoi`!-*e|y{W7N%}-nU6Rdi!Z-M_aKADdt5<#b7o*?)FbN>S5 Tl#jG900000NkvXXu0mjfp?0fx diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side_old.png deleted file mode 100644 index af913d28bc44615422d78db7d042a041a7f8e6a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPVk-lnPYi=jq}Y zV&T8{^ldH%1rFwb|NobJ-<%Y%P`YH^t(>C8xxeib{3`U=YkUu}A2!L;IOy#V$#ZJO ym)sd~Z0EckB-tH*B+Rf;w|Rc>()NRl6Zsh2F4?^73(N(Y%;4$j=d#Wzp$P!sG(emH diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off.png deleted file mode 100644 index d5f3f0afad7df5be63dedd6615fa576f5e6aa60e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 430 zcmV;f0a5;mP)N2bZe?^J zG%heMIczh2P5=M_EJ;K`R5(w4lF@2|Fc^jN=DRH@b!zoO?S&5@2u{|UF$JCaR{N4; zQ<1TQgybau$(O%1S(XJs5QbqK$9bL?MNyU|qr^OlqW7mbW9qv8b{fZVnx=W48PV5Y zy4`Mu3}*fwC29NUkd0#tuGeed_uONi!u@n2Yqy-)G|lC5u{SKsqP;iw5%%MBzu)Dk zfExhWk=RqgiH%|v2+0=Uc3oFh6&6Qf6OTl&e2%qkyCbdZs^$#Cz><+9MT*3Wr6GG? zIl;!r4+0evm3i3$-z9NV56OoU6CC**h1?=>V%s*~C9+9Ha3fA1yOgG>5rgj%pXVk; z4ia0EBo;|sa=sONkH-TZrAV(X;evD`QQwY^@4>lC|BHKGuVf+de}0#LT=By}Z;C1rt33 zJ=4@yqg0@pOivfb5DWjg-Ht*B6gZgw{$CzF%Rysm;hO3T8zvMU+UhH2!aUgr$7l)=;0&t;ucLK6Udxlg(P diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on.png deleted file mode 100644 index e78f3ce9292d2ec382921715ab960c4805aa57fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmV;k0ZjghP)N2bZe?^J zG%heMIczh2P5=M_F-b&0R5(w4lG|#AFc5_E1byY+3I?sm3lA4QfFM|@H>C<%^{x6P ztEouoAR(FT&Q9k4RhDJG?`y52D9ZD^D2lQySq1FFFnqf}jcS_a%VM7AWm(pBWd)yq zAx%?-20J%Ll;rx(pbcXhf*=@%fjQ~|?1u$fCuPaDZ9UI36Si$T?_OW{5c{^M>slCT zU;;)?OXkitJiM7#+6J*?8esdruc``)QoM;D0m8yl)^*)!Y2SAVXPPFCtSE`3IC0>p z&^}KVcw^-U!4(^6b1)4qCGkx^PTnopzz9z%&W$B1j^l7Cp^YlQH=z2SQj#P}Jh+tj zoNuFY#VX$7I5w6fCDUNR-8hc;IaMrvQ-a0P!-?c}XIuu)l>P^El+)%Q;Qx$I-p6BD dfeZm!>mQyfvqO22DvbaD002ovPDHLkV1mk&v5f!# diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on_old.png deleted file mode 100644 index 231440b697eedfc5b4f5c4740d08413882432f5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@pOivfb5DWjg{kM4=40xD#bN%M$?40W!xMGSHj zCb`#7&62Bq)+pWkcflqp2218(1^=>^^oo7Vzg9P@9_X9FRO$Ef%krhpy2qAC_ntj) n@O!V$$%EfdA5=55Na*1&;uYzb@guDUXeooItDnm{r-UW|mmyXw