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 000000000..a850cc9d6 Binary files /dev/null and b/assets/hbm/textures/gui/dfc/gui_core.png differ 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 000000000..03d9a1bc6 Binary files /dev/null and b/assets/hbm/textures/gui/dfc/gui_emitter.png differ 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 000000000..058d5d664 Binary files /dev/null and b/assets/hbm/textures/gui/dfc/gui_receiver.png differ diff --git a/assets/hbm/textures/gui/fatManSchematic.png b/assets/hbm/textures/gui/fatManSchematic.png index f63d68579..bea1bf29d 100644 Binary files a/assets/hbm/textures/gui/fatManSchematic.png and b/assets/hbm/textures/gui/fatManSchematic.png differ diff --git a/assets/hbm/textures/items/man_core.png b/assets/hbm/textures/items/man_core.png index b33396451..9bdcea68c 100644 Binary files a/assets/hbm/textures/items/man_core.png and b/assets/hbm/textures/items/man_core.png differ diff --git a/assets/hbm/textures/items/man_core_alt.png b/assets/hbm/textures/items/man_core_alt.png new file mode 100644 index 000000000..b33396451 Binary files /dev/null and b/assets/hbm/textures/items/man_core_alt.png differ diff --git a/assets/hbm/textures/items/plutonium_core_new.png b/assets/hbm/textures/items/plutonium_core_new.png deleted file mode 100644 index 9bdcea68c..000000000 Binary files a/assets/hbm/textures/items/plutonium_core_new.png and /dev/null differ 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);