From b0c757b09bf35086197795320a1b8033afb67a21 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 16 Mar 2023 22:10:04 +0100 Subject: [PATCH] funny gas recipes --- .../java/com/hbm/inventory/fluid/Fluids.java | 8 +++++--- .../java/com/hbm/inventory/material/Mats.java | 1 - .../com/hbm/inventory/recipes/MixerRecipes.java | 12 +++++++----- .../turret/TileEntityTurretBaseNT.java | 1 - .../turret/TileEntityTurretBrandon.java | 6 ++++++ src/main/resources/assets/hbm/lang/de_DE.lang | 2 ++ src/main/resources/assets/hbm/lang/en_US.lang | 2 ++ .../hbm/textures/gui/fluids/mustardgas.png | Bin 0 -> 717 bytes .../assets/hbm/textures/gui/fluids/phosgene.png | Bin 0 -> 709 bytes .../hbm/textures/gui/fluids/toxin_base.png | Bin 0 -> 707 bytes .../hbm/textures/models/tank/tank_MUSTARDGAS.png | Bin 0 -> 1395 bytes .../hbm/textures/models/tank/tank_PHOSGENE.png | Bin 0 -> 1360 bytes 12 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/phosgene.png create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 0adaebed3..9a10f940d 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -248,9 +248,8 @@ public class Fluids { KEROSENE_REFORM = new FluidType("KEROSENE_REFORM", 0xFFA5F3, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFF377D, ExtContainer.CANISTER); REFORMGAS = new FluidType("REFORMGAS", 0x6362AE, 1, 4, 1, EnumSymbol.NONE).addTraits(GASEOUS); COLLOID = new FluidType("COLLOID", 0x787878, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); - //TODO - PHOSGENE = new FluidType("PHOSGENE", 0xffffff, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS); - MUSTARDGAS = new FluidType(102, "MUSTARDGAS", 0xffffff, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS); + PHOSGENE = new FluidType("PHOSGENE", 0xCFC4A4, 4, 0, 1, EnumSymbol.NONE).addTraits(GASEOUS); + MUSTARDGAS = new FluidType(102, "MUSTARDGAS", 0xBAB572, 4, 1, 1, EnumSymbol.NONE).addTraits(GASEOUS); // ^ ^ ^ ^ ^ ^ ^ ^ @@ -355,6 +354,9 @@ public class Fluids { metaOrder.add(WATZ); //solutions and working fluids metaOrder.add(FRACKSOL); + //the fun guys + metaOrder.add(PHOSGENE); + metaOrder.add(MUSTARDGAS); //antimatter metaOrder.add(AMAT); metaOrder.add(ASCHRAB); diff --git a/src/main/java/com/hbm/inventory/material/Mats.java b/src/main/java/com/hbm/inventory/material/Mats.java index 05f606da3..727d1b405 100644 --- a/src/main/java/com/hbm/inventory/material/Mats.java +++ b/src/main/java/com/hbm/inventory/material/Mats.java @@ -31,7 +31,6 @@ public class Mats { public static HashMap prefixByName = new HashMap(); public static HashMap matById = new HashMap(); public static HashMap matByName = new HashMap(); - //public static HashMap matRemap = new HashMap(); public static HashMap> materialEntries = new HashMap(); public static HashMap> materialOreEntries = new HashMap(); diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index c07b69d6a..8844cd417 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -1,6 +1,6 @@ package com.hbm.inventory.recipes; -import static com.hbm.inventory.OreDictManager.KNO; +import static com.hbm.inventory.OreDictManager.*; import java.io.IOException; import java.util.ArrayList; @@ -31,14 +31,16 @@ public class MixerRecipes extends SerializableRecipe { recipes.put(Fluids.COOLANT, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.WATER, 1_800)).setSolid(new OreDictStack(KNO.dust()))); recipes.put(Fluids.CRYOGEL, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.COOLANT, 1_800)).setSolid(new ComparableStack(ModItems.powder_ice))); recipes.put(Fluids.NITAN, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.KEROSENE, 600)).setStack2(new FluidStack(Fluids.MERCURY, 200)).setSolid(new ComparableStack(ModItems.powder_nitan_mix))); - recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.WATER, 1_000)).setStack2(new FluidStack(Fluids.PETROLEUM, 100)).setSolid(new OreDictStack(OreDictManager.S.dust()))); - recipes.put(Fluids.ENDERJUICE, new MixerRecipe(100, 100).setStack1(new FluidStack(Fluids.XPJUICE, 500)).setSolid(new OreDictStack(OreDictManager.DIAMOND.dust()))); + recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.WATER, 1_000)).setStack2(new FluidStack(Fluids.PETROLEUM, 100)).setSolid(new OreDictStack(S.dust()))); + recipes.put(Fluids.ENDERJUICE, new MixerRecipe(100, 100).setStack1(new FluidStack(Fluids.XPJUICE, 500)).setSolid(new OreDictStack(DIAMOND.dust()))); recipes.put(Fluids.SALIENT, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.SEEDSLURRY, 500)).setStack2(new FluidStack(Fluids.BLOOD, 500))); recipes.put(Fluids.COLLOID, new MixerRecipe(500, 20).setStack1(new FluidStack(Fluids.WATER, 500)).setSolid(new ComparableStack(ModItems.dust))); + recipes.put(Fluids.PHOSGENE, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.UNSATURATEDS, 500)).setStack2(new FluidStack(Fluids.CHLORINE, 500))); + recipes.put(Fluids.MUSTARDGAS, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250)).setSolid(new OreDictStack(S.dust()))); recipes.put(Fluids.SOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500))); - recipes.put(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(OreDictManager.S.dust()))); - recipes.put(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(OreDictManager.KNO.dust()))); + recipes.put(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(S.dust()))); + recipes.put(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust()))); recipes.put(Fluids.SCHRABIDIC, new MixerRecipe(16_000, 100).setStack1(new FluidStack(Fluids.SAS3, 8_000)).setStack2(new FluidStack(Fluids.ACID, 6_000)).setSolid(new ComparableStack(ModItems.pellet_charged))); recipes.put(Fluids.LUBRICANT, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.HEATINGOIL, 500)).setStack2(new FluidStack(Fluids.UNSATURATEDS, 500))); diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 2a3d52faf..568431479 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -876,7 +876,6 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple cachedCasingConfig = null; } - @SideOnly(Side.CLIENT) @Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerTurretBase(player.inventory, this); diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java index 02273e7be..dd6c17687 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java @@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.world.World; public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { @@ -33,6 +34,11 @@ public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { // TODO Auto-generated method stub return null; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 329b5c1d3..beb93e933 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -637,6 +637,7 @@ hbmfluid.lubricant=Schmiermittel hbmfluid.mercury=Quecksilber hbmfluid.mug=Mug Root Beer hbmfluid.mug_hot=Heißes Mug Root Beer +hbmfluid.mustardgas=Senfgas hbmfluid.naphtha=Mitteldestillat hbmfluid.naphtha_crack=Crack-Mitteldestillat hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff @@ -649,6 +650,7 @@ hbmfluid.pain=Pandemonium(III)tantalit-Lösung hbmfluid.petroil=Gemisch hbmfluid.petroil_leaded=Bleigemisch hbmfluid.petroleum=Petroleumgas +hbmfluid.phosgene=Phosgen hbmfluid.plasma_bf=Balefire-Plasma hbmfluid.plasma_dh3=Deuterium-Helium-3-Plasma hbmfluid.plasma_dt=Deuterium-Tritium-Plasma diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 5ea4011c9..3da4ce06f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1194,6 +1194,7 @@ hbmfluid.lubricant=Engine Lubricant hbmfluid.mercury=Mercury hbmfluid.mug=Mug Root Beer hbmfluid.mug_hot=Hot Mug Root Beer +hbmfluid.mustardgas=Mustard Gas hbmfluid.naphtha=Naphtha hbmfluid.naphtha_crack=Cracked Naphtha hbmfluid.nitan=NITAN© 100 Octane Super Fuel @@ -1206,6 +1207,7 @@ hbmfluid.pain=Pandemonium(III)tantalite Solution hbmfluid.petroil=Petroil hbmfluid.petroil_leaded=Leaded Petroil hbmfluid.petroleum=Petroleum Gas +hbmfluid.phosgene=Phosgene hbmfluid.plasma_bf=Balefire Plasma hbmfluid.plasma_dh3=Deuterium-Helium-3 Plasma hbmfluid.plasma_dt=Deuterium-Tritium Plasma diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png b/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png new file mode 100644 index 0000000000000000000000000000000000000000..30ba3d6b9654dfa5b05c4b69a9c207c110f5b231 GIT binary patch literal 717 zcmV;;0y6!HP)dM$ek`j}s-g!E3;IqDT)1$~J>Te`zyJCdzu}Do zTCLDpv)k=Rl7u8lkW!+Q8r;=&&3e5CpzAt92t-v?4G!WsMhL;@=O;x`&@>G~2%;zg zplO;RUYe!=L_!FZQgmI%cDrRf9&>khM_HC!;~8TRLI7Zl;cz&hwWg{n#AGr-Yt3Xb z8IFPf#mKUZwrx>L;hZB)Q;acatr0>9`o2dg#b&c1gn*QirfG1_F`v&7LQs|^&bi^a zR~1E35XbRQnNo^0O<61!lx4}w%M1Jc9`8NJ;}P#Y&N+k-ztvjH$Hxav)6ljp-g~UI z)OAgs=LjKqdwb)2J~N$8NsQbYeQ4Qr9(4 zPfr{U2fn|*an2#7+6d=&jGO34!iw+KQu6%PKoaC?@5vb=NyN_ zf$et7dcCIWI(EAqS(XjZ7-Q(V4(~lxRsC+EX&SuuTw_F0#PjnrRaKE?8P-~)lt?M* zx{jhKP)d6Tw6osEkRwWzb#57I8#7)ypH~rW1Q)W91bkj|{X#)v$ zn*@Kvv5+NZ@lwOw&4CLS&bjBg`uFd@{sHjbbGclI;}|I=-g|y$97h1o=QDL(GmayV zkBeW`ow6r>7^3F(gTX7={7o9A#OewPv^5 zkt7L8k|3o-DK)uk+m`iu4ZtuAgb;|DrkNbXaf}dx@9%GlqM++Kgb+kg1VGnyQ@k`y z0f>YUD5V&Nf$et7_4PIP_xIFw&2Kzo3_=J1j4@PIh1Qy;X%Ms746QY@*=#xn{ud+5 zGWxzpDTQ;6G)*zaptVK_AsELIr4*aZh7bZ$O1iGYImhkoEkX$Dy2d#-J@;2dQ53{+ zJXNNYB2814%O!PP^ZNSAe!s_i&+&M~dyjJtA;cfG*7EiBMb~xoeUJAZYb|ZtlIJ-> z2tGbOIG@kV=W~)IL2C`bYPBLdolZz8an7+=EO5@@y(dW$PNx&|`JA?Gd47JTswxhL z1I{_5l$=f{#M|2&eczL&Dc*aOQY@ECLI^0OP)bpjC5OX-#bQC8=VVz%9LJ2~h`74C zVzpW^jw8kx?(XgY`1$!E&vO8*wbO3D-%kz9=X0WmhX;}*!8u1&RcyCg*6TIHFtFS0 z$g*sL#u&pe40!Kpn&wXnUDx5gCxpPw%?(i$@$&LQ(==pRhP4(cB~nU;VW21qlu~3_ zMifOvaU9e4Jz8t}zGt~yVy$I1n_;b;7*I-46vc#kmSuzx5FrGtwP>vgApnr)Ic?ki rk_N!#a^d~`ozKrt0FK8aLJ0l?QT0I0*33Vv00000NkvXXu0mjf;D18` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png b/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png new file mode 100644 index 0000000000000000000000000000000000000000..6d37902b8f7664e9b3e1119f46f3fa0c157411be GIT binary patch literal 707 zcmV;!0zCbRP)>Y1X0rjH>pEhLsH&<42T773gy8e@lcFeSng$^RN+|%ErWxX8Sq6X- zLZG##>pFJ39pmwsySqEevg9|OwH6@+0M=TL$0NoVs;WXvCKHS?OeT}z82Dd|JkM#{ z7Ogejd$KIUT8l9TA%vjsd$iVUw_9S2NGWNW2JbzK#R4G&Wm)3AAD;WGq9_WIBpE8x zT9aiN%jJ@?EO~i(;cz$*Lf~{d5kkOwj}YRoI_LQK_@HST+O{QxfOC$zu9?kd2qAcT zd*gDsFr7|G(-dP20ISssbv~bwQsTYm=H>?PJs||rH069gGo4PU>zY4*{%|}V`TqXK zdykZo^ZAV2Y&QSI7@5!Kj7B4rQY;n=+O{Re$ap*^%Q7yP3-kG$@pz1s5~UPBKR<}k zXvAu@qVIdGwcOs`0`T?q#cVbMz&SVU4u`|gz;rrA-QVAnrYYWgj>jXr-Hy#>L)Ufe z_j~d@AE2?;(sdmn1gfg~+d|Vcgb?_Rp_JnJ`I)M!$nzZM98yZ8lyqH3Q50yc$@3hg z6e>v)+P1|QL)*42mrI;;OePbYa{~ifYl@;6P|x$67$YLah;t5O3^7IkX0sV}UH_5> p!1a3N_4Sqa_jdqJrxQX5{sSjHJ~^-Irl$Y^002ovPDHLkV1i5KLOuWh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png b/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png new file mode 100644 index 0000000000000000000000000000000000000000..424fd0ed115ebbdbd239968520a5771b3564044c GIT binary patch literal 1395 zcmV-(1&sQMP)L2leO6hOZV=K{Sz&>&g(0@--&IB?R1?-4XeeSkU#aDe0h z-DER6FWkCzz4jT>g^;3~E^`4d+(jW-qoF8D)aQ`;?*T!W8IG*z56S;Tir$d`e);K# zdl8ZS!{dyRz0RHdd{SfE{@ch|dgLTj= zMbIm7GF7ia#%T0PkyLtBRh2w{=C6ZZWyI9ktDrG@>PgjDZ|$Y5b!UuT0C=<8KY^@88KC_g6?&rS9-8G5S&cat0W$cUTq)7Xd~d!(7^1KBB}H$WQ?Xo zXT(&!3Yw2buk=WzS4q~4!F;f_1$bf2m=SpP$_OE2^kDig!hYRjnYv%Mj}TS!K{A#R zzKz*kUx+ae!lPG;us9H$Xf6&U8Cw8MY8U~JHUiIHZ5f`u0w-*3Q7CL}0ZufxwxH`? z0A$@pVD`!g>>RjdSR4pWSR7a=EDi)Gn$KR*buR$2ZXlRJkGdCr_hwICy!ykN4=_d>fj}Dpy;4L=uey)xgg}eVh)}(H$jHM%uN2YJ zt0}u7kacGSTU$UhwCKVKeL$WTZ3Og65e>bXqE;fb=&T6Qt0`(Ff?lbjp;uG0agwo& z(9|meT?nz;PccRtfj}Dpy;3CA;=mAS(HX(76)qHh?-e*<_6nj=Ytdu6d$xzxM12 z=W+?QE3gMgXVEP?C%sCNb?+Y@Hvw&zbD$mMo6D26;HGZbUA=nu2ECevZjfE&ZFS>w z6PqGhNla1F;-#%%|2S;aXb=u_AJNZyg#zZ!QI7YuT=nHc9 zHP;uQR8(iLLiH*K+AVo5e*OHfh={CKt6t4oj9zuiuGdo2*HXJd9%}hRtX8WXUy!?K z>ebE|y$TJ?*gIomjy)%R$=J|)LxlXFTy-w4?wZW|;_6PSs%kRtEPs<--7SYESlepZ zHKKpTNT8v(si1ib<$=vAShSKtJ_f@lb|5eT#q z&?`mID{z8d6$*L_g$)1z002ovPDHLkV1nlj Bqe}n) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png b/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png new file mode 100644 index 0000000000000000000000000000000000000000..e6f05792553e546b783149f233f0f0dc6ed2f759 GIT binary patch literal 1360 zcmV-W1+V&vP)>BypB~+Bww-hG+b@rAz2{tq zF-1)MAy&1E*cJLropVj0opa)x6OqSRewV{6?}99R@4ea1Q)Cg5@3OrUibkQ0pwLDf zHZ#N5Z+jd02^*&Q;m2RcXWgfpMLt`4bV1&I_;PFe?BXihdlRn|5w8$Lyh1VxZ3Klj zf_SBfc!eP1Ri%hm2pWo4p^kWYzLk^HP1N~scHJxR`QF3PHWYdVu6OanDD(=Pd_UfX zc%_JVg`m0dDrSr(UMX5CUODIF!N~5LcvXf=oKJG8xfPE ziC2o2idQjXG(EZ?oV}{lQt|5Zy@&GP>+tTIcvX@QPX9$%uY0Pw>va!_iE2Zb zj1^>PVfN4$V#7h_Mo?%Yh*yf1x;QWfJ-Q(LTj5Iaf3Fb4*()Sd>(Nto_bd;sPo>bl$T0=H zJl{6U5krq!yz=Wvx7U-N^87v=9bbRhKE2QL`)Tx~-NT=~ zdedybeEQ_h<1e2+X||7!H@Difl`!5vPs=FO}Y-xQxwOiz|oWNgZN z=hQbD8+&d{%-jNU*vzX^SkBP3D&-P_NVvTV3bNJa*8T1 z4lHHt9n&p#_qnxLEMArD@_c(|RvkMg*YbtVIvIQR>dmbW%x`xe>wc*Iv7vU|Hhn)Q z^!_p0h0QthE=Bfu1*{e_wiz&9q-7iV^wSB!jHScOMclOF_7o}a?_Va!1+HHr5sd0pBDVp&r`GCn9 zX5A@QtqE*K$%vV*s!VR