From 2a205c6b9b63088d87cfbcc9ec63b5a6a19bcf93 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 8 Mar 2020 13:34:52 +0100 Subject: [PATCH] moved some packages, new AMS gui textures --- assets/hbm/lang/de_DE.lang | 9 +- assets/hbm/lang/en_US.lang | 9 +- assets/hbm/textures/gui/dfc/gui_core.png | Bin 0 -> 1545 bytes assets/hbm/textures/gui/dfc/gui_emitter.png | Bin 0 -> 1471 bytes assets/hbm/textures/gui/dfc/gui_receiver.png | Bin 0 -> 1255 bytes assets/hbm/textures/gui/fatManSchematic.png | Bin 12188 -> 8916 bytes assets/hbm/textures/items/man_core.png | Bin 275 -> 381 bytes assets/hbm/textures/items/man_core_alt.png | Bin 0 -> 275 bytes .../hbm/textures/items/plutonium_core_new.png | Bin 381 -> 0 bytes com/hbm/blocks/ModBlocks.java | 3 + com/hbm/blocks/machine/CoreCore.java | 36 + com/hbm/blocks/test/TestEventTester.java | 2 +- com/hbm/handler/GunConfiguration.java | 2 +- com/hbm/handler/guncfg/Gun12GaugeFactory.java | 2 +- com/hbm/handler/guncfg/Gun20GaugeFactory.java | 2 +- com/hbm/handler/guncfg/Gun22LRFactory.java | 2 +- .../handler/guncfg/Gun357MagnumFactory.java | 2 +- .../handler/guncfg/Gun44MagnumFactory.java | 2 +- com/hbm/handler/guncfg/Gun50AEFactory.java | 2 +- com/hbm/handler/guncfg/Gun50BMGFactory.java | 2 +- com/hbm/handler/guncfg/Gun5mmFactory.java | 2 +- com/hbm/handler/guncfg/Gun9mmFactory.java | 2 +- com/hbm/handler/guncfg/GunFatmanFactory.java | 2 +- com/hbm/handler/guncfg/GunGaussFactory.java | 2 +- com/hbm/handler/guncfg/GunGrenadeFactory.java | 2 +- com/hbm/handler/guncfg/GunOSIPRFactory.java | 2 +- com/hbm/handler/guncfg/GunRocketFactory.java | 2 +- com/hbm/interfaces/IHoldableWeapon.java | 2 +- com/hbm/interfaces/Spaghetti.java | 8 + .../gui/GUIMachineCompactLauncher.java | 6 +- .../inventory/gui/GUIMachineLaunchTable.java | 4 +- .../gui/GUIMachineMissileAssembly.java | 6 +- com/hbm/inventory/gui/GUISoyuzLauncher.java | 4 +- com/hbm/items/ModItems.java | 14 +- com/hbm/items/special/ItemDrop.java | 3 + com/hbm/items/special/ItemFuelRod.java | 2 + com/hbm/items/special/ItemRadioactive.java | 11 + com/hbm/items/weapon/GunFolly.java | 2 +- com/hbm/items/weapon/GunLacunae.java | 2 +- com/hbm/items/weapon/GunUZI.java | 2 +- com/hbm/items/weapon/ItemCustomMissile.java | 2 +- com/hbm/items/weapon/ItemGunBase.java | 2 +- com/hbm/items/weapon/ItemGunGauss.java | 2 +- com/hbm/items/weapon/ItemGunOSIPR.java | 2 +- com/hbm/main/ClientProxy.java | 4 +- com/hbm/main/MainRegistry.java | 4 +- com/hbm/main/ModEventHandlerClient.java | 6 +- com/hbm/main/ResourceManager.java | 2 +- com/hbm/packet/AuxGaugePacket.java | 12 + .../render/entity/RenderMissileCustom.java | 6 +- com/hbm/render/entity/RenderTom.java | 2 +- com/hbm/render/item/ItemRenderMissile.java | 6 +- .../render/item/ItemRenderMissilePart.java | 2 +- com/hbm/render/item/ItemRenderTemplate.java | 4 +- .../{util => loader}/HFRWavefrontObject.java | 2 +- com/hbm/render/{util => loader}/HbmFace.java | 2 +- .../{util => loader}/HbmGroupObject.java | 2 +- .../{util => loader}/HbmModelObject.java | 2 +- .../{util => loader}/HmfController.java | 2 +- .../{util => loader}/HmfModelLoader.java | 2 +- .../render/{util => loader}/RUVertice.java | 2 +- com/hbm/render/{util => loader}/S_Face.java | 2 +- .../{util => loader}/S_GroupObject.java | 2 +- .../{util => loader}/S_ModelCustom.java | 2 +- .../{util => loader}/S_WavefrontObject.java | 2 +- .../render/tileentity/RenderChemplant.java | 2 +- .../tileentity/RenderCompactLauncher.java | 8 +- .../render/tileentity/RenderDecoBlockAlt.java | 2 +- com/hbm/render/tileentity/RenderEPress.java | 2 +- .../render/tileentity/RenderLaunchTable.java | 8 +- .../tileentity/RenderMissileAssembly.java | 6 +- com/hbm/render/tileentity/RenderPress.java | 2 +- .../tileentity/RenderSoyuzLauncher.java | 2 +- com/hbm/render/tileentity/RenderTaint.java | 2 +- .../render/tileentity/RendererObjTester.java | 10 +- .../render/{misc => util}/BeamPronter.java | 2 +- .../render/{misc => util}/ErrorPronter.java | 2 +- .../{misc => util}/MissileMultipart.java | 2 +- .../render/{misc => util}/MissilePart.java | 2 +- .../render/{misc => util}/MissilePronter.java | 2 +- .../RenderAccessoryUtility.java | 2 +- .../render/{misc => util}/RenderDecoItem.java | 2 +- .../{misc => util}/RenderItemStack.java | 2 +- .../{misc => util}/RenderScreenOverlay.java | 2 +- .../{misc => util}/SoyuzLauncherPronter.java | 2 +- .../render/{misc => util}/SoyuzPronter.java | 2 +- com/hbm/render/{misc => util}/TomPronter.java | 4 +- com/hbm/tileentity/TileEntityMachineBase.java | 188 ++++ .../tileentity/machine/TileEntityCore.java | 23 + .../TileEntityMachineMissileAssembly.java | 4 +- com/hbm/world/DesertAtom002.java | 822 +++++++++--------- com/hbm/world/DesertAtom003.java | 90 +- com/hbm/world/Relay.java | 266 +++--- com/hbm/world/Satellite.java | 208 ++--- 94 files changed, 1098 insertions(+), 806 deletions(-) create mode 100644 assets/hbm/textures/gui/dfc/gui_core.png create mode 100644 assets/hbm/textures/gui/dfc/gui_emitter.png create mode 100644 assets/hbm/textures/gui/dfc/gui_receiver.png create mode 100644 assets/hbm/textures/items/man_core_alt.png delete mode 100644 assets/hbm/textures/items/plutonium_core_new.png create mode 100644 com/hbm/blocks/machine/CoreCore.java create mode 100644 com/hbm/interfaces/Spaghetti.java rename com/hbm/render/{util => loader}/HFRWavefrontObject.java (99%) rename com/hbm/render/{util => loader}/HbmFace.java (98%) rename com/hbm/render/{util => loader}/HbmGroupObject.java (97%) rename com/hbm/render/{util => loader}/HbmModelObject.java (99%) rename com/hbm/render/{util => loader}/HmfController.java (91%) rename com/hbm/render/{util => loader}/HmfModelLoader.java (95%) rename com/hbm/render/{util => loader}/RUVertice.java (90%) rename com/hbm/render/{util => loader}/S_Face.java (98%) rename com/hbm/render/{util => loader}/S_GroupObject.java (96%) rename com/hbm/render/{util => loader}/S_ModelCustom.java (98%) rename com/hbm/render/{util => loader}/S_WavefrontObject.java (99%) rename com/hbm/render/{misc => util}/BeamPronter.java (99%) rename com/hbm/render/{misc => util}/ErrorPronter.java (94%) rename com/hbm/render/{misc => util}/MissileMultipart.java (98%) rename com/hbm/render/{misc => util}/MissilePart.java (99%) rename com/hbm/render/{misc => util}/MissilePronter.java (97%) rename com/hbm/render/{misc => util}/RenderAccessoryUtility.java (98%) rename com/hbm/render/{misc => util}/RenderDecoItem.java (90%) rename com/hbm/render/{misc => util}/RenderItemStack.java (96%) rename com/hbm/render/{misc => util}/RenderScreenOverlay.java (99%) rename com/hbm/render/{misc => util}/SoyuzLauncherPronter.java (98%) rename com/hbm/render/{misc => util}/SoyuzPronter.java (98%) rename com/hbm/render/{misc => util}/TomPronter.java (95%) create mode 100644 com/hbm/tileentity/TileEntityMachineBase.java create mode 100644 com/hbm/tileentity/machine/TileEntityCore.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 8b14822a5..c72f2f857 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -553,9 +553,10 @@ container.amsEmitter=AMS-Emitter [WIP] tile.ams_base.name=AMS-Basis [WIP] container.amsBase=AMS-Basis [WIP] -tile.dfc_emitter.name=[WIP] -tile.dfc_receiver.name=[WIP] -tile.dfc_injector.name=[WIP] +tile.dfc_emitter.name=DFC-Emitter +tile.dfc_receiver.name=DFC-Receiver +tile.dfc_injector.name=DFC-Brennstoffinjektor +tile.dfc_core.name=Dunkler Fusionskern item.template_folder.name=Produktionsvorlagen-Zeichenmappe item.fluid_identifier.name=Flüssigkeits-Kennzeichnung @@ -855,6 +856,8 @@ tile.barbed_wire_acid.name=Ätzender Stacheldraht tile.barbed_wire_wither.name=Withernder Stacheldraht tile.barbed_wire_ultradeath.name=Wolken-Stacheldraht +tile.fence_metal.name=Maschendrahtzaun + tile.seal_frame.name=Siloluke (Rahmen) tile.seal_controller.name=Silolukenöffner tile.seal_hatch.name=Siloluke (Deckel) diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index f4329f87d..820d49f4b 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -553,9 +553,10 @@ container.amsEmitter=AMS Emitter [WIP] tile.ams_base.name=AMS Base [WIP] container.amsBase=AMS Base [WIP] -tile.dfc_emitter.name=[WIP] -tile.dfc_receiver.name=[WIP] -tile.dfc_injector.name=[WIP] +tile.dfc_emitter.name=DFC Emitter +tile.dfc_receiver.name=DFC Receiver +tile.dfc_injector.name=DFC Fuel Injector +tile.dfc_core.name=Dark Fusion Core item.template_folder.name=Machine Template Folder item.fluid_identifier.name=Fluid Identifier @@ -855,6 +856,8 @@ tile.barbed_wire_acid.name=Caustic Barbed Wire tile.barbed_wire_wither.name=Withered Barbed Wire tile.barbed_wire_ultradeath.name=Cloud Barbed Wire +tile.fence_metal.name=Chainlink Fence + tile.seal_frame.name=Silo Hatch Frame tile.seal_controller.name=Silo Hatch Opener tile.seal_hatch.name=Silo Hatch diff --git a/assets/hbm/textures/gui/dfc/gui_core.png b/assets/hbm/textures/gui/dfc/gui_core.png new file mode 100644 index 0000000000000000000000000000000000000000..a850cc9d692b3d82d74b9e46c9ca4c0822297b00 GIT binary patch literal 1545 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%N?Bp530R%N1DIE+9tOq<@ z978JRyuE9fryVN7_8?n?(~(oi+hI}TtR>03lWi}!eX_f>sr`(U#$#25ix<-v17;}| z&M@ye?s?8)=I3+YP2ZoKDf3%(=l?(RY~u58)qmqHx?%JG?e6<>^?Cb$?c7>l*1!Gl z-`~sK>;HOJ+dX^m@`k-!U9HUJsOpMe7v?Xv{{62Yy!kfY@qY$2I-IdKe|O%0zqY>U zMvmF^bX4vq<)18^)XFPL5 zh)IJ0qeGsQLkEL`Ij@2X!-Uyv0!j=ge3>}}8J;X-Y~f%iy3F9j!mu-wL6NE94yy7L zGlsmpyhG&|N@HLDuA68X9v=SCa?Z3@zt=Ig%*kPhz25pRVfWo_``(Mse0&%fBU?rZJ-RS?g={PXp)+NYQI^}bq6(voCYYpXY- z<89gPU;E;(&bgac{>wq)$D_sa2c9o`|NErzuZ_1KDo@R2INl@vGW-0Qb}xII)$(ck zp6bZg+8DSqTRhZFfBW!Ie9_0lmsk!69%il1QuM2>`SCNj`@gC2+^?46j0TrV?|yEI zR$`eJ_2+n+V+(`DLsdnCx^?z8b+5L4ytA_ZyezY~AcOvgX#x^*=KIb*O4ns!5K&`@ zd!U;B?BmVaS4s~yF6Ro~{Fklay8?q>#py@#a`vUSE8bl>{=BboDM!P^hpoG(+o{jr zeXIUec+2r;yy<7oHgPZ(xO{24bH(+*!tE^#I=&2Z1S0<&P80Yk-&&v-$88`KTM~So zd0CwNhq!+BXB-W!ve6sFjIvFnfhl6^+cN2Wlb1fzNzMJQ7cXyjYT4Fp_uqeCyEV<3 zGib-&y}4_*mX()ZzxDXMLH-jZ1)y6O7%(!lax!T6FgPSKF>nbp1k7M)I0W_vOe*Kw z)rR@6Z)eP&ob7jVyKTL?`gi7t%eUia2N(B+ubkJv9E%=2#(|_(-jlmCXI8Pr{F~d^ zw<}Mu%${LR;X8q%R4$s!q^~pA#J8p{CQCKaoW}3PAm*t#(*~T-Ge`Tzh<|47O zNq1!#i&6SlkRxRq6MElpY?1M2M1+abg4o8hk%#AeTz5d{___liS9f22{#X-~0AQ-H zIuawiLFW9GIR`XkNpkpurxje#2$^td;lIs2-PdlVZNB;D{rmT|g$rjmGvA1bi>rIV y+<3i!u|V>%{)2zca;$si9pwj>yEFj@(qF_!b>CfTxc&25kOiKuelF{r5}E*ZTts~U literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/gui/dfc/gui_emitter.png b/assets/hbm/textures/gui/dfc/gui_emitter.png new file mode 100644 index 0000000000000000000000000000000000000000..03d9a1bc63fd1b5e99cf0573a3c1994de9f5755d GIT binary patch literal 1471 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%N?Bp530R%N1DIE+9tYw}q zjv*Cu-rhCLlMWYPd*FWiBjcrIUa#gH*mLX`gX1d^mI{8RtR9hxr&%UQ#XDuivSczX z+1$Y3rzgNUTWO+lV3$T#*-6=R-x=F<8)fv^?#zF`H`ea_t@>YVmS^n#uKsWIW#8YI z-`^i%|NQRp>~D{+?>}c|UsM(M=Xd%2@8{}^W}Ho{-Obl{`uW4E_jda@ZT~-i|DQwt z@IIStzq(15*4Ei?tBzFtRQk4jhqbJQz5V^;g$EX|4O{)~*Vor&MMamkpFZzaJ@@{; zzkjZskN^AOdB*y!`rDZfobjZfF*ud<-_c=e1FDk# z81}$<&-ePfeoP4)BU-XcVy{2@{FA}`u%jU>$IZy^yVh~r*6)n@wMnR)bvXmjOP+sg z|7m>m%sVLPaBXf)n-b9I>y6Gp^I}*z1R0)eE95G8{O$gw=D)vzjw=>baQS}1m!ai_ z+)hrg1G*a&nHuiIu<-zWVa&<_A%XhRSU@gI;{~ZdE27}SFyZ#zV217g?WQp(m}fI6 z?sCs#LYNiF!UNRv%qXGb-Nf0N4p0)PQW7Np$^CDJK44}4my|zxp2l*ZId9&B@4TP$|M^KgQD#_Rz{t?b$)MrG@L_>( z@gLu87N6Ox8FG#~-A^=RN?3fnX4CI4=TCApxbL((c$cdtf`uWv@Q}P%FoQ;px^lz1 z*SCsx-Z|=R*ua1M_}jNfkM84dmc8N0aOU~vvbwr`-P4me+}+JSYa9|`;1XsCn8DC+ zh=oB!4aruAL?&dZZx5z7igmmGVBNJYd-?L^uU341V)gl_O-%dm+&^Xs*Gm_QN9av| z`{hfBZ0Wq17bo9d!)Of4ARzwc@bJ*{JN=``_1YElYpQYR$CLxYg>l zH4`v{T#L$9S65&A_p{uy&Nm!O&OLd3LombU8g7TG|k zt(kg{OW_R)tR_MLB-JYD@<);T3K0RW|EI|={* literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/gui/dfc/gui_receiver.png b/assets/hbm/textures/gui/dfc/gui_receiver.png new file mode 100644 index 0000000000000000000000000000000000000000..058d5d6640d232ed14a9b102376cad1d8fb34534 GIT binary patch literal 1255 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 diff --git a/assets/hbm/textures/items/man_core.png b/assets/hbm/textures/items/man_core.png index b333964513109ba88edad19e571c3fb62cd99383..9bdcea68c21b2dd0a6811cc3d83e0abe3122269f 100644 GIT binary patch delta 331 zcmV-R0kr;;0{sGzBnkm@Qb$4nuFf3kks%v@zW@LZzX3P}QzQTY0TM|>K~y+TrINpn zf`MBrFPl zf`HGo)>Ks$wQWmH)AYZqXEND=h#`b1O;gSxHpUEZ-LVF!j$ zwr#Hi%#5lKATNr7&+EEoF-(m4qw~4sbKn`cvu9b>Z$Gq^AGHsx0j>&^WyuwRL=mGp zMsV?N0kh!+x1xv;0ouP^e&=ri$gF}kn~#}%NU~w6Dp3~aRtFOUVZHtE9*l*;tiiK9 d+`;n@{R5GYstcP@bEyCT002ovPDHLkV1k;cl}G>p delta 226 zcmV<803HAR0+RxeB#|)~f4~3$4!{9w)`+PtxKS c(&Brf91Poxa!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&os5wC>5w?qNj^v zh=u>szJt666nL0#_Avg~%*t#~s})|9>Jzo~)ngWwj}wIi_j`25dvq_jCbf1e_xs6f z8x$mx=bW+h*ZA`D=|abLrRh0M_kM3}yr;QS)S!oP&Z)~{D;dfcY}&0W#(3C5bm|_l z6(?9<>Gt7^d>+0U)f9a9Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0TM|>K~y+TrINpn zf`MBrFPo zfX}qnR8$+w!OpN)X^SR`6;2F5HXIa*7KeUw}wGXTTt_qZ8$rXV_5u-Xr zaPe*dv*87|qKFUy+P__X=WhYXtb&`5nS4mHVW}!n7Uxz669Zwr{qP=)g~F`Cvpn3v b^AP<5k&mhin^AMA00000NkvXXu0mjf{U4k3 diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 6e00fa2be..34c8d3cc0 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -474,6 +474,7 @@ public class ModBlocks { public static Block dfc_emitter; public static Block dfc_injector; public static Block dfc_receiver; + public static Block dfc_core; public static Block machine_converter_he_rf; public static final int guiID_converter_he_rf = 28; @@ -1085,6 +1086,7 @@ public class ModBlocks { dfc_emitter = new CoreComponent(Material.iron).setBlockName("dfc_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":dfc_emitter"); dfc_injector = new CoreComponent(Material.iron).setBlockName("dfc_injector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":dfc_injector"); dfc_receiver = new CoreComponent(Material.iron).setBlockName("dfc_receiver").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":dfc_receiver"); + dfc_core = new CoreCore(Material.iron).setBlockName("dfc_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":dfc_core"); seal_frame = new BlockGeneric(Material.iron).setBlockName("seal_frame").setHardness(10.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":seal_frame"); seal_controller = new BlockSeal(Material.iron).setBlockName("seal_controller").setHardness(10.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab); @@ -1738,6 +1740,7 @@ public class ModBlocks { GameRegistry.registerBlock(dfc_emitter, dfc_emitter.getUnlocalizedName()); GameRegistry.registerBlock(dfc_injector, dfc_injector.getUnlocalizedName()); GameRegistry.registerBlock(dfc_receiver, dfc_receiver.getUnlocalizedName()); + GameRegistry.registerBlock(dfc_core, dfc_core.getUnlocalizedName()); //Missile Blocks GameRegistry.registerBlock(machine_missile_assembly, machine_missile_assembly.getUnlocalizedName()); diff --git a/com/hbm/blocks/machine/CoreCore.java b/com/hbm/blocks/machine/CoreCore.java new file mode 100644 index 000000000..be3fba10b --- /dev/null +++ b/com/hbm/blocks/machine/CoreCore.java @@ -0,0 +1,36 @@ +package com.hbm.blocks.machine; + +import com.hbm.tileentity.machine.TileEntityCore; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class CoreCore extends BlockContainer { + + public CoreCore(Material p_i45386_1_) { + super(p_i45386_1_); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityCore(); + } + + @Override + public int getRenderType(){ + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + +} diff --git a/com/hbm/blocks/test/TestEventTester.java b/com/hbm/blocks/test/TestEventTester.java index 09f6999df..a0f6d73d4 100644 --- a/com/hbm/blocks/test/TestEventTester.java +++ b/com/hbm/blocks/test/TestEventTester.java @@ -24,7 +24,7 @@ import com.hbm.main.ModEventHandler; import com.hbm.packet.AuxParticlePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.potion.HbmPotion; -import com.hbm.render.misc.MissilePart; +import com.hbm.render.util.MissilePart; import com.hbm.saveddata.RadiationSaveStructure; import com.hbm.saveddata.RadiationSavedData; import com.hbm.saveddata.SatelliteSaveStructure; diff --git a/com/hbm/handler/GunConfiguration.java b/com/hbm/handler/GunConfiguration.java index 0f96c4bb9..54b2052d3 100644 --- a/com/hbm/handler/GunConfiguration.java +++ b/com/hbm/handler/GunConfiguration.java @@ -2,7 +2,7 @@ package com.hbm.handler; import java.util.List; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class GunConfiguration { diff --git a/com/hbm/handler/guncfg/Gun12GaugeFactory.java b/com/hbm/handler/guncfg/Gun12GaugeFactory.java index 3e6ce39fe..2dffc3c6f 100644 --- a/com/hbm/handler/guncfg/Gun12GaugeFactory.java +++ b/com/hbm/handler/guncfg/Gun12GaugeFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class Gun12GaugeFactory { diff --git a/com/hbm/handler/guncfg/Gun20GaugeFactory.java b/com/hbm/handler/guncfg/Gun20GaugeFactory.java index caa4d0678..5a9006be0 100644 --- a/com/hbm/handler/guncfg/Gun20GaugeFactory.java +++ b/com/hbm/handler/guncfg/Gun20GaugeFactory.java @@ -7,7 +7,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; import com.hbm.potion.HbmPotion; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; diff --git a/com/hbm/handler/guncfg/Gun22LRFactory.java b/com/hbm/handler/guncfg/Gun22LRFactory.java index 139b97d27..9d8a6c636 100644 --- a/com/hbm/handler/guncfg/Gun22LRFactory.java +++ b/com/hbm/handler/guncfg/Gun22LRFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class Gun22LRFactory { diff --git a/com/hbm/handler/guncfg/Gun357MagnumFactory.java b/com/hbm/handler/guncfg/Gun357MagnumFactory.java index f7d48c57a..f146c242a 100644 --- a/com/hbm/handler/guncfg/Gun357MagnumFactory.java +++ b/com/hbm/handler/guncfg/Gun357MagnumFactory.java @@ -7,7 +7,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; import com.hbm.potion.HbmPotion; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.potion.PotionEffect; diff --git a/com/hbm/handler/guncfg/Gun44MagnumFactory.java b/com/hbm/handler/guncfg/Gun44MagnumFactory.java index 5d45a2ba7..e62b033c4 100644 --- a/com/hbm/handler/guncfg/Gun44MagnumFactory.java +++ b/com/hbm/handler/guncfg/Gun44MagnumFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class Gun44MagnumFactory { diff --git a/com/hbm/handler/guncfg/Gun50AEFactory.java b/com/hbm/handler/guncfg/Gun50AEFactory.java index 12102faa4..6788fbf8a 100644 --- a/com/hbm/handler/guncfg/Gun50AEFactory.java +++ b/com/hbm/handler/guncfg/Gun50AEFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class Gun50AEFactory { diff --git a/com/hbm/handler/guncfg/Gun50BMGFactory.java b/com/hbm/handler/guncfg/Gun50BMGFactory.java index 71746649a..709819626 100644 --- a/com/hbm/handler/guncfg/Gun50BMGFactory.java +++ b/com/hbm/handler/guncfg/Gun50BMGFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class Gun50BMGFactory { diff --git a/com/hbm/handler/guncfg/Gun5mmFactory.java b/com/hbm/handler/guncfg/Gun5mmFactory.java index f7a3e93d1..04ac772b4 100644 --- a/com/hbm/handler/guncfg/Gun5mmFactory.java +++ b/com/hbm/handler/guncfg/Gun5mmFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class Gun5mmFactory { diff --git a/com/hbm/handler/guncfg/Gun9mmFactory.java b/com/hbm/handler/guncfg/Gun9mmFactory.java index f8ed6eedd..c3492a749 100644 --- a/com/hbm/handler/guncfg/Gun9mmFactory.java +++ b/com/hbm/handler/guncfg/Gun9mmFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class Gun9mmFactory { diff --git a/com/hbm/handler/guncfg/GunFatmanFactory.java b/com/hbm/handler/guncfg/GunFatmanFactory.java index 1e3b7f8b0..523c0ad17 100644 --- a/com/hbm/handler/guncfg/GunFatmanFactory.java +++ b/com/hbm/handler/guncfg/GunFatmanFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class GunFatmanFactory { diff --git a/com/hbm/handler/guncfg/GunGaussFactory.java b/com/hbm/handler/guncfg/GunGaussFactory.java index f3a42a69b..a9fd69285 100644 --- a/com/hbm/handler/guncfg/GunGaussFactory.java +++ b/com/hbm/handler/guncfg/GunGaussFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class GunGaussFactory { diff --git a/com/hbm/handler/guncfg/GunGrenadeFactory.java b/com/hbm/handler/guncfg/GunGrenadeFactory.java index 77391f9c2..dabe9ede7 100644 --- a/com/hbm/handler/guncfg/GunGrenadeFactory.java +++ b/com/hbm/handler/guncfg/GunGrenadeFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class GunGrenadeFactory { diff --git a/com/hbm/handler/guncfg/GunOSIPRFactory.java b/com/hbm/handler/guncfg/GunOSIPRFactory.java index d13053eb0..562314354 100644 --- a/com/hbm/handler/guncfg/GunOSIPRFactory.java +++ b/com/hbm/handler/guncfg/GunOSIPRFactory.java @@ -6,7 +6,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public class GunOSIPRFactory { diff --git a/com/hbm/handler/guncfg/GunRocketFactory.java b/com/hbm/handler/guncfg/GunRocketFactory.java index 11a44c836..287a116b9 100644 --- a/com/hbm/handler/guncfg/GunRocketFactory.java +++ b/com/hbm/handler/guncfg/GunRocketFactory.java @@ -9,7 +9,7 @@ import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.interfaces.IBulletRicochetBehavior; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/com/hbm/interfaces/IHoldableWeapon.java b/com/hbm/interfaces/IHoldableWeapon.java index c83886d86..22647eb3b 100644 --- a/com/hbm/interfaces/IHoldableWeapon.java +++ b/com/hbm/interfaces/IHoldableWeapon.java @@ -1,6 +1,6 @@ package com.hbm.interfaces; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; public interface IHoldableWeapon { diff --git a/com/hbm/interfaces/Spaghetti.java b/com/hbm/interfaces/Spaghetti.java new file mode 100644 index 000000000..93f356ef2 --- /dev/null +++ b/com/hbm/interfaces/Spaghetti.java @@ -0,0 +1,8 @@ +package com.hbm.interfaces; + +//Universal notation for shitty code +// know TODO is a thing, but it's nice to hover over a class and see wtf is wrong with it +public @interface Spaghetti { + + public String value(); +} diff --git a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java index e7158eb0d..b51407710 100644 --- a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java +++ b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java @@ -10,9 +10,9 @@ import com.hbm.items.weapon.ItemMissile; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePart; -import com.hbm.render.misc.MissilePronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePart; +import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; diff --git a/com/hbm/inventory/gui/GUIMachineLaunchTable.java b/com/hbm/inventory/gui/GUIMachineLaunchTable.java index 7d5321b62..d3252d981 100644 --- a/com/hbm/inventory/gui/GUIMachineLaunchTable.java +++ b/com/hbm/inventory/gui/GUIMachineLaunchTable.java @@ -10,8 +10,8 @@ import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; diff --git a/com/hbm/inventory/gui/GUIMachineMissileAssembly.java b/com/hbm/inventory/gui/GUIMachineMissileAssembly.java index 12ee9ce72..e635277e1 100644 --- a/com/hbm/inventory/gui/GUIMachineMissileAssembly.java +++ b/com/hbm/inventory/gui/GUIMachineMissileAssembly.java @@ -9,9 +9,9 @@ import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePart; -import com.hbm.render.misc.MissilePronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePart; +import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; diff --git a/com/hbm/inventory/gui/GUISoyuzLauncher.java b/com/hbm/inventory/gui/GUISoyuzLauncher.java index 24e67ae7c..bd7ec924f 100644 --- a/com/hbm/inventory/gui/GUISoyuzLauncher.java +++ b/com/hbm/inventory/gui/GUISoyuzLauncher.java @@ -9,8 +9,8 @@ import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.machine.TileEntitySoyuzLauncher; import net.minecraft.client.Minecraft; diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index b9f1707b7..c0542e405 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -2408,13 +2408,13 @@ public class ModItems { rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead"); rod_schrabidium = new ItemRadioactive().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium"); rod_solinium = new ItemRadioactive().setUnlocalizedName("rod_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_solinium"); - rod_euphemium = new ItemRadioactive().setUnlocalizedName("rod_euphemium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium"); - rod_australium = new ItemRadioactive().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium"); - rod_weidanium = new ItemRadioactive().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium"); - rod_reiium = new ItemRadioactive().setUnlocalizedName("rod_reiium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_reiium"); - rod_unobtainium = new ItemRadioactive().setUnlocalizedName("rod_unobtainium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_unobtainium"); - rod_daffergon = new ItemRadioactive().setUnlocalizedName("rod_daffergon").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_daffergon"); - rod_verticium = new ItemRadioactive().setUnlocalizedName("rod_verticium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_verticium"); + rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_euphemium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium"); + rod_australium = new ItemCustomLore().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium"); + rod_weidanium = new ItemCustomLore().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium"); + rod_reiium = new ItemCustomLore().setUnlocalizedName("rod_reiium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_reiium"); + rod_unobtainium = new ItemCustomLore().setUnlocalizedName("rod_unobtainium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_unobtainium"); + rod_daffergon = new ItemCustomLore().setUnlocalizedName("rod_daffergon").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_daffergon"); + rod_verticium = new ItemCustomLore().setUnlocalizedName("rod_verticium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_verticium"); rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty"); rod_dual_th232 = new ItemRadioactive().setUnlocalizedName("rod_dual_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_th232"); diff --git a/com/hbm/items/special/ItemDrop.java b/com/hbm/items/special/ItemDrop.java index a69749ddb..e629636ef 100644 --- a/com/hbm/items/special/ItemDrop.java +++ b/com/hbm/items/special/ItemDrop.java @@ -22,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class ItemDrop extends Item { @@ -240,6 +241,8 @@ public class ItemDrop extends Item { if (this == ModItems.detonator_de) { list.add("Explodes when dropped!"); } + + list.add(EnumChatFormatting.RED + "[Dangerous Drop]"); } @Override diff --git a/com/hbm/items/special/ItemFuelRod.java b/com/hbm/items/special/ItemFuelRod.java index 9511623f8..06c75d121 100644 --- a/com/hbm/items/special/ItemFuelRod.java +++ b/com/hbm/items/special/ItemFuelRod.java @@ -27,6 +27,8 @@ public class ItemFuelRod extends ItemRadioactive { list.add("Generates " + heat + " heat per tick"); list.add("Lasts " + lifeTime + " ticks"); + + super.addInformation(itemstack, player, list, bool); } public static void setLifeTime(ItemStack stack, int time) { diff --git a/com/hbm/items/special/ItemRadioactive.java b/com/hbm/items/special/ItemRadioactive.java index 0377e5f54..ac2a32c02 100644 --- a/com/hbm/items/special/ItemRadioactive.java +++ b/com/hbm/items/special/ItemRadioactive.java @@ -1,5 +1,7 @@ package com.hbm.items.special; +import java.util.List; + import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; @@ -13,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class ItemRadioactive extends ItemCustomLore { @@ -268,4 +271,12 @@ public class ItemRadioactive extends ItemCustomLore { } } } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + super.addInformation(stack, player, list, bool); + + list.add(EnumChatFormatting.GREEN + "[Radioactive]"); + } } diff --git a/com/hbm/items/weapon/GunFolly.java b/com/hbm/items/weapon/GunFolly.java index 81fe328da..46734c48d 100644 --- a/com/hbm/items/weapon/GunFolly.java +++ b/com/hbm/items/weapon/GunFolly.java @@ -8,7 +8,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.guncfg.BulletConfigFactory; import com.hbm.interfaces.IHoldableWeapon; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/weapon/GunLacunae.java b/com/hbm/items/weapon/GunLacunae.java index 749db3089..a76317384 100644 --- a/com/hbm/items/weapon/GunLacunae.java +++ b/com/hbm/items/weapon/GunLacunae.java @@ -8,7 +8,7 @@ import com.hbm.entity.projectile.EntityBullet; import com.hbm.interfaces.IHoldableWeapon; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/com/hbm/items/weapon/GunUZI.java b/com/hbm/items/weapon/GunUZI.java index 816271b97..21a719948 100644 --- a/com/hbm/items/weapon/GunUZI.java +++ b/com/hbm/items/weapon/GunUZI.java @@ -7,7 +7,7 @@ import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; import com.hbm.interfaces.IHoldableWeapon; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/com/hbm/items/weapon/ItemCustomMissile.java b/com/hbm/items/weapon/ItemCustomMissile.java index 66b7cc75d..a6a300d85 100644 --- a/com/hbm/items/weapon/ItemCustomMissile.java +++ b/com/hbm/items/weapon/ItemCustomMissile.java @@ -6,7 +6,7 @@ import com.hbm.handler.MissileStruct; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.WarheadType; -import com.hbm.render.misc.MissilePart; +import com.hbm.render.util.MissilePart; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/weapon/ItemGunBase.java b/com/hbm/items/weapon/ItemGunBase.java index 7b27e4769..3facbaf47 100644 --- a/com/hbm/items/weapon/ItemGunBase.java +++ b/com/hbm/items/weapon/ItemGunBase.java @@ -14,7 +14,7 @@ import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.GunButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/com/hbm/items/weapon/ItemGunGauss.java b/com/hbm/items/weapon/ItemGunGauss.java index b6e2e5d67..144be1df4 100644 --- a/com/hbm/items/weapon/ItemGunGauss.java +++ b/com/hbm/items/weapon/ItemGunGauss.java @@ -15,7 +15,7 @@ import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.GunButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import com.hbm.sound.AudioWrapper; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/com/hbm/items/weapon/ItemGunOSIPR.java b/com/hbm/items/weapon/ItemGunOSIPR.java index ecdfdbf08..46346302a 100644 --- a/com/hbm/items/weapon/ItemGunOSIPR.java +++ b/com/hbm/items/weapon/ItemGunOSIPR.java @@ -15,7 +15,7 @@ import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.GunButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 09797ffa7..f27b89bba 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -31,9 +31,9 @@ import com.hbm.particle.ParticleSmokePlume; import com.hbm.render.block.*; import com.hbm.render.entity.*; import com.hbm.render.item.*; -import com.hbm.render.misc.MissilePart; +import com.hbm.render.loader.HmfModelLoader; import com.hbm.render.tileentity.*; -import com.hbm.render.util.HmfModelLoader; +import com.hbm.render.util.MissilePart; import com.hbm.sound.AudioWrapper; import com.hbm.sound.AudioWrapperClient; import com.hbm.tileentity.bomb.*; diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 92b6075f4..1be43d39d 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -66,8 +66,8 @@ import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; import com.hbm.potion.HbmPotion; -import com.hbm.render.misc.MissilePart; -import com.hbm.render.util.HmfModelLoader; +import com.hbm.render.loader.HmfModelLoader; +import com.hbm.render.util.MissilePart; import com.hbm.tileentity.bomb.*; import com.hbm.tileentity.conductor.*; import com.hbm.tileentity.deco.*; diff --git a/com/hbm/main/ModEventHandlerClient.java b/com/hbm/main/ModEventHandlerClient.java index c0f3cbca9..f77b9eff1 100644 --- a/com/hbm/main/ModEventHandlerClient.java +++ b/com/hbm/main/ModEventHandlerClient.java @@ -15,10 +15,10 @@ import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import com.hbm.packet.GunButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.render.misc.RenderAccessoryUtility; -import com.hbm.render.misc.RenderScreenOverlay; -import com.hbm.render.misc.RenderScreenOverlay.Crosshair; import com.hbm.render.model.ModelCloak; +import com.hbm.render.util.RenderAccessoryUtility; +import com.hbm.render.util.RenderScreenOverlay; +import com.hbm.render.util.RenderScreenOverlay.Crosshair; import com.hbm.saveddata.RadEntitySavedData; import com.hbm.saveddata.RadiationSavedData; import com.hbm.sound.MovingSoundChopper; diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index cf3b1e288..a4bfa867a 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -1,7 +1,7 @@ package com.hbm.main; import com.hbm.lib.RefStrings; -import com.hbm.render.util.HFRWavefrontObject; +import com.hbm.render.loader.HFRWavefrontObject; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; diff --git a/com/hbm/packet/AuxGaugePacket.java b/com/hbm/packet/AuxGaugePacket.java index aaf2d6692..84ec16476 100644 --- a/com/hbm/packet/AuxGaugePacket.java +++ b/com/hbm/packet/AuxGaugePacket.java @@ -2,7 +2,9 @@ package com.hbm.packet; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; +import com.hbm.interfaces.Spaghetti; import com.hbm.items.weapon.ItemMissile.PartSize; +import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; import com.hbm.tileentity.bomb.TileEntityNukeCustom; @@ -36,6 +38,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; +@Spaghetti("Changing all machiines to use TileEntityMachineBase will reduce the total chaos in this class") public class AuxGaugePacket implements IMessage { int x; @@ -253,6 +256,15 @@ public class AuxGaugePacket implements IMessage { launcher.padSize = PartSize.values()[m.value]; } + + + + + if(te instanceof TileEntityMachineBase) { + + ((TileEntityMachineBase)te).processGauge(m.value, m.id); + } + } catch (Exception x) {} return null; } diff --git a/com/hbm/render/entity/RenderMissileCustom.java b/com/hbm/render/entity/RenderMissileCustom.java index 459887b5f..7c9a44ea8 100644 --- a/com/hbm/render/entity/RenderMissileCustom.java +++ b/com/hbm/render/entity/RenderMissileCustom.java @@ -8,9 +8,9 @@ import com.hbm.entity.missile.EntityMissileCluster; import com.hbm.entity.missile.EntityMissileGeneric; import com.hbm.entity.missile.EntityMissileIncendiary; import com.hbm.main.ResourceManager; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePart; -import com.hbm.render.misc.MissilePronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePart; +import com.hbm.render.util.MissilePronter; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; diff --git a/com/hbm/render/entity/RenderTom.java b/com/hbm/render/entity/RenderTom.java index 4315c5a21..e0ce99c9b 100644 --- a/com/hbm/render/entity/RenderTom.java +++ b/com/hbm/render/entity/RenderTom.java @@ -2,7 +2,7 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.render.misc.TomPronter; +import com.hbm.render.util.TomPronter; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/item/ItemRenderMissile.java b/com/hbm/render/item/ItemRenderMissile.java index 9b6607020..a526c4ef9 100644 --- a/com/hbm/render/item/ItemRenderMissile.java +++ b/com/hbm/render/item/ItemRenderMissile.java @@ -4,9 +4,9 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePart; -import com.hbm.render.misc.MissilePronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePart; +import com.hbm.render.util.MissilePronter; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; diff --git a/com/hbm/render/item/ItemRenderMissilePart.java b/com/hbm/render/item/ItemRenderMissilePart.java index 5ff55ce49..f83ad06a3 100644 --- a/com/hbm/render/item/ItemRenderMissilePart.java +++ b/com/hbm/render/item/ItemRenderMissilePart.java @@ -4,12 +4,12 @@ import org.lwjgl.opengl.GL11; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; -import com.hbm.render.misc.MissilePart; import com.hbm.render.model.ModelSteelBeam; import com.hbm.render.model.ModelSteelCorner; import com.hbm.render.model.ModelSteelRoof; import com.hbm.render.model.ModelSteelScaffold; import com.hbm.render.model.ModelSteelWall; +import com.hbm.render.util.MissilePart; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/item/ItemRenderTemplate.java b/com/hbm/render/item/ItemRenderTemplate.java index df06d1228..7123aed64 100644 --- a/com/hbm/render/item/ItemRenderTemplate.java +++ b/com/hbm/render/item/ItemRenderTemplate.java @@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; -import com.hbm.render.misc.RenderDecoItem; -import com.hbm.render.misc.RenderItemStack; +import com.hbm.render.util.RenderDecoItem; +import com.hbm.render.util.RenderItemStack; import codechicken.lib.render.RenderUtils; import net.minecraft.client.Minecraft; diff --git a/com/hbm/render/util/HFRWavefrontObject.java b/com/hbm/render/loader/HFRWavefrontObject.java similarity index 99% rename from com/hbm/render/util/HFRWavefrontObject.java rename to com/hbm/render/loader/HFRWavefrontObject.java index 5a7616712..60ecb7c68 100644 --- a/com/hbm/render/util/HFRWavefrontObject.java +++ b/com/hbm/render/loader/HFRWavefrontObject.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import java.io.BufferedReader; import java.io.IOException; diff --git a/com/hbm/render/util/HbmFace.java b/com/hbm/render/loader/HbmFace.java similarity index 98% rename from com/hbm/render/util/HbmFace.java rename to com/hbm/render/loader/HbmFace.java index ba3d4d0fd..90429cb58 100644 --- a/com/hbm/render/util/HbmFace.java +++ b/com/hbm/render/loader/HbmFace.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/render/util/HbmGroupObject.java b/com/hbm/render/loader/HbmGroupObject.java similarity index 97% rename from com/hbm/render/util/HbmGroupObject.java rename to com/hbm/render/loader/HbmGroupObject.java index de8286f0b..655394b31 100644 --- a/com/hbm/render/util/HbmGroupObject.java +++ b/com/hbm/render/loader/HbmGroupObject.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import java.util.ArrayList; diff --git a/com/hbm/render/util/HbmModelObject.java b/com/hbm/render/loader/HbmModelObject.java similarity index 99% rename from com/hbm/render/util/HbmModelObject.java rename to com/hbm/render/loader/HbmModelObject.java index 0507d6b40..942961e18 100644 --- a/com/hbm/render/util/HbmModelObject.java +++ b/com/hbm/render/loader/HbmModelObject.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import java.io.BufferedReader; import java.io.IOException; diff --git a/com/hbm/render/util/HmfController.java b/com/hbm/render/loader/HmfController.java similarity index 91% rename from com/hbm/render/util/HmfController.java rename to com/hbm/render/loader/HmfController.java index 75c5d3381..9f85d4a98 100644 --- a/com/hbm/render/util/HmfController.java +++ b/com/hbm/render/loader/HmfController.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; public class HmfController { diff --git a/com/hbm/render/util/HmfModelLoader.java b/com/hbm/render/loader/HmfModelLoader.java similarity index 95% rename from com/hbm/render/util/HmfModelLoader.java rename to com/hbm/render/loader/HmfModelLoader.java index 37b57fcd1..0b49b40fd 100644 --- a/com/hbm/render/util/HmfModelLoader.java +++ b/com/hbm/render/loader/HmfModelLoader.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelCustom; diff --git a/com/hbm/render/util/RUVertice.java b/com/hbm/render/loader/RUVertice.java similarity index 90% rename from com/hbm/render/util/RUVertice.java rename to com/hbm/render/loader/RUVertice.java index 7252eb450..13851343e 100644 --- a/com/hbm/render/util/RUVertice.java +++ b/com/hbm/render/loader/RUVertice.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; public class RUVertice { diff --git a/com/hbm/render/util/S_Face.java b/com/hbm/render/loader/S_Face.java similarity index 98% rename from com/hbm/render/util/S_Face.java rename to com/hbm/render/loader/S_Face.java index dba55051f..bd788b82b 100644 --- a/com/hbm/render/util/S_Face.java +++ b/com/hbm/render/loader/S_Face.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/render/util/S_GroupObject.java b/com/hbm/render/loader/S_GroupObject.java similarity index 96% rename from com/hbm/render/util/S_GroupObject.java rename to com/hbm/render/loader/S_GroupObject.java index d527bdca2..aed8b07fc 100644 --- a/com/hbm/render/util/S_GroupObject.java +++ b/com/hbm/render/loader/S_GroupObject.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import java.util.ArrayList; diff --git a/com/hbm/render/util/S_ModelCustom.java b/com/hbm/render/loader/S_ModelCustom.java similarity index 98% rename from com/hbm/render/util/S_ModelCustom.java rename to com/hbm/render/loader/S_ModelCustom.java index f46f91b7d..aec336a55 100644 --- a/com/hbm/render/util/S_ModelCustom.java +++ b/com/hbm/render/loader/S_ModelCustom.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/render/util/S_WavefrontObject.java b/com/hbm/render/loader/S_WavefrontObject.java similarity index 99% rename from com/hbm/render/util/S_WavefrontObject.java rename to com/hbm/render/loader/S_WavefrontObject.java index 56d2d281d..f6a5a8d5d 100644 --- a/com/hbm/render/util/S_WavefrontObject.java +++ b/com/hbm/render/loader/S_WavefrontObject.java @@ -1,4 +1,4 @@ -package com.hbm.render.util; +package com.hbm.render.loader; import java.io.BufferedReader; import java.io.IOException; diff --git a/com/hbm/render/tileentity/RenderChemplant.java b/com/hbm/render/tileentity/RenderChemplant.java index c37d19ca5..89e757e4f 100644 --- a/com/hbm/render/tileentity/RenderChemplant.java +++ b/com/hbm/render/tileentity/RenderChemplant.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.util.HmfController; +import com.hbm.render.loader.HmfController; import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderCompactLauncher.java b/com/hbm/render/tileentity/RenderCompactLauncher.java index 78b683b7d..a14f45499 100644 --- a/com/hbm/render/tileentity/RenderCompactLauncher.java +++ b/com/hbm/render/tileentity/RenderCompactLauncher.java @@ -5,10 +5,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; import com.hbm.main.ResourceManager; -import com.hbm.render.misc.ErrorPronter; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePart; -import com.hbm.render.misc.MissilePronter; +import com.hbm.render.util.ErrorPronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePart; +import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import net.minecraft.client.Minecraft; diff --git a/com/hbm/render/tileentity/RenderDecoBlockAlt.java b/com/hbm/render/tileentity/RenderDecoBlockAlt.java index 304efe373..ab272422e 100644 --- a/com/hbm/render/tileentity/RenderDecoBlockAlt.java +++ b/com/hbm/render/tileentity/RenderDecoBlockAlt.java @@ -4,9 +4,9 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.render.misc.RenderDecoItem; import com.hbm.render.model.ModelGun; import com.hbm.render.model.ModelStatue; +import com.hbm.render.util.RenderDecoItem; import com.hbm.tileentity.deco.TileEntityDecoBlockAltF; import com.hbm.tileentity.deco.TileEntityDecoBlockAltG; import com.hbm.tileentity.deco.TileEntityDecoBlockAltW; diff --git a/com/hbm/render/tileentity/RenderEPress.java b/com/hbm/render/tileentity/RenderEPress.java index bf60f3f9f..5faeba8ef 100644 --- a/com/hbm/render/tileentity/RenderEPress.java +++ b/com/hbm/render/tileentity/RenderEPress.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.render.misc.RenderDecoItem; +import com.hbm.render.util.RenderDecoItem; import com.hbm.tileentity.machine.TileEntityMachineEPress; import net.minecraft.client.renderer.entity.RenderItem; diff --git a/com/hbm/render/tileentity/RenderLaunchTable.java b/com/hbm/render/tileentity/RenderLaunchTable.java index aefa844f4..46db02f20 100644 --- a/com/hbm/render/tileentity/RenderLaunchTable.java +++ b/com/hbm/render/tileentity/RenderLaunchTable.java @@ -5,10 +5,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.weapon.ItemMissile; import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.main.ResourceManager; -import com.hbm.render.misc.ErrorPronter; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePronter; -import com.hbm.render.misc.SoyuzPronter; +import com.hbm.render.util.ErrorPronter; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePronter; +import com.hbm.render.util.SoyuzPronter; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; diff --git a/com/hbm/render/tileentity/RenderMissileAssembly.java b/com/hbm/render/tileentity/RenderMissileAssembly.java index 0b8eaf3ff..4f866a6f6 100644 --- a/com/hbm/render/tileentity/RenderMissileAssembly.java +++ b/com/hbm/render/tileentity/RenderMissileAssembly.java @@ -4,10 +4,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePart; -import com.hbm.render.misc.MissilePronter; import com.hbm.render.model.ModelTestRender; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePart; +import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; import net.minecraft.client.Minecraft; diff --git a/com/hbm/render/tileentity/RenderPress.java b/com/hbm/render/tileentity/RenderPress.java index a668b87a3..25bde4399 100644 --- a/com/hbm/render/tileentity/RenderPress.java +++ b/com/hbm/render/tileentity/RenderPress.java @@ -6,8 +6,8 @@ import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; -import com.hbm.render.misc.RenderDecoItem; import com.hbm.render.model.ModelRotationTester; +import com.hbm.render.util.RenderDecoItem; import com.hbm.tileentity.deco.TileEntityDecoBlockAltF; import com.hbm.tileentity.deco.TileEntityDecoBlockAltW; import com.hbm.tileentity.machine.TileEntityMachinePress; diff --git a/com/hbm/render/tileentity/RenderSoyuzLauncher.java b/com/hbm/render/tileentity/RenderSoyuzLauncher.java index ecb9cdc1d..b4f3072ed 100644 --- a/com/hbm/render/tileentity/RenderSoyuzLauncher.java +++ b/com/hbm/render/tileentity/RenderSoyuzLauncher.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.render.misc.SoyuzLauncherPronter; +import com.hbm.render.util.SoyuzLauncherPronter; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderTaint.java b/com/hbm/render/tileentity/RenderTaint.java index ff3a3628a..f842c55e5 100644 --- a/com/hbm/render/tileentity/RenderTaint.java +++ b/com/hbm/render/tileentity/RenderTaint.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.render.util.RUVertice; +import com.hbm.render.loader.RUVertice; import com.hbm.tileentity.deco.TileEntityTaint; import net.minecraft.client.Minecraft; diff --git a/com/hbm/render/tileentity/RendererObjTester.java b/com/hbm/render/tileentity/RendererObjTester.java index c9ad9281f..6c0275f50 100644 --- a/com/hbm/render/tileentity/RendererObjTester.java +++ b/com/hbm/render/tileentity/RendererObjTester.java @@ -6,14 +6,14 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.misc.BeamPronter; -import com.hbm.render.misc.BeamPronter.EnumBeamType; -import com.hbm.render.misc.BeamPronter.EnumWaveType; -import com.hbm.render.misc.SoyuzPronter; -import com.hbm.render.misc.TomPronter; import com.hbm.render.model.ModelCalBarrel; import com.hbm.render.model.ModelCalDualStock; import com.hbm.render.model.ModelCalStock; +import com.hbm.render.util.BeamPronter; +import com.hbm.render.util.SoyuzPronter; +import com.hbm.render.util.TomPronter; +import com.hbm.render.util.BeamPronter.EnumBeamType; +import com.hbm.render.util.BeamPronter.EnumWaveType; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/misc/BeamPronter.java b/com/hbm/render/util/BeamPronter.java similarity index 99% rename from com/hbm/render/misc/BeamPronter.java rename to com/hbm/render/util/BeamPronter.java index 7172efea1..73467536b 100644 --- a/com/hbm/render/misc/BeamPronter.java +++ b/com/hbm/render/util/BeamPronter.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import java.util.Random; diff --git a/com/hbm/render/misc/ErrorPronter.java b/com/hbm/render/util/ErrorPronter.java similarity index 94% rename from com/hbm/render/misc/ErrorPronter.java rename to com/hbm/render/util/ErrorPronter.java index 590aa876d..410fe0fd5 100644 --- a/com/hbm/render/misc/ErrorPronter.java +++ b/com/hbm/render/util/ErrorPronter.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import org.lwjgl.opengl.GL11; diff --git a/com/hbm/render/misc/MissileMultipart.java b/com/hbm/render/util/MissileMultipart.java similarity index 98% rename from com/hbm/render/misc/MissileMultipart.java rename to com/hbm/render/util/MissileMultipart.java index 63828d7d7..948e58cc3 100644 --- a/com/hbm/render/misc/MissileMultipart.java +++ b/com/hbm/render/util/MissileMultipart.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import com.hbm.handler.MissileStruct; import com.hbm.items.weapon.ItemMissile.PartType; diff --git a/com/hbm/render/misc/MissilePart.java b/com/hbm/render/util/MissilePart.java similarity index 99% rename from com/hbm/render/misc/MissilePart.java rename to com/hbm/render/util/MissilePart.java index ff2470fe1..20327467f 100644 --- a/com/hbm/render/misc/MissilePart.java +++ b/com/hbm/render/util/MissilePart.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/com/hbm/render/misc/MissilePronter.java b/com/hbm/render/util/MissilePronter.java similarity index 97% rename from com/hbm/render/misc/MissilePronter.java rename to com/hbm/render/util/MissilePronter.java index 73cabf9e0..1f6154233 100644 --- a/com/hbm/render/misc/MissilePronter.java +++ b/com/hbm/render/util/MissilePronter.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import org.lwjgl.opengl.GL11; diff --git a/com/hbm/render/misc/RenderAccessoryUtility.java b/com/hbm/render/util/RenderAccessoryUtility.java similarity index 98% rename from com/hbm/render/misc/RenderAccessoryUtility.java rename to com/hbm/render/util/RenderAccessoryUtility.java index dbb57a9a1..22e744c7f 100644 --- a/com/hbm/render/misc/RenderAccessoryUtility.java +++ b/com/hbm/render/util/RenderAccessoryUtility.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import com.hbm.items.ModItems; import com.hbm.lib.Library; diff --git a/com/hbm/render/misc/RenderDecoItem.java b/com/hbm/render/util/RenderDecoItem.java similarity index 90% rename from com/hbm/render/misc/RenderDecoItem.java rename to com/hbm/render/util/RenderDecoItem.java index 25f98b250..472e21b90 100644 --- a/com/hbm/render/misc/RenderDecoItem.java +++ b/com/hbm/render/util/RenderDecoItem.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/misc/RenderItemStack.java b/com/hbm/render/util/RenderItemStack.java similarity index 96% rename from com/hbm/render/misc/RenderItemStack.java rename to com/hbm/render/util/RenderItemStack.java index c5b6f3027..333e1d9d9 100644 --- a/com/hbm/render/misc/RenderItemStack.java +++ b/com/hbm/render/util/RenderItemStack.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import org.lwjgl.opengl.GL11; diff --git a/com/hbm/render/misc/RenderScreenOverlay.java b/com/hbm/render/util/RenderScreenOverlay.java similarity index 99% rename from com/hbm/render/misc/RenderScreenOverlay.java rename to com/hbm/render/util/RenderScreenOverlay.java index 586ead196..009ae74f6 100644 --- a/com/hbm/render/misc/RenderScreenOverlay.java +++ b/com/hbm/render/util/RenderScreenOverlay.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.CROSSHAIRS; diff --git a/com/hbm/render/misc/SoyuzLauncherPronter.java b/com/hbm/render/util/SoyuzLauncherPronter.java similarity index 98% rename from com/hbm/render/misc/SoyuzLauncherPronter.java rename to com/hbm/render/util/SoyuzLauncherPronter.java index 8ddd9396b..f4e0f7b45 100644 --- a/com/hbm/render/misc/SoyuzLauncherPronter.java +++ b/com/hbm/render/util/SoyuzLauncherPronter.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import org.lwjgl.opengl.GL11; diff --git a/com/hbm/render/misc/SoyuzPronter.java b/com/hbm/render/util/SoyuzPronter.java similarity index 98% rename from com/hbm/render/misc/SoyuzPronter.java rename to com/hbm/render/util/SoyuzPronter.java index 3073038d9..7f74d392e 100644 --- a/com/hbm/render/misc/SoyuzPronter.java +++ b/com/hbm/render/util/SoyuzPronter.java @@ -1,4 +1,4 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import org.lwjgl.opengl.GL11; diff --git a/com/hbm/render/misc/TomPronter.java b/com/hbm/render/util/TomPronter.java similarity index 95% rename from com/hbm/render/misc/TomPronter.java rename to com/hbm/render/util/TomPronter.java index a2e003d08..686d554e3 100644 --- a/com/hbm/render/misc/TomPronter.java +++ b/com/hbm/render/util/TomPronter.java @@ -1,11 +1,11 @@ -package com.hbm.render.misc; +package com.hbm.render.util; import java.util.Random; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.render.util.HmfController; +import com.hbm.render.loader.HmfController; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureManager; diff --git a/com/hbm/tileentity/TileEntityMachineBase.java b/com/hbm/tileentity/TileEntityMachineBase.java new file mode 100644 index 000000000..cb4b7bbae --- /dev/null +++ b/com/hbm/tileentity/TileEntityMachineBase.java @@ -0,0 +1,188 @@ +package com.hbm.tileentity; + +import com.hbm.interfaces.Spaghetti; +import com.hbm.packet.AuxGaugePacket; +import com.hbm.packet.PacketDispatcher; + +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.FluidTank; + +@Spaghetti("Not spaghetti in itself, but for the love of god please use this base class for all machines") +public abstract class TileEntityMachineBase extends TileEntity implements ISidedInventory { + + public ItemStack slots[]; + + private String customName; + + public TileEntityMachineBase(int scount) { + slots = new ItemStack[scount]; + } + + @Override + public int getSizeInventory() { + return slots.length; + } + + @Override + public ItemStack getStackInSlot(int i) { + return slots[i]; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + if(slots[i] != null) + { + ItemStack itemStack = slots[i]; + slots[i] = null; + return itemStack; + } else { + return null; + } + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemStack) { + slots[i] = itemStack; + if(itemStack != null && itemStack.stackSize > getInventoryStackLimit()) + { + itemStack.stackSize = getInventoryStackLimit(); + } + } + + @Override + public String getInventoryName() { + return this.hasCustomInventoryName() ? this.customName : getName(); + } + + public abstract String getName(); + + @Override + public boolean hasCustomInventoryName() { + return this.customName != null && this.customName.length() > 0; + } + + public void setCustomName(String name) { + this.customName = name; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) + { + return false; + }else{ + return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <=128; + } + } + + @Override + public void openInventory() {} + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemStack) { + return false; + } + + @Override + public ItemStack decrStackSize(int i, int j) { + if(slots[i] != null) + { + if(slots[i].stackSize <= j) + { + ItemStack itemStack = slots[i]; + slots[i] = null; + return itemStack; + } + ItemStack itemStack1 = slots[i].splitStack(j); + if (slots[i].stackSize == 0) + { + slots[i] = null; + } + + return itemStack1; + } else { + return null; + } + } + + @Override + public boolean canInsertItem(int i, ItemStack itemStack, int j) { + return this.isItemValidForSlot(i, itemStack); + } + + @Override + public boolean canExtractItem(int i, ItemStack itemStack, int j) { + return false; + } + + @Override + public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + return new int[] { 0 }; + } + + public int getGaugeScaled(int i, FluidTank tank) { + return tank.getFluidAmount() * i / tank.getCapacity(); + } + + //abstracting this method forces child classes to implement it + //so i don't have to remember the fucking method name + //was it update? onUpdate? updateTile? did it have any args? + //shit i don't know man + @Override + public abstract void updateEntity(); + + public void updateGauge(int val, int id, int range) { + + if(!worldObj.isRemote) + PacketDispatcher.wrapper.sendToAllAround(new AuxGaugePacket(xCoord, yCoord, zCoord, val, id), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, range)); + } + + public void processGauge(int val, int id) { } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + NBTTagList list = nbt.getTagList("items", 10); + + for(int i = 0; i < list.tagCount(); i++) + { + NBTTagCompound nbt1 = list.getCompoundTagAt(i); + byte b0 = nbt1.getByte("slot"); + if(b0 >= 0 && b0 < slots.length) + { + slots[b0] = ItemStack.loadItemStackFromNBT(nbt1); + } + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + NBTTagList list = new NBTTagList(); + + for(int i = 0; i < slots.length; i++) + { + if(slots[i] != null) + { + NBTTagCompound nbt1 = new NBTTagCompound(); + nbt1.setByte("slot", (byte)i); + slots[i].writeToNBT(nbt1); + list.appendTag(nbt1); + } + } + nbt.setTag("items", list); + } +} diff --git a/com/hbm/tileentity/machine/TileEntityCore.java b/com/hbm/tileentity/machine/TileEntityCore.java new file mode 100644 index 000000000..53782afcb --- /dev/null +++ b/com/hbm/tileentity/machine/TileEntityCore.java @@ -0,0 +1,23 @@ +package com.hbm.tileentity.machine; + +import com.hbm.tileentity.TileEntityMachineBase; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityCore extends TileEntityMachineBase { + + public TileEntityCore() { + super(3); + } + + @Override + public String getName() { + return "container.dfc_core"; + } + + @Override + public void updateEntity() { + + } + +} diff --git a/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java b/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java index b5c487715..4b6508234 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java +++ b/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java @@ -16,8 +16,8 @@ import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.PartType; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissileMultipartPacket; -import com.hbm.render.misc.MissileMultipart; -import com.hbm.render.misc.MissilePart; +import com.hbm.render.util.MissileMultipart; +import com.hbm.render.util.MissilePart; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/world/DesertAtom002.java b/com/hbm/world/DesertAtom002.java index 408e894cd..80b50fe68 100644 --- a/com/hbm/world/DesertAtom002.java +++ b/com/hbm/world/DesertAtom002.java @@ -956,57 +956,57 @@ public class DesertAtom002 world.setBlock(x + 15, y + -1, z + 33, Block3, 0, 3); world.setBlock(x + 16, y + -1, z + 33, Block3, 0, 3); world.setBlock(x + 0, y + 0, z + 0, Block5, 0, 3); - world.setBlock(x + 1, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 11, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 12, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 17, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 24, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 25, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 26, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 27, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 28, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 29, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 30, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 31, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 32, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 33, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 34, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 35, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 36, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 37, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 38, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 39, y + 0, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 11, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 12, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 17, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 24, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 25, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 26, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 27, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 28, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 29, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 30, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 31, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 32, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 33, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 34, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 35, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 36, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 37, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 38, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 39, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 40, y + 0, z + 0, Block5, 0, 3); - world.setBlock(x + 0, y + 0, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 0, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 0, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 0, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 0, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 0, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 0, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 0, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 0, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 0, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 0, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 0, z + 6, Block5, 0, 3); world.setBlock(x + 7, y + 0, z + 6, Block5, 0, 3); world.setBlock(x + 8, y + 0, z + 6, Block5, 0, 3); @@ -1035,7 +1035,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 0, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 0, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 0, z + 6, Block5, 0, 3); - world.setBlock(x + 0, y + 0, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 0, z + 7, Block5, 0, 3); world.setBlock(x + 7, y + 0, z + 7, Block5, 0, 3); world.setBlock(x + 8, y + 0, z + 7, Block5, 0, 3); @@ -1054,7 +1054,7 @@ public class DesertAtom002 world.setBlock(x + 33, y + 0, z + 7, Blocks.web, 0, 3); world.setBlock(x + 37, y + 0, z + 7, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 0, z + 7, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 0, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 0, z + 8, Block5, 0, 3); world.setBlock(x + 7, y + 0, z + 8, Block5, 0, 3); world.setBlock(x + 8, y + 0, z + 8, Block5, 0, 3); @@ -1065,7 +1065,7 @@ public class DesertAtom002 //world.setBlock(x + 37, y + 0, z + 8, Blocks.iron_door, 2, 3); ItemDoor.placeDoorBlock(world, x + 37, y + 0, z + 8, 2, Blocks.iron_door); world.setBlock(x + 40, y + 0, z + 8, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 0, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 0, z + 9, Block5, 0, 3); world.setBlock(x + 6, y + 0, z + 9, Block2, 0, 3); world.setBlock(x + 7, y + 0, z + 9, Block2, 0, 3); @@ -1078,7 +1078,7 @@ public class DesertAtom002 //world.setBlock(x + 37, y + 0, z + 9, Blocks.iron_door, 2, 3); ItemDoor.placeDoorBlock(world, x + 37, y + 0, z + 9, 2, Blocks.iron_door); world.setBlock(x + 40, y + 0, z + 9, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 0, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 10, Block5, 0, 3); world.setBlock(x + 5, y + 0, z + 10, Blocks.water, 0, 3); world.setBlock(x + 6, y + 0, z + 10, Blocks.water, 0, 3); @@ -1099,7 +1099,7 @@ public class DesertAtom002 world.setBlock(x + 35, y + 0, z + 10, Blocks.vine, 1, 3); world.setBlock(x + 37, y + 0, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 0, z + 10, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 0, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 11, Block5, 0, 3); world.setBlock(x + 5, y + 0, z + 11, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 11, Blocks.water, 0, 3); @@ -1133,7 +1133,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 0, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 0, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 0, z + 11, Block5, 0, 3); - world.setBlock(x + 0, y + 0, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 12, Block5, 0, 3); world.setBlock(x + 5, y + 0, z + 12, Blocks.water, 0, 3); world.setBlock(x + 6, y + 0, z + 12, Blocks.water, 0, 3); @@ -1165,8 +1165,8 @@ public class DesertAtom002 WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(1), (TileEntityChest)world.getTileEntity(x + 36, y + 0, z + 12), 8); } world.setBlock(x + 37, y + 0, z + 12, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 0, z + 12, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 12, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 13, Block5, 0, 3); world.setBlock(x + 5, y + 0, z + 13, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 13, Blocks.water, 0, 3); @@ -1190,8 +1190,8 @@ public class DesertAtom002 world.setBlock(x + 30, y + 0, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 31, y + 0, z + 13, Blocks.web, 0, 3); world.setBlock(x + 37, y + 0, z + 13, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 0, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 14, Block5, 0, 3); world.setBlock(x + 5, y + 0, z + 14, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 14, Blocks.water, 0, 3); @@ -1215,8 +1215,8 @@ public class DesertAtom002 world.setBlock(x + 35, y + 0, z + 14, Blocks.stone_brick_stairs, 4, 3); world.setBlock(x + 36, y + 0, z + 14, Blocks.stonebrick, 0, 3); world.setBlock(x + 37, y + 0, z + 14, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 0, z + 14, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 14, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 0, z + 15, Block5, 0, 3); world.setBlock(x + 6, y + 0, z + 15, Block2, 0, 3); world.setBlock(x + 7, y + 0, z + 15, Block2, 0, 3); @@ -1241,8 +1241,8 @@ public class DesertAtom002 world.setBlock(x + 35, y + 0, z + 15, Blocks.stone_brick_stairs, 4, 3); world.setBlock(x + 36, y + 0, z + 15, Blocks.stonebrick, 0, 3); world.setBlock(x + 37, y + 0, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 0, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 16, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 16, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 0, z + 16, Block5, 0, 3); world.setBlock(x + 7, y + 0, z + 16, Block5, 0, 3); world.setBlock(x + 8, y + 0, z + 16, Block5, 0, 3); @@ -1262,15 +1262,15 @@ public class DesertAtom002 world.setBlock(x + 35, y + 0, z + 16, Blocks.stone_brick_stairs, 4, 3); world.setBlock(x + 36, y + 0, z + 16, Blocks.stonebrick, 0, 3); world.setBlock(x + 37, y + 0, z + 16, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 0, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 0, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 0, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 0, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 0, z + 17, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 20, y + 0, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 0, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 0, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 20, y + 0, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 0, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 0, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 0, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 0, z + 17, Block5, 0, 3); world.setBlock(x + 27, y + 0, z + 17, Blocks.oak_stairs, 5, 3); @@ -1281,8 +1281,8 @@ public class DesertAtom002 world.setBlock(x + 35, y + 0, z + 17, Blocks.stone_brick_stairs, 4, 3); world.setBlock(x + 36, y + 0, z + 17, Blocks.stonebrick, 0, 3); world.setBlock(x + 37, y + 0, z + 17, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 0, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 18, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 18, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 0, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 0, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 0, z + 18, Library.getRandomConcrete(), 0, 3); @@ -1305,24 +1305,24 @@ public class DesertAtom002 world.setBlock(x + 35, y + 0, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 36, y + 0, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 0, z + 18, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 0, z + 18, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 0, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 20, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 18, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 0, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 20, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 0, z + 20, Block8, 2, 3); world.setBlock(x + 7, y + 0, z + 20, Block8, 2, 3); world.setBlock(x + 8, y + 0, z + 20, Block8, 2, 3); world.setBlock(x + 9, y + 0, z + 20, Block8, 2, 3); world.setBlock(x + 10, y + 0, z + 20, Block8, 2, 3); - world.setBlock(x + 40, y + 0, z + 20, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 21, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 20, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 21, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 21, Block5, 0, 3); world.setBlock(x + 5, y + 0, z + 21, Block8, 2, 3); world.setBlock(x + 11, y + 0, z + 21, Block8, 2, 3); world.setBlock(x + 12, y + 0, z + 21, Block5, 0, 3); world.setBlock(x + 29, y + 0, z + 21, Block2, 0, 3); - world.setBlock(x + 40, y + 0, z + 21, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 22, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 21, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 22, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 22, Block8, 4, 3); world.setBlock(x + 12, y + 0, z + 22, Block8, 5, 3); world.setBlock(x + 17, y + 0, z + 22, Block2, 0, 3); @@ -1334,8 +1334,8 @@ public class DesertAtom002 world.setBlock(x + 29, y + 0, z + 22, Block2, 0, 3); world.setBlock(x + 30, y + 0, z + 22, Block2, 0, 3); world.setBlock(x + 35, y + 0, z + 22, Block2, 0, 3); - world.setBlock(x + 40, y + 0, z + 22, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 22, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 0, z + 23, Block8, 4, 3); world.setBlock(x + 13, y + 0, z + 23, Block8, 5, 3); world.setBlock(x + 17, y + 0, z + 23, Block2, 0, 3); @@ -1348,8 +1348,8 @@ public class DesertAtom002 world.setBlock(x + 34, y + 0, z + 23, Block2, 0, 3); world.setBlock(x + 35, y + 0, z + 23, Block2, 0, 3); world.setBlock(x + 36, y + 0, z + 23, Block2, 0, 3); - world.setBlock(x + 40, y + 0, z + 23, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 23, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 0, z + 24, Block8, 4, 3); world.setBlock(x + 13, y + 0, z + 24, Block8, 5, 3); world.setBlock(x + 21, y + 0, z + 24, Block2, 0, 3); @@ -1359,14 +1359,14 @@ public class DesertAtom002 world.setBlock(x + 33, y + 0, z + 24, Block2, 0, 3); world.setBlock(x + 34, y + 0, z + 24, Block2, 0, 3); world.setBlock(x + 35, y + 0, z + 24, Block2, 0, 3); - world.setBlock(x + 40, y + 0, z + 24, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 25, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 24, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 25, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 0, z + 25, Block8, 4, 3); world.setBlock(x + 13, y + 0, z + 25, Block8, 5, 3); world.setBlock(x + 17, y + 0, z + 25, Block2, 0, 3); world.setBlock(x + 29, y + 0, z + 25, Blocks.flower_pot, 0, 3); - world.setBlock(x + 40, y + 0, z + 25, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 26, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 25, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 26, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 0, z + 26, Block8, 4, 3); world.setBlock(x + 13, y + 0, z + 26, Block8, 5, 3); world.setBlock(x + 19, y + 0, z + 26, Block2, 0, 3); @@ -1380,8 +1380,8 @@ public class DesertAtom002 world.setBlock(x + 25, y + 0, z + 26, Block2, 0, 3); world.setBlock(x + 30, y + 0, z + 26, Block2, 0, 3); world.setBlock(x + 35, y + 0, z + 26, Block2, 0, 3); - world.setBlock(x + 40, y + 0, z + 26, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 27, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 26, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 27, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 0, z + 27, Block8, 4, 3); world.setBlock(x + 13, y + 0, z + 27, Block8, 5, 3); world.setBlock(x + 18, y + 0, z + 27, Block2, 0, 3); @@ -1397,8 +1397,8 @@ public class DesertAtom002 world.setBlock(x + 31, y + 0, z + 27, Block2, 0, 3); world.setBlock(x + 35, y + 0, z + 27, Block2, 0, 3); world.setBlock(x + 36, y + 0, z + 27, Block2, 0, 3); - world.setBlock(x + 40, y + 0, z + 27, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 28, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 27, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 28, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 28, Block8, 4, 3); world.setBlock(x + 12, y + 0, z + 28, Block8, 5, 3); world.setBlock(x + 24, y + 0, z + 28, Block2, 0, 3); @@ -1406,117 +1406,117 @@ public class DesertAtom002 world.setBlock(x + 26, y + 0, z + 28, Block2, 0, 3); world.setBlock(x + 29, y + 0, z + 28, Block2, 0, 3); world.setBlock(x + 30, y + 0, z + 28, Block2, 0, 3); - world.setBlock(x + 40, y + 0, z + 28, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 29, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 28, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 29, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 29, Block5, 0, 3); world.setBlock(x + 5, y + 0, z + 29, Block8, 3, 3); world.setBlock(x + 11, y + 0, z + 29, Block8, 3, 3); world.setBlock(x + 12, y + 0, z + 29, Block5, 0, 3); - world.setBlock(x + 40, y + 0, z + 29, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 30, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 29, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 30, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 0, z + 30, Block8, 3, 3); world.setBlock(x + 7, y + 0, z + 30, Block8, 3, 3); world.setBlock(x + 8, y + 0, z + 30, Block8, 3, 3); world.setBlock(x + 9, y + 0, z + 30, Block8, 3, 3); world.setBlock(x + 10, y + 0, z + 30, Block8, 3, 3); - world.setBlock(x + 40, y + 0, z + 30, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 31, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 0, z + 30, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 0, z + 31, Block5, 0, 3); - world.setBlock(x + 17, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 24, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 25, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 26, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 27, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 28, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 29, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 30, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 31, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 32, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 33, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 34, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 35, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 36, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 37, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 38, y + 0, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 39, y + 0, z + 31, Blocks.iron_bars, 0, 3); + world.setBlock(x + 17, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 24, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 25, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 26, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 27, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 28, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 29, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 30, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 31, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 32, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 33, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 34, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 35, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 36, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 37, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 38, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 39, y + 0, z + 31, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 40, y + 0, z + 31, Block5, 0, 3); - world.setBlock(x + 0, y + 0, z + 32, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 0, z + 32, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 32, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 0, z + 32, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 0, z + 33, Block5, 0, 3); - world.setBlock(x + 1, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 11, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 12, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 0, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 0, z + 33, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 11, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 12, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 0, z + 33, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 0, z + 33, Block5, 0, 3); world.setBlock(x + 0, y + 1, z + 0, Block5, 0, 3); - world.setBlock(x + 1, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 11, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 12, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 17, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 24, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 25, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 26, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 27, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 28, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 29, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 30, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 31, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 32, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 33, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 34, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 35, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 36, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 37, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 38, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 39, y + 1, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 11, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 12, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 17, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 24, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 25, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 26, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 27, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 28, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 29, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 30, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 31, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 32, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 33, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 34, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 35, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 36, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 37, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 38, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 39, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 40, y + 1, z + 0, Block5, 0, 3); - world.setBlock(x + 0, y + 1, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 1, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 1, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 1, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 1, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 1, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 1, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 1, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 1, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 1, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 1, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 1, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 1, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 1, z + 6, Block11, 0, 3); @@ -1538,7 +1538,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 1, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 1, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 1, z + 6, Block5, 0, 3); - world.setBlock(x + 0, y + 1, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 1, z + 7, Block8, 2, 3); world.setBlock(x + 9, y + 1, z + 7, Block8, 2, 3); world.setBlock(x + 16, y + 1, z + 7, Library.getRandomConcrete(), 0, 3); @@ -1552,7 +1552,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 1, z + 7, Blocks.web, 0, 3); world.setBlock(x + 37, y + 1, z + 7, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 1, z + 7, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 1, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 1, z + 8, Block5, 0, 3); world.setBlock(x + 7, y + 1, z + 8, Block5, 0, 3); world.setBlock(x + 8, y + 1, z + 8, Block5, 0, 3); @@ -1562,7 +1562,7 @@ public class DesertAtom002 //world.setBlock(x + 37, y + 1, z + 8, Blocks.iron_door, 9, 3); //ItemDoor.placeDoorBlock(world, x + 37, y + 1, z + 8, 9, Blocks.iron_door); world.setBlock(x + 40, y + 1, z + 8, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 1, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 1, z + 9, Block5, 0, 3); world.setBlock(x + 6, y + 1, z + 9, Blocks.water, 0, 3); @@ -1582,7 +1582,7 @@ public class DesertAtom002 //world.setBlock(x + 37, y + 1, z + 9, Blocks.iron_door, 8, 3); //ItemDoor.placeDoorBlock(world, x + 37, y + 1, z + 9, 8, Blocks.iron_door); world.setBlock(x + 40, y + 1, z + 9, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 1, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 10, Block5, 0, 3); world.setBlock(x + 5, y + 1, z + 10, Blocks.water, 0, 3); world.setBlock(x + 6, y + 1, z + 10, Blocks.water, 0, 3); @@ -1601,7 +1601,7 @@ public class DesertAtom002 world.setBlock(x + 35, y + 1, z + 10, Blocks.vine, 1, 3); world.setBlock(x + 37, y + 1, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 1, z + 10, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 1, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 11, Block5, 0, 3); world.setBlock(x + 5, y + 1, z + 11, Blocks.water, 0, 3); world.setBlock(x + 6, y + 1, z + 11, Blocks.water, 0, 3); @@ -1635,7 +1635,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 1, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 1, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 1, z + 11, Block5, 0, 3); - world.setBlock(x + 0, y + 1, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 12, Block5, 0, 3); world.setBlock(x + 5, y + 1, z + 12, Blocks.water, 0, 3); world.setBlock(x + 6, y + 1, z + 12, Blocks.water, 0, 3); @@ -1660,8 +1660,8 @@ public class DesertAtom002 world.setBlock(x + 33, y + 1, z + 12, Blocks.vine, 4, 3); world.setBlock(x + 36, y + 1, z + 12, Blocks.vine, 4, 3); world.setBlock(x + 37, y + 1, z + 12, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 1, z + 12, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 12, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 13, Block5, 0, 3); world.setBlock(x + 5, y + 1, z + 13, Blocks.water, 0, 3); world.setBlock(x + 6, y + 1, z + 13, Blocks.water, 0, 3); @@ -1682,8 +1682,8 @@ public class DesertAtom002 world.setBlock(x + 30, y + 1, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 36, y + 1, z + 13, Blocks.web, 0, 3); world.setBlock(x + 37, y + 1, z + 13, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 1, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 14, Block5, 0, 3); world.setBlock(x + 5, y + 1, z + 14, Blocks.water, 0, 3); world.setBlock(x + 6, y + 1, z + 14, Blocks.water, 0, 3); @@ -1706,8 +1706,8 @@ public class DesertAtom002 world.setBlock(x + 31, y + 1, z + 14, Blocks.vine, 2, 3); world.setBlock(x + 36, y + 1, z + 14, Block9, 4, 3); world.setBlock(x + 37, y + 1, z + 14, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 1, z + 14, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 14, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 1, z + 15, Block5, 0, 3); world.setBlock(x + 6, y + 1, z + 15, Blocks.water, 0, 3); world.setBlock(x + 7, y + 1, z + 15, Blocks.water, 0, 3); @@ -1731,8 +1731,8 @@ public class DesertAtom002 world.setBlock(x + 35, y + 1, z + 15, Blocks.flower_pot, 0, 3); world.setBlock(x + 36, y + 1, z + 15, Block9, 4, 3); world.setBlock(x + 37, y + 1, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 1, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 16, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 16, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 1, z + 16, Block5, 0, 3); world.setBlock(x + 7, y + 1, z + 16, Block5, 0, 3); world.setBlock(x + 8, y + 1, z + 16, Block5, 0, 3); @@ -1766,15 +1766,15 @@ public class DesertAtom002 world.setBlock(x + 30, y + 1, z + 16, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 36, y + 1, z + 16, Block9, 4, 3); world.setBlock(x + 37, y + 1, z + 16, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 1, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 1, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 1, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 1, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 1, z + 17, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 20, y + 1, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 1, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 1, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 20, y + 1, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 1, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 1, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 1, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 1, z + 17, Block5, 0, 3); world.setBlock(x + 28, y + 1, z + 17, Blocks.flower_pot, 0, 3); @@ -1783,8 +1783,8 @@ public class DesertAtom002 world.setBlock(x + 35, y + 1, z + 17, Blocks.vine, 3, 3); world.setBlock(x + 36, y + 1, z + 17, Block9, 4, 3); world.setBlock(x + 37, y + 1, z + 17, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 1, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 18, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 18, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 1, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 1, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 1, z + 18, Library.getRandomConcrete(), 0, 3); @@ -1805,48 +1805,48 @@ public class DesertAtom002 world.setBlock(x + 35, y + 1, z + 18, Block11, 0, 3); world.setBlock(x + 36, y + 1, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 1, z + 18, Blocks.gravel, 0, 3); - world.setBlock(x + 40, y + 1, z + 18, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 1, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 20, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 18, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 1, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 20, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 1, z + 20, Block5, 0, 3); world.setBlock(x + 7, y + 1, z + 20, Block5, 0, 3); world.setBlock(x + 8, y + 1, z + 20, Block5, 0, 3); world.setBlock(x + 9, y + 1, z + 20, Block5, 0, 3); world.setBlock(x + 10, y + 1, z + 20, Block5, 0, 3); - world.setBlock(x + 40, y + 1, z + 20, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 21, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 20, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 21, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 21, Block5, 0, 3); world.setBlock(x + 5, y + 1, z + 21, Block5, 0, 3); world.setBlock(x + 11, y + 1, z + 21, Block5, 0, 3); world.setBlock(x + 12, y + 1, z + 21, Block5, 0, 3); - world.setBlock(x + 40, y + 1, z + 21, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 22, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 21, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 22, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 22, Block5, 0, 3); world.setBlock(x + 12, y + 1, z + 22, Block5, 0, 3); world.setBlock(x + 29, y + 1, z + 22, Block2, 0, 3); - world.setBlock(x + 40, y + 1, z + 22, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 22, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 1, z + 23, Block5, 0, 3); world.setBlock(x + 13, y + 1, z + 23, Block5, 0, 3); world.setBlock(x + 17, y + 1, z + 23, Block2, 0, 3); world.setBlock(x + 25, y + 1, z + 23, Block2, 0, 3); world.setBlock(x + 35, y + 1, z + 23, Block2, 0, 3); - world.setBlock(x + 40, y + 1, z + 23, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 23, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 1, z + 24, Block5, 0, 3); world.setBlock(x + 13, y + 1, z + 24, Block5, 0, 3); world.setBlock(x + 23, y + 1, z + 24, Block2, 0, 3); - world.setBlock(x + 40, y + 1, z + 24, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 25, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 24, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 25, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 1, z + 25, Block5, 0, 3); world.setBlock(x + 13, y + 1, z + 25, Block5, 0, 3); - world.setBlock(x + 40, y + 1, z + 25, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 26, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 25, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 26, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 1, z + 26, Block5, 0, 3); world.setBlock(x + 13, y + 1, z + 26, Block5, 0, 3); - world.setBlock(x + 40, y + 1, z + 26, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 27, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 26, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 27, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 1, z + 27, Block5, 0, 3); world.setBlock(x + 13, y + 1, z + 27, Block5, 0, 3); world.setBlock(x + 19, y + 1, z + 27, Block2, 0, 3); @@ -1856,122 +1856,122 @@ public class DesertAtom002 world.setBlock(x + 25, y + 1, z + 27, Block2, 0, 3); world.setBlock(x + 30, y + 1, z + 27, Block2, 0, 3); world.setBlock(x + 35, y + 1, z + 27, Block2, 0, 3); - world.setBlock(x + 40, y + 1, z + 27, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 28, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 27, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 28, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 28, Block5, 0, 3); world.setBlock(x + 12, y + 1, z + 28, Block5, 0, 3); world.setBlock(x + 25, y + 1, z + 28, Block2, 0, 3); - world.setBlock(x + 40, y + 1, z + 28, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 29, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 28, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 29, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 29, Block5, 0, 3); world.setBlock(x + 5, y + 1, z + 29, Block5, 0, 3); world.setBlock(x + 11, y + 1, z + 29, Block5, 0, 3); world.setBlock(x + 12, y + 1, z + 29, Block5, 0, 3); - world.setBlock(x + 40, y + 1, z + 29, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 30, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 29, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 30, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 1, z + 30, Block5, 0, 3); world.setBlock(x + 7, y + 1, z + 30, Block5, 0, 3); world.setBlock(x + 8, y + 1, z + 30, Block5, 0, 3); world.setBlock(x + 9, y + 1, z + 30, Block5, 0, 3); world.setBlock(x + 10, y + 1, z + 30, Block5, 0, 3); - world.setBlock(x + 40, y + 1, z + 30, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 31, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 1, z + 30, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 1, z + 31, Block5, 0, 3); - world.setBlock(x + 17, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 24, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 25, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 26, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 27, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 28, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 29, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 30, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 31, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 32, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 33, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 34, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 35, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 36, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 37, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 38, y + 1, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 39, y + 1, z + 31, Blocks.iron_bars, 0, 3); + world.setBlock(x + 17, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 24, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 25, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 26, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 27, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 28, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 29, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 30, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 31, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 32, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 33, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 34, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 35, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 36, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 37, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 38, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 39, y + 1, z + 31, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 40, y + 1, z + 31, Block5, 0, 3); - world.setBlock(x + 0, y + 1, z + 32, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 1, z + 32, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 32, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 1, z + 32, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 1, z + 33, Block5, 0, 3); - world.setBlock(x + 1, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 11, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 12, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 1, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 1, z + 33, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 11, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 12, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 1, z + 33, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 1, z + 33, Block5, 0, 3); world.setBlock(x + 0, y + 2, z + 0, Block5, 0, 3); - world.setBlock(x + 1, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 11, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 12, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 17, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 24, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 25, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 26, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 27, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 28, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 29, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 30, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 31, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 32, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 33, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 34, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 35, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 36, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 37, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 38, y + 2, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 39, y + 2, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 11, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 12, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 17, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 24, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 25, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 26, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 27, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 28, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 29, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 30, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 31, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 32, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 33, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 34, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 35, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 36, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 37, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 38, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 39, y + 2, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 40, y + 2, z + 0, Block5, 0, 3); - world.setBlock(x + 0, y + 2, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 2, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 2, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 2, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 2, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 2, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 2, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 2, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 2, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 2, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 2, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 2, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 2, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 2, z + 6, Library.getRandomConcrete(), 0, 3); @@ -1995,7 +1995,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 2, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 2, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 2, z + 6, Block5, 0, 3); - world.setBlock(x + 0, y + 2, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 2, z + 7, Block8, 2, 3); world.setBlock(x + 9, y + 2, z + 7, Block8, 2, 3); world.setBlock(x + 16, y + 2, z + 7, Library.getRandomConcrete(), 0, 3); @@ -2012,7 +2012,7 @@ public class DesertAtom002 world.setBlock(x + 35, y + 2, z + 7, Blocks.web, 0, 3); world.setBlock(x + 37, y + 2, z + 7, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 2, z + 7, Block5, 0, 3); - world.setBlock(x + 0, y + 2, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 2, z + 8, Block5, 0, 3); world.setBlock(x + 7, y + 2, z + 8, Block5, 0, 3); world.setBlock(x + 8, y + 2, z + 8, Block5, 0, 3); @@ -2024,7 +2024,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 2, z + 8, Blocks.web, 0, 3); world.setBlock(x + 37, y + 2, z + 8, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 2, z + 8, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 2, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 2, z + 9, Block5, 0, 3); world.setBlock(x + 6, y + 2, z + 9, Blocks.water, 0, 3); world.setBlock(x + 7, y + 2, z + 9, Blocks.water, 0, 3); @@ -2038,7 +2038,7 @@ public class DesertAtom002 world.setBlock(x + 33, y + 2, z + 9, Blocks.web, 0, 3); world.setBlock(x + 37, y + 2, z + 9, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 2, z + 9, Blocks.fence, 0, 3); - world.setBlock(x + 0, y + 2, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 10, Block5, 0, 3); world.setBlock(x + 5, y + 2, z + 10, Blocks.water, 0, 3); world.setBlock(x + 6, y + 2, z + 10, Blocks.water, 0, 3); @@ -2060,7 +2060,7 @@ public class DesertAtom002 world.setBlock(x + 35, y + 2, z + 10, Blocks.vine, 1, 3); world.setBlock(x + 37, y + 2, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 2, z + 10, Block5, 0, 3); - world.setBlock(x + 0, y + 2, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 11, Block5, 0, 3); world.setBlock(x + 5, y + 2, z + 11, Blocks.water, 0, 3); world.setBlock(x + 6, y + 2, z + 11, Blocks.water, 0, 3); @@ -2091,7 +2091,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 2, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 2, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 40, y + 2, z + 11, Block5, 0, 3); - world.setBlock(x + 0, y + 2, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 12, Block5, 0, 3); world.setBlock(x + 5, y + 2, z + 12, Blocks.water, 0, 3); world.setBlock(x + 6, y + 2, z + 12, Blocks.water, 0, 3); @@ -2118,8 +2118,8 @@ public class DesertAtom002 world.setBlock(x + 35, y + 2, z + 12, Blocks.web, 0, 3); world.setBlock(x + 36, y + 2, z + 12, Blocks.vine, 4, 3); world.setBlock(x + 37, y + 2, z + 12, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 2, z + 12, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 12, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 13, Block5, 0, 3); world.setBlock(x + 5, y + 2, z + 13, Blocks.water, 0, 3); world.setBlock(x + 6, y + 2, z + 13, Blocks.water, 0, 3); @@ -2141,8 +2141,8 @@ public class DesertAtom002 world.setBlock(x + 31, y + 2, z + 13, Blocks.web, 0, 3); world.setBlock(x + 36, y + 2, z + 13, Blocks.web, 0, 3); world.setBlock(x + 37, y + 2, z + 13, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 2, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 14, Block5, 0, 3); world.setBlock(x + 5, y + 2, z + 14, Blocks.water, 0, 3); world.setBlock(x + 6, y + 2, z + 14, Blocks.water, 0, 3); @@ -2163,8 +2163,8 @@ public class DesertAtom002 world.setBlock(x + 30, y + 2, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 36, y + 2, z + 14, Blocks.stone_brick_stairs, 0, 3); world.setBlock(x + 37, y + 2, z + 14, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 2, z + 14, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 14, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 2, z + 15, Block5, 0, 3); world.setBlock(x + 6, y + 2, z + 15, Blocks.water, 0, 3); world.setBlock(x + 7, y + 2, z + 15, Blocks.water, 0, 3); @@ -2187,8 +2187,8 @@ public class DesertAtom002 world.setBlock(x + 31, y + 2, z + 15, Blocks.vine, 2, 3); world.setBlock(x + 36, y + 2, z + 15, Blocks.stone_brick_stairs, 0, 3); world.setBlock(x + 37, y + 2, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 2, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 16, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 16, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 2, z + 16, Block5, 0, 3); world.setBlock(x + 7, y + 2, z + 16, Block5, 0, 3); world.setBlock(x + 8, y + 2, z + 16, Block5, 0, 3); @@ -2210,15 +2210,15 @@ public class DesertAtom002 world.setBlock(x + 35, y + 2, z + 16, Blocks.web, 0, 3); world.setBlock(x + 36, y + 2, z + 16, Blocks.stone_brick_stairs, 0, 3); world.setBlock(x + 37, y + 2, z + 16, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 2, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 2, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 2, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 2, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 2, z + 17, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 20, y + 2, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 2, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 2, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 20, y + 2, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 2, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 2, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 2, z + 17, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 2, z + 17, Block5, 0, 3); world.setBlock(x + 28, y + 2, z + 17, Blocks.web, 0, 3); @@ -2228,8 +2228,8 @@ public class DesertAtom002 world.setBlock(x + 35, y + 2, z + 17, Blocks.vine, 3, 3); world.setBlock(x + 36, y + 2, z + 17, Blocks.stone_brick_stairs, 0, 3); world.setBlock(x + 37, y + 2, z + 17, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 40, y + 2, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 18, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 18, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 2, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 2, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 2, z + 18, Library.getRandomConcrete(), 0, 3); @@ -2249,108 +2249,108 @@ public class DesertAtom002 world.setBlock(x + 35, y + 2, z + 18, Blocks.gravel, 0, 3); world.setBlock(x + 36, y + 2, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 37, y + 2, z + 18, Blocks.gravel, 0, 3); - world.setBlock(x + 40, y + 2, z + 18, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 40, y + 2, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 20, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 18, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 40, y + 2, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 20, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 2, z + 20, Block15, 0, 3); world.setBlock(x + 7, y + 2, z + 20, Block15, 0, 3); world.setBlock(x + 8, y + 2, z + 20, Block15, 0, 3); world.setBlock(x + 9, y + 2, z + 20, Block15, 0, 3); world.setBlock(x + 10, y + 2, z + 20, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 20, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 21, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 20, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 21, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 21, Block15, 0, 3); world.setBlock(x + 5, y + 2, z + 21, Block15, 0, 3); world.setBlock(x + 11, y + 2, z + 21, Block15, 0, 3); world.setBlock(x + 12, y + 2, z + 21, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 21, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 22, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 21, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 22, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 22, Block15, 0, 3); world.setBlock(x + 12, y + 2, z + 22, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 22, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 22, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 2, z + 23, Block15, 0, 3); world.setBlock(x + 13, y + 2, z + 23, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 23, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 23, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 2, z + 24, Block15, 0, 3); world.setBlock(x + 13, y + 2, z + 24, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 24, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 25, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 24, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 25, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 2, z + 25, Block15, 0, 3); world.setBlock(x + 13, y + 2, z + 25, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 25, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 26, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 25, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 26, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 2, z + 26, Block15, 0, 3); world.setBlock(x + 13, y + 2, z + 26, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 26, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 27, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 26, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 27, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 2, z + 27, Block15, 0, 3); world.setBlock(x + 13, y + 2, z + 27, Block15, 0, 3); world.setBlock(x + 24, y + 2, z + 27, Block2, 0, 3); - world.setBlock(x + 40, y + 2, z + 27, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 28, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 27, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 28, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 28, Block15, 0, 3); world.setBlock(x + 12, y + 2, z + 28, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 28, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 29, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 28, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 29, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 2, z + 29, Block15, 0, 3); world.setBlock(x + 5, y + 2, z + 29, Block15, 0, 3); world.setBlock(x + 11, y + 2, z + 29, Block15, 0, 3); world.setBlock(x + 12, y + 2, z + 29, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 29, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 30, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 29, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 30, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 2, z + 30, Block15, 0, 3); world.setBlock(x + 7, y + 2, z + 30, Block15, 0, 3); world.setBlock(x + 8, y + 2, z + 30, Block15, 0, 3); world.setBlock(x + 9, y + 2, z + 30, Block15, 0, 3); world.setBlock(x + 10, y + 2, z + 30, Block15, 0, 3); - world.setBlock(x + 40, y + 2, z + 30, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 2, z + 31, Blocks.iron_bars, 0, 3); + world.setBlock(x + 40, y + 2, z + 30, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 2, z + 31, Block5, 0, 3); - world.setBlock(x + 17, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 24, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 25, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 26, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 27, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 28, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 29, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 30, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 31, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 32, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 33, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 34, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 35, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 36, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 37, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 38, y + 2, z + 31, Blocks.iron_bars, 0, 3); - world.setBlock(x + 39, y + 2, z + 31, Blocks.iron_bars, 0, 3); + world.setBlock(x + 17, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 24, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 25, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 26, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 27, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 28, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 29, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 30, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 31, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 32, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 33, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 34, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 35, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 36, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 37, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 38, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 39, y + 2, z + 31, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 40, y + 2, z + 31, Block5, 0, 3); - world.setBlock(x + 0, y + 2, z + 32, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 2, z + 32, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 2, z + 32, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 2, z + 32, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 2, z + 33, Block5, 0, 3); - world.setBlock(x + 1, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 11, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 12, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 2, z + 33, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 2, z + 33, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 11, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 12, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 2, z + 33, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 2, z + 33, Block5, 0, 3); world.setBlock(x + 0, y + 3, z + 0, Block5, 0, 3); world.setBlock(x + 1, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); diff --git a/com/hbm/world/DesertAtom003.java b/com/hbm/world/DesertAtom003.java index a4a410007..ec4be7ef8 100644 --- a/com/hbm/world/DesertAtom003.java +++ b/com/hbm/world/DesertAtom003.java @@ -410,7 +410,7 @@ public class DesertAtom003 world.setBlock(x + 9, y + 4, z + 8, Block5, 0, 3); world.setBlock(x + 10, y + 4, z + 8, Block5, 0, 3); world.setBlock(x + 16, y + 4, z + 8, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 4, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 4, z + 8, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 4, z + 8, Block12, 0, 3); world.setBlock(x + 26, y + 4, z + 8, Blocks.unpowered_repeater, 0, 3); @@ -431,7 +431,7 @@ public class DesertAtom003 world.setBlock(x + 16, y + 4, z + 9, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 4, z + 9, Blocks.stone_stairs, 2, 3); world.setBlock(x + 18, y + 4, z + 9, Blocks.stone_stairs, 2, 3); - world.setBlock(x + 19, y + 4, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 4, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 4, z + 9, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 4, z + 9, Blocks.redstone_wire, 0, 3); world.setBlock(x + 26, y + 4, z + 9, Blocks.redstone_wire, 0, 3); @@ -458,7 +458,7 @@ public class DesertAtom003 world.setBlock(x + 16, y + 4, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 4, z + 10, Blocks.stone_stairs, 7, 3); world.setBlock(x + 18, y + 4, z + 10, Blocks.stone_stairs, 7, 3); - world.setBlock(x + 19, y + 4, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 4, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 20, y + 4, z + 10, Blocks.web, 0, 3); world.setBlock(x + 23, y + 4, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 4, z + 10, Blocks.redstone_wire, 0, 3); @@ -489,7 +489,7 @@ public class DesertAtom003 world.setBlock(x + 11, y + 4, z + 12, Block2, 0, 3); world.setBlock(x + 12, y + 4, z + 12, Block5, 0, 3); world.setBlock(x + 16, y + 4, z + 12, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 4, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 4, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 22, y + 4, z + 12, Blocks.vine, 8, 3); world.setBlock(x + 23, y + 4, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 4, z + 12, Blocks.redstone_wire, 0, 3); @@ -506,7 +506,7 @@ public class DesertAtom003 world.setBlock(x + 12, y + 4, z + 13, Block5, 0, 3); world.setBlock(x + 16, y + 4, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 4, z + 13, Blocks.vine, 2, 3); - world.setBlock(x + 19, y + 4, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 4, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 22, y + 4, z + 13, Blocks.vine, 8, 3); world.setBlock(x + 23, y + 4, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 4, z + 13, Blocks.redstone_wire, 0, 3); @@ -522,7 +522,7 @@ public class DesertAtom003 world.setBlock(x + 12, y + 4, z + 14, Block5, 0, 3); world.setBlock(x + 16, y + 4, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 4, z + 14, Blocks.vine, 2, 3); - world.setBlock(x + 19, y + 4, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 4, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 4, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 4, z + 14, Block12, 0, 3); world.setBlock(x + 26, y + 4, z + 14, Blocks.redstone_wire, 0, 3); @@ -538,7 +538,7 @@ public class DesertAtom003 world.setBlock(x + 10, y + 4, z + 15, Block2, 0, 3); world.setBlock(x + 11, y + 4, z + 15, Block5, 0, 3); world.setBlock(x + 16, y + 4, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 4, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 4, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 4, z + 15, Blocks.iron_door, 0, 3); ItemDoor.placeDoorBlock(world, x + 23, y + 4, z + 15, 0, Blocks.iron_door); world.setBlock(x + 24, y + 4, z + 15, Blocks.vine, 2, 3); @@ -691,7 +691,7 @@ public class DesertAtom003 world.setBlock(x + 5, y + 5, z + 9, Block5, 0, 3); world.setBlock(x + 11, y + 5, z + 9, Block5, 0, 3); world.setBlock(x + 16, y + 5, z + 9, Block11, 0, 3); - world.setBlock(x + 19, y + 5, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 5, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 5, z + 9, Block11, 0, 3); world.setBlock(x + 33, y + 5, z + 9, Blocks.vine, 4, 3); world.setBlock(x + 37, y + 5, z + 9, Library.getRandomConcrete(), 0, 3); @@ -700,7 +700,7 @@ public class DesertAtom003 world.setBlock(x + 16, y + 5, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 5, z + 10, Blocks.stone_stairs, 2, 3); world.setBlock(x + 18, y + 5, z + 10, Blocks.stone_stairs, 2, 3); - world.setBlock(x + 19, y + 5, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 5, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 5, z + 10, Blocks.web, 0, 3); world.setBlock(x + 37, y + 5, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 4, y + 5, z + 11, Block5, 0, 3); @@ -708,7 +708,7 @@ public class DesertAtom003 world.setBlock(x + 16, y + 5, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 5, z + 11, Blocks.stone_stairs, 7, 3); world.setBlock(x + 18, y + 5, z + 11, Blocks.stone_stairs, 7, 3); - world.setBlock(x + 19, y + 5, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 5, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 20, y + 5, z + 11, Blocks.web, 0, 3); world.setBlock(x + 23, y + 5, z + 11, Block11, 0, 3); world.setBlock(x + 27, y + 5, z + 11, Blocks.vine, 8, 3); @@ -721,7 +721,7 @@ public class DesertAtom003 world.setBlock(x + 12, y + 5, z + 12, Block5, 0, 3); world.setBlock(x + 16, y + 5, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 5, z + 12, Blocks.web, 0, 3); - world.setBlock(x + 19, y + 5, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 5, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 22, y + 5, z + 12, Blocks.vine, 8, 3); world.setBlock(x + 24, y + 5, z + 12, Blocks.vine, 2, 3); world.setBlock(x + 27, y + 5, z + 12, Blocks.vine, 8, 3); @@ -735,7 +735,7 @@ public class DesertAtom003 world.setBlock(x + 12, y + 5, z + 13, Block5, 0, 3); world.setBlock(x + 16, y + 5, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 5, z + 13, Blocks.vine, 2, 3); - world.setBlock(x + 19, y + 5, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 5, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 5, z + 13, Block11, 0, 3); world.setBlock(x + 28, y + 5, z + 13, Block16, 3, 3); world.setBlock(x + 29, y + 5, z + 13, Block16, 3, 3); @@ -902,7 +902,7 @@ public class DesertAtom003 world.setBlock(x + 11, y + 6, z + 10, Block5, 0, 3); world.setBlock(x + 12, y + 6, z + 10, Block5, 0, 3); world.setBlock(x + 16, y + 6, z + 10, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 6, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 6, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 6, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 24, y + 6, z + 10, Blocks.web, 0, 3); world.setBlock(x + 30, y + 6, z + 10, Blocks.web, 0, 3); @@ -915,7 +915,7 @@ public class DesertAtom003 world.setBlock(x + 16, y + 6, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 6, z + 11, Blocks.stone_stairs, 2, 3); world.setBlock(x + 18, y + 6, z + 11, Blocks.stone_stairs, 2, 3); - world.setBlock(x + 19, y + 6, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 6, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 20, y + 6, z + 11, Blocks.web, 0, 3); world.setBlock(x + 23, y + 6, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 27, y + 6, z + 11, Blocks.vine, 8, 3); @@ -932,7 +932,7 @@ public class DesertAtom003 world.setBlock(x + 16, y + 6, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 6, z + 12, Blocks.stone_stairs, 7, 3); world.setBlock(x + 18, y + 6, z + 12, Blocks.stone_stairs, 7, 3); - world.setBlock(x + 19, y + 6, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 6, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 20, y + 6, z + 12, Blocks.web, 0, 3); world.setBlock(x + 22, y + 6, z + 12, Blocks.vine, 8, 3); world.setBlock(x + 23, y + 6, z + 12, Library.getRandomConcrete(), 0, 3); @@ -1357,21 +1357,21 @@ public class DesertAtom003 world.setBlock(x + 11, y + 7, z + 22, Block15, 0, 3); world.setBlock(x + 4, y + 7, z + 23, Block15, 0, 3); world.setBlock(x + 5, y + 7, z + 23, Block7, 0, 3); - world.setBlock(x + 7, y + 7, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 7, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 8, y + 7, z + 23, Block7, 0, 3); world.setBlock(x + 11, y + 7, z + 23, Block7, 0, 3); world.setBlock(x + 12, y + 7, z + 23, Block15, 0, 3); world.setBlock(x + 4, y + 7, z + 24, Block15, 0, 3); world.setBlock(x + 5, y + 7, z + 24, Block7, 0, 3); world.setBlock(x + 8, y + 7, z + 24, Block7, 0, 3); - world.setBlock(x + 9, y + 7, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 7, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 7, z + 24, Block7, 0, 3); world.setBlock(x + 12, y + 7, z + 24, Block15, 0, 3); world.setBlock(x + 4, y + 7, z + 25, Block15, 0, 3); world.setBlock(x + 5, y + 7, z + 25, Block7, 0, 3); - world.setBlock(x + 7, y + 7, z + 25, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 7, z + 25, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 8, y + 7, z + 25, Block7, 0, 3); - world.setBlock(x + 9, y + 7, z + 25, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 7, z + 25, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 7, z + 25, Block7, 0, 3); world.setBlock(x + 12, y + 7, z + 25, Block15, 0, 3); world.setBlock(x + 4, y + 7, z + 26, Block15, 0, 3); @@ -1381,9 +1381,9 @@ public class DesertAtom003 world.setBlock(x + 12, y + 7, z + 26, Block15, 0, 3); world.setBlock(x + 4, y + 7, z + 27, Block15, 0, 3); world.setBlock(x + 5, y + 7, z + 27, Block7, 0, 3); - world.setBlock(x + 7, y + 7, z + 27, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 7, z + 27, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 8, y + 7, z + 27, Block7, 0, 3); - world.setBlock(x + 9, y + 7, z + 27, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 7, z + 27, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 7, z + 27, Block7, 0, 3); world.setBlock(x + 12, y + 7, z + 27, Block15, 0, 3); world.setBlock(x + 5, y + 7, z + 28, Block15, 0, 3); @@ -1418,9 +1418,9 @@ public class DesertAtom003 world.setBlock(x + 35, y + 8, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 36, y + 8, z + 6, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 16, y + 8, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 8, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 8, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 8, z + 8, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 8, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 8, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 37, y + 8, z + 8, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 6, y + 8, z + 9, Block5, 0, 3); world.setBlock(x + 7, y + 8, z + 9, Block5, 0, 3); @@ -1428,7 +1428,7 @@ public class DesertAtom003 world.setBlock(x + 9, y + 8, z + 9, Block5, 0, 3); world.setBlock(x + 10, y + 8, z + 9, Block5, 0, 3); world.setBlock(x + 16, y + 8, z + 9, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 8, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 8, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 23, y + 8, z + 9, Block25, 0, 3); world.setBlock(x + 24, y + 8, z + 9, Block25, 0, 3); world.setBlock(x + 25, y + 8, z + 9, Block28, 3, 3); @@ -1452,11 +1452,11 @@ public class DesertAtom003 world.setBlock(x + 6, y + 8, z + 11, Block11, 0, 3); world.setBlock(x + 10, y + 8, z + 11, Block11, 0, 3); world.setBlock(x + 11, y + 8, z + 11, Block5, 0, 3); - world.setBlock(x + 12, y + 8, z + 11, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 8, z + 11, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 8, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 12, y + 8, z + 11, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 8, z + 11, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 8, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 8, z + 11, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 8, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 8, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 37, y + 8, z + 11, Blocks.gravel, 0, 3); world.setBlock(x + 5, y + 8, z + 12, Block5, 0, 3); world.setBlock(x + 6, y + 8, z + 12, Block5, 0, 3); @@ -1464,14 +1464,14 @@ public class DesertAtom003 world.setBlock(x + 10, y + 8, z + 12, Block5, 0, 3); world.setBlock(x + 11, y + 8, z + 12, Block5, 0, 3); world.setBlock(x + 16, y + 8, z + 12, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 19, y + 8, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 8, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 8, z + 13, Block5, 0, 3); world.setBlock(x + 6, y + 8, z + 13, Block11, 0, 3); world.setBlock(x + 10, y + 8, z + 13, Block11, 0, 3); world.setBlock(x + 11, y + 8, z + 13, Block5, 0, 3); - world.setBlock(x + 12, y + 8, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 8, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 8, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 12, y + 8, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 8, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 8, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 8, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 33, y + 8, z + 13, Block13, 5, 3); world.setBlock(x + 5, y + 8, z + 14, Block5, 0, 3); @@ -1502,8 +1502,8 @@ public class DesertAtom003 world.setBlock(x + 29, y + 8, z + 15, Block5, 0, 3); world.setBlock(x + 30, y + 8, z + 15, Block8, 2, 3); world.setBlock(x + 31, y + 8, z + 15, Block8, 3, 3); - world.setBlock(x + 7, y + 8, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 8, z + 16, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 8, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 8, z + 16, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 8, z + 16, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 22, y + 8, z + 16, Block5, 0, 3); world.setBlock(x + 23, y + 8, z + 16, Block5, 0, 3); @@ -1511,10 +1511,10 @@ public class DesertAtom003 world.setBlock(x + 27, y + 8, z + 16, Block5, 0, 3); world.setBlock(x + 28, y + 8, z + 16, Block5, 0, 3); world.setBlock(x + 29, y + 8, z + 16, Block5, 0, 3); - world.setBlock(x + 7, y + 8, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 8, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 8, z + 17, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 7, y + 8, z + 18, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 8, z + 18, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 8, z + 18, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 8, z + 18, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 16, y + 8, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 17, y + 8, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 8, z + 18, Library.getRandomConcrete(), 0, 3); @@ -1533,9 +1533,9 @@ public class DesertAtom003 world.setBlock(x + 31, y + 8, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 32, y + 8, z + 18, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 33, y + 8, z + 18, Blocks.gravel, 0, 3); - world.setBlock(x + 9, y + 8, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 8, z + 21, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 8, z + 21, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 8, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 8, z + 21, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 8, z + 21, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 8, z + 22, Block15, 0, 3); world.setBlock(x + 7, y + 8, z + 22, Block15, 0, 3); world.setBlock(x + 8, y + 8, z + 22, Blocks.iron_door, 1, 3); @@ -1543,19 +1543,19 @@ public class DesertAtom003 world.setBlock(x + 9, y + 8, z + 22, Block15, 0, 3); world.setBlock(x + 10, y + 8, z + 22, Block15, 0, 3); world.setBlock(x + 5, y + 8, z + 23, Block15, 0, 3); - world.setBlock(x + 7, y + 8, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 8, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 8, z + 23, Block15, 0, 3); world.setBlock(x + 5, y + 8, z + 24, Block15, 0, 3); - world.setBlock(x + 9, y + 8, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 8, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 8, z + 24, Block15, 0, 3); world.setBlock(x + 5, y + 8, z + 25, Block15, 0, 3); - world.setBlock(x + 9, y + 8, z + 25, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 8, z + 25, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 8, z + 25, Block15, 0, 3); world.setBlock(x + 5, y + 8, z + 26, Block15, 0, 3); world.setBlock(x + 11, y + 8, z + 26, Block15, 0, 3); world.setBlock(x + 5, y + 8, z + 27, Block15, 0, 3); - world.setBlock(x + 7, y + 8, z + 27, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 8, z + 27, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 8, z + 27, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 8, z + 27, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 8, z + 27, Block15, 0, 3); world.setBlock(x + 6, y + 8, z + 28, Block15, 0, 3); world.setBlock(x + 7, y + 8, z + 28, Block15, 0, 3); diff --git a/com/hbm/world/Relay.java b/com/hbm/world/Relay.java index 25b2c5f66..c0be57378 100644 --- a/com/hbm/world/Relay.java +++ b/com/hbm/world/Relay.java @@ -579,72 +579,72 @@ public class Relay extends WorldGenerator world.setBlock(x + 9, y + -1, z + 15, Block1, 0, 3); world.setBlock(x + 10, y + -1, z + 15, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 2, y + 0, z + 0, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 3, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 0, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 0, z + 0, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 7, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 0, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 0, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 0, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 10, y + 0, z + 0, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 2, y + 0, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 0, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 2, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 0, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 0, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 2, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 0, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 0, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 0, z + 2, Block4, 3, 3); - world.setBlock(x + 10, y + 0, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 3, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 3, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 3, Block4, 5, 3); world.setBlock(x + 5, y + 0, z + 3, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 3, Block2, 0, 3); world.setBlock(x + 7, y + 0, z + 3, Block2, 0, 3); world.setBlock(x + 8, y + 0, z + 3, Block4, 4, 3); - world.setBlock(x + 10, y + 0, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 4, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 4, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 4, Block2, 0, 3); world.setBlock(x + 5, y + 0, z + 4, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 4, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 0, z + 4, Block2, 0, 3); world.setBlock(x + 8, y + 0, z + 4, Block2, 0, 3); - world.setBlock(x + 10, y + 0, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 5, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 5, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 5, Block4, 5, 3); world.setBlock(x + 5, y + 0, z + 5, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 5, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 0, z + 5, Block2, 0, 3); world.setBlock(x + 8, y + 0, z + 5, Block4, 4, 3); - world.setBlock(x + 10, y + 0, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 0, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 0, z + 6, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 0, z + 6, Block4, 2, 3); - world.setBlock(x + 10, y + 0, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 0, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 1, y + 0, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 0, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 2, y + 0, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 3, y + 0, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 0, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 7, Block2, 0, 3); world.setBlock(x + 5, y + 0, z + 7, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 7, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 0, z + 7, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 8, y + 0, z + 7, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 10, y + 0, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 0, y + 0, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 0, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 0, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 8, Block2, 0, 3); world.setBlock(x + 5, y + 0, z + 8, Block2, 0, 3); world.setBlock(x + 6, y + 0, z + 8, Block2, 0, 3); world.setBlock(x + 7, y + 0, z + 8, Block2, 0, 3); world.setBlock(x + 8, y + 0, z + 8, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 10, y + 0, z + 8, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 0, y + 0, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 0, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 0, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 0, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 0, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 0, z + 9, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 0, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 0, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 4, y + 0, z + 10, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 0, z + 10, ModBlocks.crate_iron, 0, 3); @@ -652,136 +652,136 @@ public class Relay extends WorldGenerator WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(1), (TileEntityCrateIron)world.getTileEntity(x + 6, y + 0, z + 10), 8); world.setBlock(x + 7, y + 0, z + 10, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 0, z + 10, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 0, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 11, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 0, z + 11, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 0, z + 11, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 0, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 0, z + 12, Library.getRandomConcrete(), 0, 3); //world.setBlock(x + 4, y + 0, z + 12, Blocks.iron_door, 0, 3); ItemDoor.placeDoorBlock(world, x + 4, y + 0, z + 12, 0, Blocks.iron_door); world.setBlock(x + 7, y + 0, z + 12, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 0, z + 12, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 0, z + 12, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 12, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 0, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 0, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 0, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 0, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 0, z + 13, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 0, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 0, z + 14, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 0, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 0, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 0, z + 14, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 0, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 0, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 1, y + 0, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 0, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 0, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 0, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 0, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 6, y + 0, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 0, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 0, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 0, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 6, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 0, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 10, y + 0, z + 15, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 2, y + 1, z + 0, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 3, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 1, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 1, z + 0, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 7, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 1, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 1, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 1, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 10, y + 1, z + 0, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 2, y + 1, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 1, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 2, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 1, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 1, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 2, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 1, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 1, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 1, z + 2, Block4, 3, 3); - world.setBlock(x + 10, y + 1, z + 2, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 3, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 2, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 3, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 3, Block4, 5, 3); world.setBlock(x + 5, y + 1, z + 3, Block2, 0, 3); world.setBlock(x + 6, y + 1, z + 3, Block2, 0, 3); world.setBlock(x + 7, y + 1, z + 3, Block2, 0, 3); world.setBlock(x + 8, y + 1, z + 3, Block4, 4, 3); - world.setBlock(x + 10, y + 1, z + 3, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 4, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 3, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 4, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 4, Block2, 0, 3); world.setBlock(x + 5, y + 1, z + 4, Block2, 0, 3); world.setBlock(x + 6, y + 1, z + 4, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 1, z + 4, Block2, 0, 3); world.setBlock(x + 8, y + 1, z + 4, Block2, 0, 3); - world.setBlock(x + 10, y + 1, z + 4, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 5, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 4, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 5, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 5, Block4, 5, 3); world.setBlock(x + 5, y + 1, z + 5, Block2, 0, 3); world.setBlock(x + 6, y + 1, z + 5, Block2, 0, 3); world.setBlock(x + 7, y + 1, z + 5, Block2, 0, 3); world.setBlock(x + 8, y + 1, z + 5, Block4, 4, 3); - world.setBlock(x + 10, y + 1, z + 5, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 5, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 1, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 1, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 1, z + 6, Block4, 2, 3); - world.setBlock(x + 10, y + 1, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 1, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 1, y + 1, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 1, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 2, y + 1, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 3, y + 1, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 1, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 1, z + 7, Block2, 0, 3); world.setBlock(x + 6, y + 1, z + 7, Block2, 0, 3); world.setBlock(x + 7, y + 1, z + 7, Block2, 0, 3); world.setBlock(x + 8, y + 1, z + 7, Block2, 0, 3); world.setBlock(x + 10, y + 1, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 0, y + 1, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 1, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 1, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 1, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 1, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 1, z + 8, Block2, 0, 3); world.setBlock(x + 6, y + 1, z + 8, Block2, 0, 3); world.setBlock(x + 7, y + 1, z + 8, Block2, 0, 3); world.setBlock(x + 8, y + 1, z + 8, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 10, y + 1, z + 8, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 0, y + 1, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 0, y + 1, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 1, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 1, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 1, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 1, z + 9, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 10, y + 1, z + 9, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 9, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 1, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 4, y + 1, z + 10, Block5, 0, 3); world.setBlock(x + 7, y + 1, z + 10, ModBlocks.machine_battery, 4, 3); world.setBlock(x + 8, y + 1, z + 10, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 10, y + 1, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 11, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 1, z + 11, ModBlocks.machine_battery, 4, 3); world.setBlock(x + 8, y + 1, z + 11, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 10, y + 1, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 1, z + 12, Library.getRandomConcrete(), 0, 3); //world.setBlock(x + 4, y + 1, z + 12, Blocks.iron_door, 8, 3); world.setBlock(x + 7, y + 1, z + 12, ModBlocks.machine_battery, 4, 3); world.setBlock(x + 8, y + 1, z + 12, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 10, y + 1, z + 12, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 12, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 1, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 1, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 1, z + 13, Block5, 0, 3); world.setBlock(x + 7, y + 1, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 1, z + 13, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 1, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 0, y + 1, z + 14, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 1, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 1, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 0, y + 1, z + 14, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 1, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 0, y + 1, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 1, y + 1, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 1, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 1, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 1, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 1, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 1, z + 15, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 6, y + 1, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 1, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 1, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 1, z + 15, Blocks.iron_bars, 0, 3); + world.setBlock(x + 6, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 1, z + 15, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 10, y + 1, z + 15, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 2, y + 2, z + 0, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 3, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3); @@ -828,15 +828,15 @@ public class Relay extends WorldGenerator world.setBlock(x + 0, y + 2, z + 7, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 1, y + 2, z + 7, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 2, y + 2, z + 7, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 3, y + 2, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 2, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 2, z + 7, Block2, 0, 3); world.setBlock(x + 7, y + 2, z + 7, Block2, 0, 3); world.setBlock(x + 8, y + 2, z + 7, Block2, 0, 3); world.setBlock(x + 10, y + 2, z + 7, Blocks.anvil, 0, 3); world.setBlock(x + 0, y + 2, z + 8, ModBlocks.barbed_wire, 0, 3); - world.setBlock(x + 3, y + 2, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 2, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 2, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 2, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 2, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 2, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 2, z + 8, Block2, 0, 3); world.setBlock(x + 7, y + 2, z + 8, Block2, 0, 3); world.setBlock(x + 8, y + 2, z + 8, Block2, 0, 3); @@ -916,8 +916,8 @@ public class Relay extends WorldGenerator world.setBlock(x + 7, y + 3, z + 7, Block2, 0, 3); world.setBlock(x + 8, y + 3, z + 7, Block2, 0, 3); world.setBlock(x + 9, y + 3, z + 7, Block2, 0, 3); - world.setBlock(x + 5, y + 3, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 3, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 3, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 3, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 3, z + 8, Block2, 0, 3); world.setBlock(x + 8, y + 3, z + 8, Block2, 0, 3); world.setBlock(x + 5, y + 4, z + 2, Block4, 3, 3); @@ -944,13 +944,13 @@ public class Relay extends WorldGenerator world.setBlock(x + 5, y + 4, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 4, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 4, z + 6, Block4, 2, 3); - world.setBlock(x + 10, y + 4, z + 6, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 4, z + 7, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 4, z + 7, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 4, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 4, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 4, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 4, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 4, z + 6, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 4, z + 7, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 4, z + 7, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 5, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 5, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 5, z + 2, Block4, 3, 3); @@ -972,11 +972,11 @@ public class Relay extends WorldGenerator world.setBlock(x + 6, y + 5, z + 5, Block2, 0, 3); world.setBlock(x + 7, y + 5, z + 5, Block2, 0, 3); world.setBlock(x + 8, y + 5, z + 5, Block4, 4, 3); - world.setBlock(x + 10, y + 5, z + 5, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 5, z + 5, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 5, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 5, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 5, z + 6, Block4, 2, 3); - world.setBlock(x + 10, y + 5, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 5, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 8, y + 6, z + 0, Block2, 0, 3); world.setBlock(x + 7, y + 6, z + 1, Block2, 0, 3); world.setBlock(x + 8, y + 6, z + 1, Block2, 0, 3); @@ -999,39 +999,39 @@ public class Relay extends WorldGenerator world.setBlock(x + 6, y + 6, z + 4, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 6, z + 4, Block2, 0, 3); world.setBlock(x + 8, y + 6, z + 4, Block2, 0, 3); - world.setBlock(x + 10, y + 6, z + 4, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 6, z + 4, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 6, z + 5, Block4, 5, 3); world.setBlock(x + 5, y + 6, z + 5, Block2, 0, 3); world.setBlock(x + 6, y + 6, z + 5, Block2, 0, 3); world.setBlock(x + 7, y + 6, z + 5, Block2, 0, 3); world.setBlock(x + 8, y + 6, z + 5, Block4, 4, 3); - world.setBlock(x + 10, y + 6, z + 5, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 6, z + 5, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 6, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 6, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 6, z + 6, Block4, 2, 3); world.setBlock(x + 7, y + 7, z + 0, Block2, 0, 3); - world.setBlock(x + 8, y + 7, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 7, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 8, y + 7, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 7, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 6, y + 7, z + 1, Block2, 0, 3); world.setBlock(x + 7, y + 7, z + 1, Block2, 0, 3); - world.setBlock(x + 9, y + 7, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 7, z + 1, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 7, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 7, z + 1, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 7, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 7, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 7, z + 2, Block4, 3, 3); - world.setBlock(x + 10, y + 7, z + 2, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 7, z + 2, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 7, z + 3, Block4, 5, 3); world.setBlock(x + 5, y + 7, z + 3, Block2, 0, 3); world.setBlock(x + 6, y + 7, z + 3, Block2, 0, 3); world.setBlock(x + 7, y + 7, z + 3, Block2, 0, 3); world.setBlock(x + 8, y + 7, z + 3, Block4, 4, 3); - world.setBlock(x + 10, y + 7, z + 3, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 7, z + 3, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 7, z + 4, Block2, 0, 3); world.setBlock(x + 5, y + 7, z + 4, Block2, 0, 3); world.setBlock(x + 6, y + 7, z + 4, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 7, z + 4, Block2, 0, 3); world.setBlock(x + 8, y + 7, z + 4, Block2, 0, 3); - world.setBlock(x + 10, y + 7, z + 4, Blocks.iron_bars, 0, 3); + world.setBlock(x + 10, y + 7, z + 4, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 7, z + 5, Block4, 5, 3); world.setBlock(x + 5, y + 7, z + 5, Block2, 0, 3); world.setBlock(x + 6, y + 7, z + 5, Block2, 0, 3); @@ -1041,8 +1041,8 @@ public class Relay extends WorldGenerator world.setBlock(x + 6, y + 7, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 7, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 8, z + 0, Block2, 0, 3); - world.setBlock(x + 7, y + 8, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 8, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 8, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 8, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 8, z + 1, Block2, 0, 3); world.setBlock(x + 6, y + 8, z + 1, Block2, 0, 3); world.setBlock(x + 5, y + 8, z + 2, Block4, 3, 3); @@ -1068,8 +1068,8 @@ public class Relay extends WorldGenerator world.setBlock(x + 7, y + 8, z + 6, Block4, 2, 3); world.setBlock(x + 4, y + 9, z + 0, Block2, 0, 3); world.setBlock(x + 5, y + 9, z + 0, Block2, 0, 3); - world.setBlock(x + 6, y + 9, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 9, z + 0, Blocks.iron_bars, 0, 3); + world.setBlock(x + 6, y + 9, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 9, z + 0, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 3, y + 9, z + 1, Block2, 0, 3); world.setBlock(x + 4, y + 9, z + 1, Block2, 0, 3); world.setBlock(x + 5, y + 9, z + 1, Block2, 0, 3); @@ -1098,13 +1098,13 @@ public class Relay extends WorldGenerator world.setBlock(x + 5, y + 9, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 9, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 9, z + 6, Block4, 2, 3); - world.setBlock(x + 3, y + 10, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 10, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 10, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 10, z + 0, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 10, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 10, z + 1, Blocks.iron_bars, 0, 3); - world.setBlock(x + 2, y + 10, z + 2, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 10, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 10, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 10, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 10, z + 0, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 10, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 10, z + 1, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 2, y + 10, z + 2, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 10, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 10, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 10, z + 2, Block4, 3, 3); @@ -1129,11 +1129,11 @@ public class Relay extends WorldGenerator world.setBlock(x + 5, y + 10, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 10, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 10, z + 6, Block4, 2, 3); - world.setBlock(x + 2, y + 11, z + 2, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 11, z + 2, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 11, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 11, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 11, z + 2, Block4, 3, 3); - world.setBlock(x + 2, y + 11, z + 3, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 11, z + 3, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 11, z + 3, Block4, 5, 3); world.setBlock(x + 5, y + 11, z + 3, Block2, 0, 3); world.setBlock(x + 6, y + 11, z + 3, Block2, 0, 3); @@ -1162,14 +1162,14 @@ public class Relay extends WorldGenerator world.setBlock(x + 6, y + 12, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 12, z + 2, Block4, 3, 3); world.setBlock(x + 10, y + 12, z + 2, Block6, 0, 3); - world.setBlock(x + 2, y + 12, z + 3, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 12, z + 3, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 12, z + 3, Block4, 5, 3); world.setBlock(x + 5, y + 12, z + 3, Block2, 0, 3); world.setBlock(x + 6, y + 12, z + 3, Block2, 0, 3); world.setBlock(x + 7, y + 12, z + 3, Block2, 0, 3); world.setBlock(x + 8, y + 12, z + 3, Block4, 4, 3); world.setBlock(x + 9, y + 12, z + 3, Block6, 0, 3); - world.setBlock(x + 2, y + 12, z + 4, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 12, z + 4, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 12, z + 4, Block2, 0, 3); world.setBlock(x + 5, y + 12, z + 4, Block2, 0, 3); world.setBlock(x + 6, y + 12, z + 4, ModBlocks.red_wire_coated, 0, 3); @@ -1205,7 +1205,7 @@ public class Relay extends WorldGenerator world.setBlock(x + 7, y + 13, z + 3, Block2, 0, 3); world.setBlock(x + 8, y + 13, z + 3, Block4, 4, 3); world.setBlock(x + 9, y + 13, z + 3, Block6, 0, 3); - world.setBlock(x + 2, y + 13, z + 4, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 13, z + 4, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 13, z + 4, Block2, 0, 3); world.setBlock(x + 5, y + 13, z + 4, Block2, 0, 3); world.setBlock(x + 6, y + 13, z + 4, ModBlocks.red_wire_coated, 0, 3); @@ -1214,29 +1214,29 @@ public class Relay extends WorldGenerator world.setBlock(x + 9, y + 13, z + 4, Block7, 0, 3); world.setBlock(x + 10, y + 13, z + 4, Block7, 0, 3); world.setBlock(x + 11, y + 13, z + 4, Block8, 0, 3); - world.setBlock(x + 2, y + 13, z + 5, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 13, z + 5, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 4, y + 13, z + 5, Block4, 5, 3); world.setBlock(x + 5, y + 13, z + 5, Block2, 0, 3); world.setBlock(x + 6, y + 13, z + 5, Block2, 0, 3); world.setBlock(x + 7, y + 13, z + 5, Block2, 0, 3); world.setBlock(x + 8, y + 13, z + 5, Block4, 4, 3); world.setBlock(x + 9, y + 13, z + 5, Block6, 0, 3); - world.setBlock(x + 2, y + 13, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 13, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 13, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 13, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 13, z + 6, Block4, 2, 3); world.setBlock(x + 8, y + 13, z + 6, Block2, 0, 3); world.setBlock(x + 9, y + 13, z + 6, Block2, 0, 3); world.setBlock(x + 10, y + 13, z + 6, Block6, 0, 3); - world.setBlock(x + 2, y + 13, z + 7, Blocks.iron_bars, 0, 3); - world.setBlock(x + 3, y + 13, z + 7, Blocks.iron_bars, 0, 3); + world.setBlock(x + 2, y + 13, z + 7, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 3, y + 13, z + 7, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 13, z + 7, Block2, 0, 3); world.setBlock(x + 6, y + 13, z + 7, Block2, 0, 3); world.setBlock(x + 7, y + 13, z + 7, Block2, 0, 3); world.setBlock(x + 8, y + 13, z + 7, Block2, 0, 3); world.setBlock(x + 9, y + 13, z + 7, Block2, 0, 3); - world.setBlock(x + 3, y + 13, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 13, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 3, y + 13, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 13, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 13, z + 8, Block2, 0, 3); world.setBlock(x + 6, y + 13, z + 8, Block2, 0, 3); world.setBlock(x + 7, y + 13, z + 8, Block2, 0, 3); @@ -1269,15 +1269,15 @@ public class Relay extends WorldGenerator world.setBlock(x + 8, y + 14, z + 6, ModBlocks.crate_iron, 0, 3); world.setBlockMetadataWithNotify(x + 8, y + 14, z + 6, 3, 3); WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(2), (TileEntityCrateIron)world.getTileEntity(x + 8, y + 14, z + 6), 8); - world.setBlock(x + 9, y + 14, z + 6, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 14, z + 6, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 10, y + 14, z + 6, Block6, 0, 3); - world.setBlock(x + 9, y + 14, z + 7, Blocks.iron_bars, 0, 3); - world.setBlock(x + 4, y + 14, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 14, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 14, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 14, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 14, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 14, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 14, z + 7, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 4, y + 14, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 14, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 14, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 14, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 14, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 14, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 15, z + 2, Block2, 0, 3); world.setBlock(x + 6, y + 15, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 15, z + 2, Block2, 0, 3); diff --git a/com/hbm/world/Satellite.java b/com/hbm/world/Satellite.java index c4f7072f2..4ae52acb6 100644 --- a/com/hbm/world/Satellite.java +++ b/com/hbm/world/Satellite.java @@ -318,8 +318,8 @@ public class Satellite extends WorldGenerator world.setBlock(x + 13, y + 0, z + 8, Block3, 3, 3); world.setBlock(x + 19, y + 0, z + 8, Block2, 0, 3); world.setBlock(x + 20, y + 0, z + 8, Block2, 0, 3); - world.setBlock(x + 21, y + 0, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 0, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 21, y + 0, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 0, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 19, y + 0, z + 9, Block2, 0, 3); world.setBlock(x + 20, y + 0, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 0, z + 10, Library.getRandomConcrete(), 0, 3); @@ -352,9 +352,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 13, y + 1, z + 8, Block3, 3, 3); world.setBlock(x + 17, y + 1, z + 8, Block2, 0, 3); world.setBlock(x + 18, y + 1, z + 8, Block2, 0, 3); - world.setBlock(x + 19, y + 1, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 1, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 1, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 1, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 1, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 1, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 17, y + 1, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 1, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 1, z + 10, Library.getRandomConcrete(), 0, 3); @@ -387,9 +387,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 13, y + 2, z + 8, Block3, 3, 3); world.setBlock(x + 15, y + 2, z + 8, Block2, 0, 3); world.setBlock(x + 16, y + 2, z + 8, Block2, 0, 3); - world.setBlock(x + 17, y + 2, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 2, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 2, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 17, y + 2, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 2, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 2, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 15, y + 2, z + 9, Block2, 0, 3); world.setBlock(x + 16, y + 2, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 2, z + 10, Library.getRandomConcrete(), 0, 3); @@ -421,9 +421,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 5, y + 3, z + 8, Block3, 3, 3); world.setBlock(x + 13, y + 3, z + 8, Block2, 0, 3); world.setBlock(x + 14, y + 3, z + 8, Block2, 0, 3); - world.setBlock(x + 15, y + 3, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 3, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 17, y + 3, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 15, y + 3, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 3, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 17, y + 3, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 13, y + 3, z + 9, Block2, 0, 3); world.setBlock(x + 14, y + 3, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 3, z + 10, Library.getRandomConcrete(), 0, 3); @@ -455,9 +455,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 5, y + 4, z + 8, Block3, 3, 3); world.setBlock(x + 11, y + 4, z + 8, Block2, 0, 3); world.setBlock(x + 12, y + 4, z + 8, Block2, 0, 3); - world.setBlock(x + 13, y + 4, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 14, y + 4, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 4, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 13, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 14, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 4, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 11, y + 4, z + 9, Block2, 0, 3); world.setBlock(x + 12, y + 4, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 4, z + 10, Library.getRandomConcrete(), 0, 3); @@ -489,9 +489,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 5, y + 5, z + 8, Block3, 3, 3); world.setBlock(x + 9, y + 5, z + 8, Block2, 0, 3); world.setBlock(x + 10, y + 5, z + 8, Block2, 0, 3); - world.setBlock(x + 11, y + 5, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 12, y + 5, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 13, y + 5, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 11, y + 5, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 12, y + 5, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 13, y + 5, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 9, y + 5, z + 9, Block2, 0, 3); world.setBlock(x + 10, y + 5, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 5, z + 10, Library.getRandomConcrete(), 0, 3); @@ -523,9 +523,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 5, y + 6, z + 8, Block3, 3, 3); world.setBlock(x + 7, y + 6, z + 8, Block2, 0, 3); world.setBlock(x + 8, y + 6, z + 8, Block2, 0, 3); - world.setBlock(x + 9, y + 6, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 10, y + 6, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 11, y + 6, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 9, y + 6, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 10, y + 6, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 11, y + 6, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 6, z + 9, Block2, 0, 3); world.setBlock(x + 8, y + 6, z + 9, Block2, 0, 3); world.setBlock(x + 18, y + 6, z + 10, Library.getRandomConcrete(), 0, 3); @@ -556,9 +556,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 19, y + 6, z + 29, Block4, 0, 3); world.setBlock(x + 5, y + 7, z + 8, Block2, 0, 3); world.setBlock(x + 6, y + 7, z + 8, Block2, 0, 3); - world.setBlock(x + 7, y + 7, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 8, y + 7, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 9, y + 7, z + 8, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 7, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 8, y + 7, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 9, y + 7, z + 8, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 7, z + 9, Block2, 0, 3); world.setBlock(x + 6, y + 7, z + 9, Block2, 0, 3); world.setBlock(x + 5, y + 7, z + 10, Block2, 0, 3); @@ -601,38 +601,38 @@ public class Satellite extends WorldGenerator world.setBlock(x + 5, y + 7, z + 23, Block3, 5, 3); world.setBlock(x + 7, y + 7, z + 29, Block4, 0, 3); world.setBlock(x + 19, y + 7, z + 29, Block4, 0, 3); - world.setBlock(x + 5, y + 8, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 8, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 8, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 8, z + 9, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 8, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 8, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 8, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 8, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 8, z + 9, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 8, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 18, y + 8, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 8, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 8, z + 10, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 5, y + 8, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 8, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 17, y + 8, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 8, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 8, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 8, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 21, y + 8, z + 11, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 5, y + 8, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 8, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 17, y + 8, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 8, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 8, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 8, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 21, y + 8, z + 12, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 5, y + 8, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 8, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 17, y + 8, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 8, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 8, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 8, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 21, y + 8, z + 13, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 5, y + 8, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 8, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 18, y + 8, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 8, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 8, z + 14, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 5, y + 8, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 8, z + 16, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 8, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 8, z + 16, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 8, z + 17, Block2, 0, 3); world.setBlock(x + 6, y + 8, z + 17, Block2, 0, 3); world.setBlock(x + 7, y + 8, z + 17, Block4, 0, 3); @@ -663,11 +663,11 @@ public class Satellite extends WorldGenerator world.setBlock(x + 18, y + 9, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 9, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 9, z + 14, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 5, y + 9, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 9, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 9, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 9, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 9, z + 17, Block4, 0, 3); world.setBlock(x + 19, y + 9, z + 17, Block4, 0, 3); - world.setBlock(x + 5, y + 9, z + 18, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 9, z + 18, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 9, z + 19, Block2, 0, 3); world.setBlock(x + 6, y + 9, z + 19, Block2, 0, 3); world.setBlock(x + 5, y + 9, z + 20, Block2, 0, 3); @@ -698,9 +698,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 20, y + 10, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 7, y + 10, z + 17, Block4, 0, 3); world.setBlock(x + 19, y + 10, z + 17, Block4, 0, 3); - world.setBlock(x + 5, y + 10, z + 18, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 10, z + 19, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 10, z + 20, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 10, z + 18, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 10, z + 19, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 10, z + 20, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 10, z + 21, Block2, 0, 3); world.setBlock(x + 6, y + 10, z + 21, Block2, 0, 3); world.setBlock(x + 5, y + 10, z + 22, Block2, 0, 3); @@ -731,9 +731,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 20, y + 11, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 7, y + 11, z + 17, Block4, 0, 3); world.setBlock(x + 19, y + 11, z + 17, Block4, 0, 3); - world.setBlock(x + 5, y + 11, z + 20, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 11, z + 21, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 11, z + 22, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 11, z + 20, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 11, z + 21, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 11, z + 22, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 11, z + 23, Block2, 0, 3); world.setBlock(x + 6, y + 11, z + 23, Block2, 0, 3); world.setBlock(x + 5, y + 11, z + 24, Block2, 0, 3); @@ -763,9 +763,9 @@ public class Satellite extends WorldGenerator world.setBlock(x + 20, y + 12, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 7, y + 12, z + 17, Block4, 0, 3); world.setBlock(x + 19, y + 12, z + 17, Block4, 0, 3); - world.setBlock(x + 5, y + 12, z + 22, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 12, z + 23, Blocks.iron_bars, 0, 3); - world.setBlock(x + 5, y + 12, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 12, z + 22, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 12, z + 23, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 5, y + 12, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 5, y + 12, z + 25, Block2, 0, 3); world.setBlock(x + 6, y + 12, z + 25, Block2, 0, 3); world.setBlock(x + 5, y + 12, z + 26, Block2, 0, 3); @@ -879,7 +879,7 @@ public class Satellite extends WorldGenerator world.setBlock(x + 17, y + 13, z + 23, Block5, 0, 3); world.setBlock(x + 18, y + 13, z + 23, Block5, 0, 3); world.setBlock(x + 19, y + 13, z + 23, Block5, 0, 3); - world.setBlock(x + 5, y + 13, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 13, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 13, z + 24, Block5, 0, 3); world.setBlock(x + 8, y + 13, z + 24, Blocks.stone_slab, 8, 3); world.setBlock(x + 9, y + 13, z + 24, Blocks.stone_slab, 8, 3); @@ -893,7 +893,7 @@ public class Satellite extends WorldGenerator world.setBlock(x + 17, y + 13, z + 24, Blocks.stone_slab, 8, 3); world.setBlock(x + 18, y + 13, z + 24, Blocks.stone_slab, 8, 3); world.setBlock(x + 19, y + 13, z + 24, Block5, 0, 3); - world.setBlock(x + 5, y + 13, z + 25, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 13, z + 25, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 13, z + 25, Block5, 0, 3); world.setBlock(x + 8, y + 13, z + 25, Blocks.stone_slab, 8, 3); world.setBlock(x + 9, y + 13, z + 25, Blocks.stone_slab, 8, 3); @@ -907,7 +907,7 @@ public class Satellite extends WorldGenerator world.setBlock(x + 17, y + 13, z + 25, Blocks.stone_slab, 8, 3); world.setBlock(x + 18, y + 13, z + 25, Blocks.stone_slab, 8, 3); world.setBlock(x + 19, y + 13, z + 25, Block5, 0, 3); - world.setBlock(x + 5, y + 13, z + 26, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 13, z + 26, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 13, z + 26, Block5, 0, 3); world.setBlock(x + 8, y + 13, z + 26, Blocks.stone_slab, 8, 3); world.setBlock(x + 9, y + 13, z + 26, Blocks.stone_slab, 8, 3); @@ -995,34 +995,34 @@ public class Satellite extends WorldGenerator world.setBlock(x + 20, y + 14, z + 19, Block2, 0, 3); world.setBlock(x + 21, y + 14, z + 19, Block2, 0, 3); world.setBlock(x + 7, y + 14, z + 20, Block2, 0, 3); - world.setBlock(x + 21, y + 14, z + 20, Blocks.iron_bars, 0, 3); + world.setBlock(x + 21, y + 14, z + 20, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 14, z + 21, Block2, 0, 3); - world.setBlock(x + 21, y + 14, z + 21, Blocks.iron_bars, 0, 3); + world.setBlock(x + 21, y + 14, z + 21, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 14, z + 22, Block2, 0, 3); world.setBlock(x + 13, y + 14, z + 22, Block2, 0, 3); world.setBlock(x + 14, y + 14, z + 22, Block2, 0, 3); world.setBlock(x + 19, y + 14, z + 22, Block2, 0, 3); - world.setBlock(x + 20, y + 14, z + 22, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 14, z + 22, Blocks.iron_bars, 0, 3); - world.setBlock(x + 7, y + 14, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 20, y + 14, z + 22, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 14, z + 22, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 7, y + 14, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 13, y + 14, z + 23, Block2, 0, 3); world.setBlock(x + 14, y + 14, z + 23, Block2, 0, 3); world.setBlock(x + 19, y + 14, z + 23, Block2, 0, 3); - world.setBlock(x + 7, y + 14, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 14, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 13, y + 14, z + 24, Block2, 0, 3); world.setBlock(x + 14, y + 14, z + 24, Block2, 0, 3); world.setBlock(x + 19, y + 14, z + 24, Block2, 0, 3); world.setBlock(x + 19, y + 14, z + 25, Block2, 0, 3); - world.setBlock(x + 5, y + 14, z + 26, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 14, z + 26, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 19, y + 14, z + 26, Block2, 0, 3); - world.setBlock(x + 5, y + 14, z + 27, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 14, z + 27, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 14, z + 27, Block2, 0, 3); world.setBlock(x + 16, y + 14, z + 27, Blocks.chest, 2, 3); world.setBlockMetadataWithNotify(x + 16, y + 14, z + 27, 3, 3); WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(2), (TileEntityChest)world.getTileEntity(x + 16, y + 14, z + 27), 8); world.setBlock(x + 19, y + 14, z + 27, Block2, 0, 3); - world.setBlock(x + 5, y + 14, z + 28, Blocks.iron_bars, 0, 3); - world.setBlock(x + 6, y + 14, z + 28, Blocks.iron_bars, 0, 3); + world.setBlock(x + 5, y + 14, z + 28, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 6, y + 14, z + 28, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 14, z + 28, Block2, 0, 3); world.setBlock(x + 8, y + 14, z + 28, Block2, 0, 3); world.setBlock(x + 9, y + 14, z + 28, Block2, 0, 3); @@ -1074,17 +1074,17 @@ public class Satellite extends WorldGenerator world.setBlock(x + 21, y + 15, z + 18, Block2, 0, 3); world.setBlock(x + 7, y + 15, z + 19, Block2, 0, 3); world.setBlock(x + 19, y + 15, z + 19, Block2, 0, 3); - world.setBlock(x + 21, y + 15, z + 19, Blocks.iron_bars, 0, 3); + world.setBlock(x + 21, y + 15, z + 19, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 15, z + 20, Block2, 0, 3); - world.setBlock(x + 21, y + 15, z + 20, Blocks.iron_bars, 0, 3); + world.setBlock(x + 21, y + 15, z + 20, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 15, z + 21, Block2, 0, 3); world.setBlock(x + 7, y + 15, z + 22, Block2, 0, 3); world.setBlock(x + 14, y + 15, z + 22, Block6, 4, 3); world.setBlock(x + 19, y + 15, z + 22, Block2, 0, 3); - world.setBlock(x + 7, y + 15, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 15, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 14, y + 15, z + 23, Block6, 4, 3); world.setBlock(x + 19, y + 15, z + 23, Block2, 0, 3); - world.setBlock(x + 7, y + 15, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 15, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 14, y + 15, z + 24, Block3, 5, 3); world.setBlock(x + 19, y + 15, z + 24, Block2, 0, 3); world.setBlock(x + 19, y + 15, z + 25, Block2, 0, 3); @@ -1141,19 +1141,19 @@ public class Satellite extends WorldGenerator world.setBlock(x + 17, y + 16, z + 18, Block2, 0, 3); world.setBlock(x + 18, y + 16, z + 18, Block2, 0, 3); world.setBlock(x + 19, y + 16, z + 18, Block2, 0, 3); - world.setBlock(x + 21, y + 16, z + 18, Blocks.iron_bars, 0, 3); + world.setBlock(x + 21, y + 16, z + 18, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 16, z + 19, Block2, 0, 3); world.setBlock(x + 19, y + 16, z + 19, Block2, 0, 3); - world.setBlock(x + 21, y + 16, z + 19, Blocks.iron_bars, 0, 3); + world.setBlock(x + 21, y + 16, z + 19, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 16, z + 20, Block2, 0, 3); world.setBlock(x + 19, y + 16, z + 20, Block2, 0, 3); world.setBlock(x + 7, y + 16, z + 21, Block2, 0, 3); world.setBlock(x + 19, y + 16, z + 21, Block2, 0, 3); world.setBlock(x + 7, y + 16, z + 22, Block2, 0, 3); world.setBlock(x + 19, y + 16, z + 22, Block2, 0, 3); - world.setBlock(x + 7, y + 16, z + 23, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 16, z + 23, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 19, y + 16, z + 23, Block2, 0, 3); - world.setBlock(x + 7, y + 16, z + 24, Blocks.iron_bars, 0, 3); + world.setBlock(x + 7, y + 16, z + 24, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 14, y + 16, z + 24, Block3, 5, 3); world.setBlock(x + 19, y + 16, z + 24, Block2, 0, 3); world.setBlock(x + 19, y + 16, z + 25, Block2, 0, 3); @@ -1250,10 +1250,10 @@ public class Satellite extends WorldGenerator world.setBlock(x + 20, y + 17, z + 16, Block2, 0, 3); world.setBlock(x + 21, y + 17, z + 16, Block2, 0, 3); world.setBlock(x + 22, y + 17, z + 16, Block2, 0, 3); - world.setBlock(x + 19, y + 17, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 17, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 17, z + 18, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 17, z + 18, Blocks.iron_bars, 0, 3); + world.setBlock(x + 19, y + 17, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 17, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 17, z + 18, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 17, z + 18, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 7, y + 17, z + 19, Block2, 0, 3); world.setBlock(x + 8, y + 17, z + 19, Block2, 0, 3); world.setBlock(x + 9, y + 17, z + 19, Block2, 0, 3); @@ -1371,60 +1371,60 @@ public class Satellite extends WorldGenerator world.setBlock(x + 17, y + 17, z + 27, Block2, 0, 3); world.setBlock(x + 18, y + 17, z + 27, Block2, 0, 3); world.setBlock(x + 19, y + 17, z + 27, Block2, 0, 3); - world.setBlock(x + 16, y + 18, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 17, y + 18, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 18, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 18, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 20, y + 18, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 18, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 18, z + 8, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 18, z + 9, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 18, z + 9, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 18, z + 9, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 18, z + 9, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 18, z + 10, Blocks.iron_bars, 0, 3); + world.setBlock(x + 16, y + 18, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 17, y + 18, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 18, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 18, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 20, y + 18, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 18, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 18, z + 8, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 18, z + 9, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 18, z + 9, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 18, z + 9, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 18, z + 9, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 18, z + 10, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 18, y + 18, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 18, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 18, z + 10, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 23, y + 18, z + 10, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 18, z + 11, Blocks.iron_bars, 0, 3); + world.setBlock(x + 23, y + 18, z + 10, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 18, z + 11, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 17, y + 18, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 18, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 18, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 18, z + 11, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 21, y + 18, z + 11, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 23, y + 18, z + 11, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 18, z + 12, Blocks.iron_bars, 0, 3); + world.setBlock(x + 23, y + 18, z + 11, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 18, z + 12, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 17, y + 18, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 18, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 18, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 18, z + 12, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 21, y + 18, z + 12, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 23, y + 18, z + 12, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 18, z + 13, Blocks.iron_bars, 0, 3); + world.setBlock(x + 23, y + 18, z + 12, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 18, z + 13, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 17, y + 18, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 18, y + 18, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 18, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 18, z + 13, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 21, y + 18, z + 13, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 23, y + 18, z + 13, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 18, z + 14, Blocks.iron_bars, 0, 3); + world.setBlock(x + 23, y + 18, z + 13, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 18, z + 14, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 18, y + 18, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 18, z + 14, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 18, z + 14, Library.getRandomConcrete(), 0, 3); - world.setBlock(x + 23, y + 18, z + 14, Blocks.iron_bars, 0, 3); - world.setBlock(x + 15, y + 18, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 18, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 18, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 23, y + 18, z + 15, Blocks.iron_bars, 0, 3); - world.setBlock(x + 16, y + 18, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 17, y + 18, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 18, y + 18, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 18, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 18, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 22, y + 18, z + 16, Blocks.iron_bars, 0, 3); - world.setBlock(x + 19, y + 18, z + 17, Blocks.iron_bars, 0, 3); - world.setBlock(x + 21, y + 18, z + 17, Blocks.iron_bars, 0, 3); + world.setBlock(x + 23, y + 18, z + 14, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 15, y + 18, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 18, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 18, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 23, y + 18, z + 15, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 16, y + 18, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 17, y + 18, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 18, y + 18, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 18, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 18, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 22, y + 18, z + 16, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 19, y + 18, z + 17, ModBlocks.fence_metal, 0, 3); + world.setBlock(x + 21, y + 18, z + 17, ModBlocks.fence_metal, 0, 3); world.setBlock(x + 18, y + 19, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 19, y + 19, z + 10, Library.getRandomConcrete(), 0, 3); world.setBlock(x + 20, y + 19, z + 10, Library.getRandomConcrete(), 0, 3);