From f529ccd518f33a86fb178fe1015c2c46d595b91a Mon Sep 17 00:00:00 2001 From: HbmMods Date: Wed, 26 Dec 2018 00:42:24 +0100 Subject: [PATCH] s99 texture, finishing touch for large reactor, reactor part recipes --- assets/hbm/lang/de_DE.lang | 4 +- assets/hbm/lang/en_US.lang | 4 +- .../hbm/textures/blocks/reactor_computer.png | Bin 538 -> 620 bytes .../textures/blocks/reactor_computer_alt.png | Bin 0 -> 675 bytes .../blocks/reactor_conductor_side.png | Bin 482 -> 439 bytes .../blocks/reactor_conductor_side_alt.png | Bin 0 -> 594 bytes .../textures/blocks/reactor_conductor_top.png | Bin 496 -> 429 bytes .../blocks/reactor_conductor_top_alt.png | Bin 0 -> 536 bytes assets/hbm/textures/blocks/reactor_hatch.png | Bin 513 -> 572 bytes .../hbm/textures/blocks/reactor_hatch_alt.png | Bin 0 -> 587 bytes .../hbm/textures/models/stable_label_99.png | Bin 0 -> 918 bytes com/hbm/blocks/ModBlocks.java | 10 +- com/hbm/blocks/fluid/ToxicBlock.java | 12 +- com/hbm/inventory/MachineRecipes.java | 30 ++-- .../inventory/gui/GUIReactorMultiblock.java | 1 + com/hbm/items/tool/ItemAssemblyTemplate.java | 10 +- com/hbm/lib/Library.java | 2 +- com/hbm/main/ResourceManager.java | 1 + .../render/tileentity/RenderVaultDoor.java | 12 +- .../TileEntityMachineReactorLarge.java | 150 +++++++++++++++--- .../machine/TileEntityVaultDoor.java | 2 +- com/hbm/world/NuclearReactor.java | 5 +- 22 files changed, 173 insertions(+), 70 deletions(-) create mode 100644 assets/hbm/textures/blocks/reactor_computer_alt.png create mode 100644 assets/hbm/textures/blocks/reactor_conductor_side_alt.png create mode 100644 assets/hbm/textures/blocks/reactor_conductor_top_alt.png create mode 100644 assets/hbm/textures/blocks/reactor_hatch_alt.png create mode 100644 assets/hbm/textures/models/stable_label_99.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 0112c90bf..fc0cf3d9b 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -445,9 +445,9 @@ container.factoryAdvanced=Fortgeschrittene Fabrik tile.reactor_element.name=Reaktorkammer tile.reactor_control.name=Steuerstäbe tile.reactor_hatch.name=Kraftwerkszugriffsluke -tile.reactor_conductor.name=Reaktorstromanschluss +tile.reactor_conductor.name=Reaktorboiler tile.reactor_computer.name=Reaktorsteuerung -container.reactorMultiblock=Großer Atomreaktor +container.reactorLarge=Großer Atomreaktor tile.fusion_conductor.name=Supraleiter-Magnet tile.fusion_center.name=Zentralmagnetstück diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 0cdbde8dd..134fe3e85 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -445,9 +445,9 @@ container.factoryAdvanced=Advanced Factory tile.reactor_element.name=Reactor Chamber tile.reactor_control.name=Control Rods tile.reactor_hatch.name=Reactor Access Hatch -tile.reactor_conductor.name=Reactor Electricity Port +tile.reactor_conductor.name=Reactor Boiler tile.reactor_computer.name=Reactor Control -container.reactorMultiblock=Big Nuclear Reactor +container.reactorLarge=Big Nuclear Reactor tile.fusion_conductor.name=Superconducting Magnet tile.fusion_center.name=Central Magnet Piece diff --git a/assets/hbm/textures/blocks/reactor_computer.png b/assets/hbm/textures/blocks/reactor_computer.png index 7cb3c39e2cf821236229b7e3d40adb5f809ba341..b0bf0b1fa3c84d8d6f5d8656c90f0cf9520b83b7 100644 GIT binary patch delta 606 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 IM6N<$f>Bk!%>V!Z delta 481 zcmV<70UrLX1MmZo8Gix*005AYXf^-<00d`2O+f$vv5yP0{f4JM!O8oT5@FN`gC2T5pUZ~!+|lgoR*}sI2`5O}&hXzQ{WiA!d85Uk z>g8NZBAYTSB1cPtp=p}7ZN()q3T-kysemrRK(PwLP+B$=h)a?xD<>3eB|)eqbtY*^ z>?vbJQ9>+`hwEK}0ZF{wa=9cBh;Pz$9~AFgItC1*jT7F^Aq^y<6G@oJ3i$s8rfL2G X9HIKEMwS&E00000NkvXXu0mjfo&(4T diff --git a/assets/hbm/textures/blocks/reactor_conductor_top_alt.png b/assets/hbm/textures/blocks/reactor_conductor_top_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..e0bf9f0b9eb8dc8091f543e4af0cd1227e37be34 GIT binary patch literal 536 zcmV+z0_XjSP)WyT5QV=Hsn~(#pEz+Y;GJ(#AnTr}H|VlA>KP1pXJirY z6-y#$TI6(Lh=|anK;Lpm&dhrsC@(KB>YPJFD9e(vEV0%iBB&~ZM1;0&5s^{NR#nAr zw*#Ok3XCzM$Ct~6uXH#ZuptCeN&uvk===W52cO9{O@sHIloF@Y>7Nq;CX)%9%?5zB zZL#zDob`H5N{Qp~$iu?}F-D4_Kt$-eZj{CKdS$g*0WhD>u>j7w9E$foHyCnBDPfF3 zRq@`BEp%O%8(3>`&Y`OOc>9fWP?jJ9KeykAF;Z0(=kpm6p=lcIY&K)F*$`vo_4Sp- zVu6TI)v((wNhxtSG#PK#b!@j=0II6O4n6^5jCk*{)^fd)>GVCQD#jSBwPOqC^Ep$P zPN#V92_X;y?Dq{J+${8cPmB>`40T;|cXxNAuvjd3dU`@cI3ACz*J}WNEx)6xTrL-i zqQJ%oKnNjIn9XK43vJuxl?Dm}fxN1<^nH&pCf8II`~Lo(DNH64y!WVTMkgXUi{VaP z*BE1P&S96!CC|^#q?CAkeEe&|5bS5VzrV+->d308Gi-<001BJ|6u?C00eVFNmK|32nc)#WQYI&0rN>jK~y-6ZIexI z@-PsFAO8iKAELJEu2Q95q6@@|vv2?ohr|l?3|yfb7Az2{LK53?7kqXb>6?u`BhS3= zyfYS?%_i_4%d#xpjWOw5E|+|MekNaMSw^1cIOot>W3A=+`G1+~^$LKsma;5SN+G3W zKA&T)CC~GF44^Dao}Qi(;^lHlr~uf>&?|U8}AMxHJr9=op*L7&Ean1p7yWJ8yA;g`*VzJ=s z>novHYYE|3TYn)0T5CcG6E?#zAdN9xuUB4QUopnebsYfb^O@7>#OZY6cDqeliVXU` zN3T{Zlu~%_(|7=!bDYm-0N&o-7={5M1OV&xI*F+dhr?vnahzJ~R7`6<5qH1eryLz; z8bykUWm)p^@xgpP$2phKW1{!|4iP-Bu!KO7Fr<#M%Jg<*I+9ygoK_6cr8fTu+#jK({)N^b$4ED9P>BZ*y-BeXG?XM3Vyo@`~fwylcOJjS-@8kjW4b7M+03YP;X> zS+0OIiEKWfldlml5__O_U6+3fH`KJ0S5D?31bkEuK>lGAlgR`zg;3#1jhObzfz?7K o2NojBW-WT->YkG)DHMw07ii?M)w2-hy#N3J07*qoM6N<$f_kah`Tzg` diff --git a/assets/hbm/textures/blocks/reactor_hatch_alt.png b/assets/hbm/textures/blocks/reactor_hatch_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..d5fc8d5afa838d9dfc265461f65db12761ff8133 GIT binary patch literal 587 zcmV-R0<`^!P)KpWV`hrMET_GL<0Sk6? z(_PwBQ4+`YT~u{jdS_$LXnf}A%&}N37M}k^9LM3VwGQWeKIi@YJ>)8mW0EAH?|YO| z7-P7-y=A-I0$_|G%QB>tL{Y@`^)<#Ak|f#J0J1FO=H@0$EXy)X1#r%Bb#+Bu*H~*q zJxx;-K+`m&Y0Bf{BXwOPgg|SJ)|$3$5kdfvBndx1KLMa^Ta?xs?>&9rlVusx=@ft{ zijY#$w(XfVUteE=oe*NrU^pD|`}@miG{QLtz~|>DbzP&iMhL-dHoFkI>$*LI?RLv} zJf^BDnx?@yN0wzgJUn2nWwlySmL&kY-7YX_+ZOTi^5UhGSZi6Y*UV-!oO1{v@ZQrj z&DqrN?{A);pM#j{?d>h>bTXMx*Y%|-PQqHta=ASE;IPxa@7ZiN7XW?VhgC``gD%$E zy>||cMNv=`1^4&&IOp)*Bc)`w+noUp1_QkJIhI(72f-c2YpDI@K0+gal=4hSAp}trad&rzwf4v$&vTxho>(rI42Q!&-xxy_ML6fsT4Ri%C<@B5 z-2a7BR|RF23JeY`ilPX4RaNA9PLd>u*Vk7srKIaRj4`BXinSJFOfbyBC)QfxI6nJO Z{{Vsw0V8uxWWxXe002ovPDHLkV1i}R2zUSh literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/stable_label_99.png b/assets/hbm/textures/models/stable_label_99.png new file mode 100644 index 0000000000000000000000000000000000000000..f58facf95842f11a31f7fa54a64a393a4d641520 GIT binary patch literal 918 zcmV;H18Mw;P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00Ra|L_t(IPi<67Pg7A4?vJ2~MX9B|^l{7W z%Xmu)#acugA3=P8QHltGR*(vAe6TPv#z!|AF?Qi|L5Pn9DoTR75tX1OG)6;WOw@(O zXky~ho!`0N<~=ee=miK00IUpN`n%n3uh;7{00jUSh`Q89B2h5_026K9fm-Zv;3y+41-5Ab#+tGJGTz4u^A@#)b9WROY9<6qkb! zBq$id&TVVBo#|W`)k9Oa_d%a~+6{`?$xi66Cid%VgWc&k%{tn2zK)>aLkwjbxQEOU z{^fJqp?`UkjYJ}l(6JH-1aK)d8_dL+%YP_>K@Ajz{8EZ5c|j2f)JO{6sCZN+Qdg^T z@A-K8-nG`>^M@D(5_vmy0Q!%2eORA)WZoB|U=x_v2@NlL>ykK`X;0r5rljaD&Njp6^Xp6~6l!YJH*L_jrlOkWM`@HM zvRD^LslO}6J*`GmWFc=-Ap1`y8EeevaWp0T@t9hx`_M1!S15|&j75EkdVjJ(tyb);OZK}3 zV+Zk2%6=&w8F(r7xSTqr*geGl|l{ s$w4C$AqBxDsYoBGESbG9E-Neh2hgQ`XRu$%jsO4v07*qoM6N<$g8d7Z*#H0l literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 22eb39b10..8519b0f5c 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -880,11 +880,11 @@ public class ModBlocks { factory_advanced_conductor = new BlockReactor(Material.iron).setBlockName("factory_advanced_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_advanced_conductor"); factory_advanced_core = new FactoryCoreAdvanced(Material.iron).setBlockName("factory_advanced_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_advanced_core"); - reactor_element = new BlockReactor(Material.iron).setBlockName("reactor_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":reactor_element_side"); - reactor_control = new BlockReactor(Material.iron).setBlockName("reactor_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":reactor_control_side"); - reactor_hatch = new ReactorHatch(Material.iron).setBlockName("reactor_hatch").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":brick_concrete"); - reactor_conductor = new BlockReactor(Material.iron).setBlockName("reactor_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":reactor_conductor_side"); - reactor_computer = new ReactorCore(Material.iron).setBlockName("reactor_computer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":reactor_computer"); + reactor_element = new BlockReactor(Material.iron).setBlockName("reactor_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":reactor_element_side"); + reactor_control = new BlockReactor(Material.iron).setBlockName("reactor_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":reactor_control_side"); + reactor_hatch = new ReactorHatch(Material.iron).setBlockName("reactor_hatch").setHardness(5.0F).setResistance(1000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":brick_concrete"); + reactor_conductor = new BlockReactor(Material.iron).setBlockName("reactor_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":reactor_conductor_side"); + reactor_computer = new ReactorCore(Material.iron).setBlockName("reactor_computer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":reactor_computer"); fusion_conductor = new BlockReactor(Material.iron).setBlockName("fusion_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fusion_conductor_side"); fusion_center = new BlockReactor(Material.iron).setBlockName("fusion_center").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fusion_center_side"); diff --git a/com/hbm/blocks/fluid/ToxicBlock.java b/com/hbm/blocks/fluid/ToxicBlock.java index 438c59038..da4dc3c50 100644 --- a/com/hbm/blocks/fluid/ToxicBlock.java +++ b/com/hbm/blocks/fluid/ToxicBlock.java @@ -120,17 +120,17 @@ public class ToxicBlock extends BlockFluidClassic { super.onNeighborBlockChange(world, x, y, z, block); if(reactToBlocks(world, x + 1, y, z)) - world.setBlock(x, y, z, ModBlocks.block_waste); + world.setBlock(x, y, z, ModBlocks.sellafield_0); if(reactToBlocks(world, x - 1, y, z)) - world.setBlock(x, y, z, ModBlocks.block_waste); + world.setBlock(x, y, z, ModBlocks.sellafield_0); if(reactToBlocks(world, x, y + 1, z)) - world.setBlock(x, y, z, ModBlocks.block_waste); + world.setBlock(x, y, z, ModBlocks.sellafield_0); if(reactToBlocks(world, x, y - 1, z)) - world.setBlock(x, y, z, ModBlocks.block_waste); + world.setBlock(x, y, z, ModBlocks.sellafield_0); if(reactToBlocks(world, x, y, z + 1)) - world.setBlock(x, y, z, ModBlocks.block_waste); + world.setBlock(x, y, z, ModBlocks.sellafield_0); if(reactToBlocks(world, x, y, z - 1)) - world.setBlock(x, y, z, ModBlocks.block_waste); + world.setBlock(x, y, z, ModBlocks.sellafield_0); } public boolean reactToBlocks(World world, int x, int y, int z) { diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 6e48c60a4..837b7fbdd 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -3134,15 +3134,16 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.wire_advanced_alloy, 4)); list.add(new ItemStack(ModItems.fuse, 6)); break; - /*case LR_ELEMENT: - list.add(new ItemStack(ModItems.ingot_steel, 4)); - list.add(new ItemStack(ModItems.neutron_reflector, 2)); + case LR_ELEMENT: + list.add(new ItemStack(ModItems.ingot_steel, 2)); + list.add(new ItemStack(ModItems.neutron_reflector, 4)); list.add(new ItemStack(ModItems.plate_lead, 2)); - list.add(new ItemStack(ModItems.rod_empty, 3)); + list.add(new ItemStack(ModItems.rod_empty, 8)); break; case LR_CONTROL: - list.add(new ItemStack(ModItems.ingot_steel, 6)); - list.add(new ItemStack(ModItems.ingot_lead, 4)); + list.add(new ItemStack(ModItems.ingot_steel, 4)); + list.add(new ItemStack(ModItems.ingot_lead, 6)); + list.add(new ItemStack(ModItems.bolt_tungsten, 6)); list.add(new ItemStack(ModItems.motor, 1)); break; case LR_HATCH: @@ -3150,16 +3151,15 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.plate_steel, 6)); break; case LR_PORT: - list.add(new ItemStack(ModItems.ingot_steel, 8)); - list.add(new ItemStack(ModItems.ingot_red_copper, 2)); - list.add(new ItemStack(ModItems.wire_red_copper, 4)); - list.add(new ItemStack(ModItems.fuse, 6)); + list.add(new ItemStack(ModItems.ingot_steel, 4)); + list.add(new ItemStack(ModItems.plate_copper, 12)); + list.add(new ItemStack(ModItems.wire_tungsten, 4)); break; case LR_CORE: list.add(new ItemStack(ModBlocks.reactor_conductor, 2)); - list.add(new ItemStack(ModItems.circuit_red_copper, 12)); - list.add(new ItemStack(ModItems.circuit_gold, 4)); - break;*/ + list.add(new ItemStack(ModItems.circuit_targeting_tier3, 4)); + list.add(new ItemStack(ModItems.circuit_gold, 1)); + break; case LF_MAGNET: list.add(new ItemStack(ModItems.plate_steel, 10)); list.add(new ItemStack(ModItems.coil_advanced_alloy, 5)); @@ -4357,7 +4357,7 @@ public class MachineRecipes { case FA_PORT: output = new ItemStack(ModBlocks.factory_advanced_conductor, 1); break; - /*case LR_ELEMENT: + case LR_ELEMENT: output = new ItemStack(ModBlocks.reactor_element, 1); break; case LR_CONTROL: @@ -4371,7 +4371,7 @@ public class MachineRecipes { break; case LR_CORE: output = new ItemStack(ModBlocks.reactor_computer, 1); - break;*/ + break; case LF_MAGNET: output = new ItemStack(ModBlocks.fusion_conductor, 1); break; diff --git a/com/hbm/inventory/gui/GUIReactorMultiblock.java b/com/hbm/inventory/gui/GUIReactorMultiblock.java index 0d9878b4e..5a997d9b8 100644 --- a/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -30,6 +30,7 @@ public class GUIReactorMultiblock extends GuiInfoContainer { this.ySize = 222; } + @SuppressWarnings("incomplete-switch") @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index d5f166d86..0f485f0a3 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -187,11 +187,11 @@ public class ItemAssemblyTemplate extends Item { FA_HATCH, FA_CORE, FA_PORT, - //LR_ELEMENT, - //LR_CONTROL, - //LR_HATCH, - //LR_PORT, - //LR_CORE, + LR_ELEMENT, + LR_CONTROL, + LR_HATCH, + LR_PORT, + LR_CORE, LF_MAGNET, LF_CENTER, LF_MOTOR, diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index d2ef3353c..503ab7c93 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -393,7 +393,6 @@ public class Library { tileentity instanceof IConsumer || tileentity instanceof ISource)) || world.getBlock(x, y, z) == ModBlocks.fusion_center || - world.getBlock(x, y, z) == ModBlocks.reactor_conductor || world.getBlock(x, y, z) == ModBlocks.factory_titanium_conductor || world.getBlock(x, y, z) == ModBlocks.factory_advanced_conductor || world.getBlock(x, y, z) == ModBlocks.watz_conductor || @@ -434,6 +433,7 @@ public class Library { world.getBlock(x, y, z) == ModBlocks.dummy_port_pumpjack || world.getBlock(x, y, z) == ModBlocks.dummy_port_turbofan || world.getBlock(x, y, z) == ModBlocks.reactor_hatch || + world.getBlock(x, y, z) == ModBlocks.reactor_conductor || world.getBlock(x, y, z) == ModBlocks.fusion_hatch || world.getBlock(x, y, z) == ModBlocks.watz_hatch || world.getBlock(x, y, z) == ModBlocks.fwatz_hatch || diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index fb1007f8b..4643083e5 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -241,6 +241,7 @@ public class ResourceManager { public static final ResourceLocation vault_label_106_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault_label_106.png"); public static final ResourceLocation stable_cog_tex = new ResourceLocation(RefStrings.MODID, "textures/models/stable_cog.png"); public static final ResourceLocation stable_label_tex = new ResourceLocation(RefStrings.MODID, "textures/models/stable_label.png"); + public static final ResourceLocation stable_label_99_tex = new ResourceLocation(RefStrings.MODID, "textures/models/stable_label_99.png"); public static final ResourceLocation vault4_cog_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault4_cog.png"); public static final ResourceLocation vault4_label_111_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault4_label_111.png"); public static final ResourceLocation vault4_label_81_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault4_label_81.png"); diff --git a/com/hbm/render/tileentity/RenderVaultDoor.java b/com/hbm/render/tileentity/RenderVaultDoor.java index 44e4089de..174feedec 100644 --- a/com/hbm/render/tileentity/RenderVaultDoor.java +++ b/com/hbm/render/tileentity/RenderVaultDoor.java @@ -69,9 +69,10 @@ public class RenderVaultDoor extends TileEntitySpecialRenderer { switch(tileEntity.type) { case 1: case 2: bindTexture(ResourceManager.vault_cog_tex); break; - case 3: bindTexture(ResourceManager.stable_cog_tex); break; - case 4: - case 5: bindTexture(ResourceManager.vault4_cog_tex); break; + case 3: + case 4: bindTexture(ResourceManager.stable_cog_tex); break; + case 5: + case 6: bindTexture(ResourceManager.vault4_cog_tex); break; default: bindTexture(ResourceManager.vault_cog_tex); break; } ResourceManager.vault_cog.renderAll(); @@ -80,8 +81,9 @@ public class RenderVaultDoor extends TileEntitySpecialRenderer { case 1: bindTexture(ResourceManager.vault_label_87_tex); break; case 2: bindTexture(ResourceManager.vault_label_106_tex); break; case 3: bindTexture(ResourceManager.stable_label_tex); break; - case 4: bindTexture(ResourceManager.vault4_label_111_tex); break; - case 5: bindTexture(ResourceManager.vault4_label_81_tex); break; + case 4: bindTexture(ResourceManager.stable_label_99_tex); break; + case 5: bindTexture(ResourceManager.vault4_label_111_tex); break; + case 6: bindTexture(ResourceManager.vault4_label_81_tex); break; default: bindTexture(ResourceManager.vault_label_101_tex); break; } ResourceManager.vault_label.renderAll(); diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index 69aa52d2d..32939b962 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -172,6 +172,8 @@ public class TileEntityMachineReactorLarge extends TileEntity coreHeat = nbt.getInteger("heat"); hullHeat = nbt.getInteger("hullHeat"); rods = nbt.getInteger("rods"); + fuel = nbt.getInteger("fuel"); + waste = nbt.getInteger("waste"); slots = new ItemStack[getSizeInventory()]; tanks[0].readFromNBT(nbt, "water"); tanks[1].readFromNBT(nbt, "coolant"); @@ -192,6 +194,8 @@ public class TileEntityMachineReactorLarge extends TileEntity nbt.setInteger("heat", coreHeat); nbt.setInteger("hullHeat", hullHeat); nbt.setInteger("rods", rods); + nbt.setInteger("fuel", fuel); + nbt.setInteger("waste", waste); NBTTagList list = new NBTTagList(); tanks[0].writeToNBT(nbt, "water"); tanks[1].writeToNBT(nbt, "coolant"); @@ -277,6 +281,63 @@ public class TileEntityMachineReactorLarge extends TileEntity worldObj.getBlock(xCoord, yCoord + offset, zCoord) == ModBlocks.reactor_conductor; } + private float checkHull() { + + float max = getSize() * 12; + float count = 0; + + for(int y = yCoord - depth; y <= yCoord + height; y++) { + + if(blocksRad(xCoord - 1, y, zCoord + 2)) + count++; + if(blocksRad(xCoord, y, zCoord + 2)) + count++; + if(blocksRad(xCoord + 1, y, zCoord + 2)) + count++; + + if(blocksRad(xCoord - 1, y, zCoord - 2)) + count++; + if(blocksRad(xCoord, y, zCoord - 2)) + count++; + if(blocksRad(xCoord + 1, y, zCoord - 2)) + count++; + + if(blocksRad(xCoord + 2, y, zCoord - 1)) + count++; + if(blocksRad(xCoord + 2, y, zCoord)) + count++; + if(blocksRad(xCoord + 2, y, zCoord + 1)) + count++; + + if(blocksRad(xCoord - 2, y, zCoord - 1)) + count++; + if(blocksRad(xCoord - 2, y, zCoord)) + count++; + if(blocksRad(xCoord - 2, y, zCoord + 1)) + count++; + } + + if(count == 0) + return 1; + + //System.out.println(count + "/" + max); + + return 1 - (count / max); + } + + private boolean blocksRad(int x, int y, int z) { + + Block b = worldObj.getBlock(x, y, z); + + if(b == ModBlocks.block_lead || b == ModBlocks.block_desh || b == ModBlocks.brick_concrete) + return true; + + if(b.getExplosionResistance(null) >= 100) + return true; + + return false; + } + int height; int depth; public int size; @@ -342,11 +403,12 @@ public class TileEntityMachineReactorLarge extends TileEntity fillFluidInit(tanks[2].getTankType()); caluclateSize(); - - tanks[0].changeTankSize(waterBase * getSize()); - tanks[1].changeTankSize(coolantBase * getSize()); - tanks[2].changeTankSize(steamBase * getSize()); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, size, 3)); } + + tanks[0].changeTankSize(waterBase * getSize()); + tanks[1].changeTankSize(coolantBase * getSize()); + tanks[2].changeTankSize(steamBase * getSize()); maxWaste = maxFuel = fuelBase * getSize(); @@ -367,6 +429,7 @@ public class TileEntityMachineReactorLarge extends TileEntity if(slots[4] != null && !getFuelType(slots[4].getItem()).toString().equals(ReactorFuelType.UNKNOWN.toString())) { this.type = getFuelType(slots[4].getItem()); + this.waste = 0; } } @@ -376,8 +439,6 @@ public class TileEntityMachineReactorLarge extends TileEntity int cont = getFuelContent(slots[4].getItem(), type) * fuelMult; - System.out.println(type.toString()); - if(fuel + cont <= maxFuel) { if(!slots[4].getItem().hasContainerItem()) { @@ -456,11 +517,15 @@ public class TileEntityMachineReactorLarge extends TileEntity this.explode(); } - if (rods > 0 && coreHeat > 0 /*rad block*/) { + if (rods > 0 && coreHeat > 0 && age == 5) { float rad = (float)coreHeat / (float)maxCoreHeat * 50F; RadiationSavedData data = RadiationSavedData.getData(worldObj); - data.incrementRad(worldObj, xCoord, zCoord, rad, rad * 4); + //System.out.println(rad); + rad *= checkHull(); + //System.out.println(rad); + + data.incrementRad(worldObj, xCoord, zCoord, rad, 50 * 4); } for (int i = 0; i < 3; i++) @@ -469,7 +534,6 @@ public class TileEntityMachineReactorLarge extends TileEntity PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, rods, 0)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, coreHeat, 1)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, hullHeat, 2)); - PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, size, 3)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, fuel, 4)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, waste, 5)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, type.getID(), 6)); @@ -515,32 +579,54 @@ public class TileEntityMachineReactorLarge extends TileEntity this.slots[i] = null; } + RadiationSavedData data = RadiationSavedData.getData(worldObj); + + int rad = (int)(((long)fuel) * 25000L / (fuelBase * 15L)); + + data.incrementRad(worldObj, xCoord, zCoord, rad, 75000); + worldObj.createExplosion(null, this.xCoord, this.yCoord, this.zCoord, 7.5F, true); ExplosionNukeGeneric.waste(worldObj, this.xCoord, this.yCoord, this.zCoord, 35); - worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, ModBlocks.toxic_block); for(int i = yCoord - depth; i <= yCoord + height; i++) { - if(worldObj.rand.nextInt(4) == 0) { - worldObj.setBlock(this.xCoord + 1, i, this.zCoord + 1, ModBlocks.toxic_block); + if(worldObj.rand.nextInt(2) == 0) { + randomizeRadBlock(this.xCoord + 1, i, this.zCoord + 1); } - if(worldObj.rand.nextInt(4) == 0) { - worldObj.setBlock(this.xCoord + 1, i, this.zCoord - 1, ModBlocks.toxic_block); + if(worldObj.rand.nextInt(2) == 0) { + randomizeRadBlock(this.xCoord + 1, i, this.zCoord - 1); } - if(worldObj.rand.nextInt(4) == 0) { - worldObj.setBlock(this.xCoord - 1, i, this.zCoord - 1, ModBlocks.toxic_block); + if(worldObj.rand.nextInt(2) == 0) { + randomizeRadBlock(this.xCoord - 1, i, this.zCoord - 1); } - if(worldObj.rand.nextInt(4) == 0) { - worldObj.setBlock(this.xCoord - 1, i, this.zCoord + 1, ModBlocks.toxic_block); + if(worldObj.rand.nextInt(2) == 0) { + randomizeRadBlock(this.xCoord - 1, i, this.zCoord + 1); } - if(worldObj.rand.nextInt(10) == 0) { + if(worldObj.rand.nextInt(5) == 0) { worldObj.createExplosion(null, this.xCoord, this.yCoord, this.zCoord, 5.0F, true); } } - - RadiationSavedData data = RadiationSavedData.getData(worldObj); - data.incrementRad(worldObj, xCoord, zCoord, 1000F, 2000F); + + worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, ModBlocks.sellafield_core); + } + + private void randomizeRadBlock(int x, int y, int z) { + + int rand = worldObj.rand.nextInt(20); + + if(rand < 7) + worldObj.setBlock(x, y, z, ModBlocks.toxic_block); + else if(rand < 10) + worldObj.setBlock(x, y, z, ModBlocks.sellafield_0); + else if(rand < 14) + worldObj.setBlock(x, y, z, ModBlocks.sellafield_1); + else if(rand < 17) + worldObj.setBlock(x, y, z, ModBlocks.sellafield_2); + else if(rand < 19) + worldObj.setBlock(x, y, z, ModBlocks.sellafield_3); + else + worldObj.setBlock(x, y, z, ModBlocks.sellafield_4); } @Override @@ -550,10 +636,22 @@ public class TileEntityMachineReactorLarge extends TileEntity @Override public void fillFluidInit(FluidType type) { - fillFluid(this.xCoord - 3, this.yCoord, this.zCoord, getTact(), type); - fillFluid(this.xCoord + 3, this.yCoord, this.zCoord, getTact(), type); - fillFluid(this.xCoord, this.yCoord, this.zCoord - 3, getTact(), type); - fillFluid(this.xCoord, this.yCoord, this.zCoord + 3, getTact(), type); + + if(worldObj.getBlock(xCoord - 2, yCoord, zCoord) == ModBlocks.reactor_hatch) + fillFluid(this.xCoord - 3, this.yCoord, this.zCoord, getTact(), type); + + if(worldObj.getBlock(xCoord + 2, yCoord, zCoord) == ModBlocks.reactor_hatch) + fillFluid(this.xCoord + 3, this.yCoord, this.zCoord, getTact(), type); + + if(worldObj.getBlock(xCoord, yCoord, zCoord - 2) == ModBlocks.reactor_hatch) + fillFluid(this.xCoord, this.yCoord, this.zCoord - 3, getTact(), type); + + if(worldObj.getBlock(xCoord, yCoord, zCoord + 2) == ModBlocks.reactor_hatch) + fillFluid(this.xCoord, this.yCoord, this.zCoord + 3, getTact(), type); + + fillFluid(this.xCoord, this.yCoord + height + 1, this.zCoord, getTact(), type); + + fillFluid(this.xCoord, this.yCoord - depth - 1, this.zCoord + 3, getTact(), type); } @Override diff --git a/com/hbm/tileentity/machine/TileEntityVaultDoor.java b/com/hbm/tileentity/machine/TileEntityVaultDoor.java index 1213ecca6..cbdf4fb50 100644 --- a/com/hbm/tileentity/machine/TileEntityVaultDoor.java +++ b/com/hbm/tileentity/machine/TileEntityVaultDoor.java @@ -21,7 +21,7 @@ public class TileEntityVaultDoor extends TileEntityLockableBase { public long sysTime; private int timer = 0; public int type; - public static final int maxTypes = 6; + public static final int maxTypes = 7; @Override public AxisAlignedBB getRenderBoundingBox() { diff --git a/com/hbm/world/NuclearReactor.java b/com/hbm/world/NuclearReactor.java index 8e2843134..1f9443d51 100644 --- a/com/hbm/world/NuclearReactor.java +++ b/com/hbm/world/NuclearReactor.java @@ -7,6 +7,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -88,7 +89,7 @@ public class NuclearReactor extends WorldGenerator world.setBlock(x + 4, y + 0, z + 1, Block1, 0, 3); world.setBlock(x + 0, y + 0, z + 2, Block1, 0, 3); world.setBlock(x + 1, y + 0, z + 2, Block1, 0, 3); - world.setBlock(x + 2, y + 0, z + 2, ModBlocks.red_wire_coated, 0, 3); + world.setBlock(x + 2, y + 0, z + 2, ModBlocks.fluid_duct, 0, 3); world.setBlock(x + 3, y + 0, z + 2, Block1, 0, 3); world.setBlock(x + 4, y + 0, z + 2, Block1, 0, 3); world.setBlock(x + 0, y + 0, z + 3, Block1, 0, 3); @@ -188,7 +189,7 @@ public class NuclearReactor extends WorldGenerator world.setBlock(x + 4, y + 4, z + 1, Block1, 0, 3); world.setBlock(x + 0, y + 4, z + 2, Block1, 0, 3); world.setBlock(x + 1, y + 4, z + 2, Block1, 0, 3); - world.setBlock(x + 2, y + 4, z + 2, ModBlocks.red_wire_coated, 0, 3); + world.setBlock(x + 2, y + 4, z + 2, ModBlocks.fluid_duct, 0, 3); world.setBlock(x + 3, y + 4, z + 2, Block1, 0, 3); world.setBlock(x + 4, y + 4, z + 2, Block1, 0, 3); world.setBlock(x + 0, y + 4, z + 3, Block1, 0, 3);