From 66893363c7ba900a124272e4c4a613e7bad7eab8 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 23 Oct 2018 22:51:34 +0200 Subject: [PATCH] barbed wire, drill fixes, IF recipes, new textures --- assets/hbm/lang/de_DE.lang | 4 +- assets/hbm/lang/en_US.lang | 4 +- assets/hbm/sounds.json | 3 + assets/hbm/sounds/tool/extract1.ogg | Bin 0 -> 7029 bytes assets/hbm/sounds/tool/extract2.ogg | Bin 0 -> 7302 bytes assets/hbm/sounds/tool/radaway.ogg | Bin 0 -> 18764 bytes assets/hbm/sounds/tool/stim.ogg | Bin 0 -> 12003 bytes assets/hbm/textures/blocks/barbed_wire.png | Bin 0 -> 219 bytes .../textures/blocks/machine_centrifuge.png | Bin 305 -> 258 bytes .../hbm/textures/items/centrifuge_element.png | Bin 215 -> 206 bytes .../hbm/textures/items/centrifuge_tower.png | Bin 238 -> 185 bytes com/hbm/blocks/ModBlocks.java | 7 + com/hbm/blocks/generic/BarbedWire.java | 44 +++++ com/hbm/inventory/MachineRecipes.java | 7 +- com/hbm/items/special/ItemStarterKit.java | 6 +- com/hbm/items/special/ItemSyringe.java | 17 ++ com/hbm/items/weapon/ItemGrenade.java | 3 +- com/hbm/main/CraftingManager.java | 17 ++ com/hbm/packet/TEDrillPacket.java | 7 +- .../machine/TileEntityMachineMiningDrill.java | 20 ++- com/hbm/world/DesertAtom002.java | 112 ++++++------- com/hbm/world/DesertAtom003.java | 156 +++++++++--------- com/hbm/world/Relay.java | 74 ++++----- 23 files changed, 294 insertions(+), 187 deletions(-) create mode 100644 assets/hbm/sounds/tool/extract1.ogg create mode 100644 assets/hbm/sounds/tool/extract2.ogg create mode 100644 assets/hbm/sounds/tool/radaway.ogg create mode 100644 assets/hbm/sounds/tool/stim.ogg create mode 100644 assets/hbm/textures/blocks/barbed_wire.png create mode 100644 com/hbm/blocks/generic/BarbedWire.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 3b329b4cc..fb4a03d27 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -692,6 +692,8 @@ tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel tile.gravel_obsidian.name=Gebrochener Obsidian +tile.barbed_wire.name=Stacheldraht + tile.seal_frame.name=Siloluke (Rahmen) tile.seal_controller.name=Silolukenöffner tile.seal_hatch.name=Siloluke (Deckel) @@ -1091,7 +1093,7 @@ item.grenade_if_concussion.name=IF - Erschütterungsgranate item.grenade_if_brimstone.name=IF - Werfbare Brimstone-Mine item.grenade_if_mystery.name=IF - M.-Granate item.grenade_if_spark.name=IF - S.-Granate -item.grenade_if_hopwire.name=IF - Schwarzes Loch Hopwire +item.grenade_if_hopwire.name=IF - Vortex Hopwire item.grenade_if_null.name=IF - Null-Granate item.rod_uranium_fuel.name=Urankernbrennstoffzelle diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 1f0be5ea0..392925c41 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -692,6 +692,8 @@ tile.cmb_brick_reinforced.name=Reinforced CMB Bricks tile.gravel_obsidian.name=Crushed Obsidian +tile.barbed_wire.name=Barbed Wire + tile.seal_frame.name=Silo Hatch Frame tile.seal_controller.name=Silo Hatch Opener tile.seal_hatch.name=Silo Hatch @@ -1091,7 +1093,7 @@ item.grenade_if_concussion.name=IF - Concussion Grenade item.grenade_if_brimstone.name=IF - Tossable Brimstone Mine item.grenade_if_mystery.name=IF - M.-Grenade item.grenade_if_spark.name=IF - S.-Grenade -item.grenade_if_hopwire.name=IF - Black Hole Hopwire +item.grenade_if_hopwire.name=IF - Vortex Hopwire item.grenade_if_null.name=IF - Null Grenade item.rod_uranium_fuel.name=Uranium Fuel Rod diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 5ff8a2c2b..5b7412318 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -39,6 +39,9 @@ "item.pinBreak": {"category": "player", "sounds": [{"name": "tool/pinBreak", "stream": false}]}, "item.gasmaskScrew": {"category": "player", "sounds": [{"name": "tool/gasmaskScrew", "stream": false}]}, "item.jetpackTank": {"category": "player", "sounds": [{"name": "tool/jetpackTank", "stream": false}]}, + "item.unpack": {"category": "player", "sounds": ["tool/extract1", "tool/extract2"]}, + "item.syringe": {"category": "player", "sounds": [{"name": "tool/stim", "stream": false}]}, + "item.radaway": {"category": "player", "sounds": [{"name": "tool/radaway", "stream": false}]}, "music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]}, "music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]}, diff --git a/assets/hbm/sounds/tool/extract1.ogg b/assets/hbm/sounds/tool/extract1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b91acf1bda845bebc04d88d1334b930d6674e3c3 GIT binary patch literal 7029 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�nx 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 P$ZO`vTtGnw0tfyF*kgb& literal 0 HcmV?d00001 diff --git a/assets/hbm/sounds/tool/extract2.ogg b/assets/hbm/sounds/tool/extract2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..efcd35c37ef266f3d1e0d97e1c07950bef69e704 GIT binary patch literal 7302 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 ezZc9na$WUg?VLuG=X6jcN+eeYCsS+ZzXeDD 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 z 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 Q5zuuEp00i_>zopr0AE&BWdHyG literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/machine_centrifuge.png b/assets/hbm/textures/blocks/machine_centrifuge.png index 85118da5ad6d7ec18078c00a0a38e99c64ebbcbe..9bbd7b39719d326d69b213413c5f24bd330b8975 100644 GIT binary patch delta 229 zcmVOpTh|gzTw0xJZ80$V-m=NhsAz|#X}DO#eds4VZ6VVC)UmZTog~| z2QJqqbcoo%hBfDmd7i;9>kVvJ_X5NU-Ozpt5I1at+JJSunrRB!-UWm+6)e(TfVDw4 zj{>^rfxlls8>Hx*gVuXr)Qhx>EX5d+QYy;(tAGWB5XvHhehQ!xB3IdEaS!Qi@?Y3x b0K*$f;_xxf77j@h00000NkvXXu0mjfWa4ee diff --git a/assets/hbm/textures/items/centrifuge_element.png b/assets/hbm/textures/items/centrifuge_element.png index 7a4a24dccbf92ebc0b0d41793db4353c26b45bbb..b18865aabbb6bdde0b5abf7a614e4afb66754348 100644 GIT binary patch delta 162 zcmV;T0A2sr0nP!CG=GIjL_t(Ijop*M4MHIhL`UO+ga#dv0Nj3|7lMur6-p^I%pan6;nR7-d1tgJDdfGi|f?6v`qW6w5hPvRS z1a?h^PW}L2C^pAtE68zTj2R)DBRs! QegFUf07*qoM6N<$g7f1PjVGc((Gv2ufp3^PrfSXED zx4zBr^qB>?nMZVyb3WeZ*4nf?JwNd`@XZTD`Sk0*zLfXd={P^|E^vp1KX9W00000 LNkvXXu0mjfuZKKo delta 210 zcmdnV_>OUcNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLi4xa{lHmNblJdl&REC1Y%)Ao4ywnl}6Fmbx)6`a@RG^x8PZ!4!3;*OF|Nq;& zN~~7kc|H64U-RwrSyGrpnHV?8@Fa_}Bt~AH_TM|JYVQAuya(Ghay5Ne6S?_c{*4U} z?R(s&wAU|j$9&$ { @@ -55,6 +59,7 @@ public class TEDrillPacket implements IMessage { TileEntityMachineMiningDrill gen = (TileEntityMachineMiningDrill) te; gen.rotation = m.spin; + gen.torque = m.torque; } return null; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java index c2c2f5643..45afedf1c 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java +++ b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java @@ -464,7 +464,7 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn if(rotation >= 360) rotation -= 360; - PacketDispatcher.wrapper.sendToAll(new TEDrillPacket(xCoord, yCoord, zCoord, rotation)); + PacketDispatcher.wrapper.sendToAll(new TEDrillPacket(xCoord, yCoord, zCoord, rotation, torque)); PacketDispatcher.wrapper.sendToAll(new LoopedSoundPacket(xCoord, yCoord, zCoord)); PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); } @@ -528,7 +528,7 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn //"ok" public boolean isOreo(int x, int y, int z) { - Block b = worldObj.getBlock(x, y, z); + /*Block b = worldObj.getBlock(x, y, z); int meta = worldObj.getBlockMetadata(x, y, z); if(b == Blocks.air || b == Blocks.grass || b == Blocks.dirt || @@ -545,14 +545,17 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn if(s.length() > 3 && s.substring(0, 3).equals("ore")) return true; - } + }*/ - return false; + Block b = worldObj.getBlock(x, y, z); + float hardness = b.getBlockHardness(worldObj, x, y, z); + + return hardness < 70 && hardness >= 0; } public boolean isMinableOreo(int x, int y, int z) { - Block b = worldObj.getBlock(x, y, z); + /*Block b = worldObj.getBlock(x, y, z); int meta = worldObj.getBlockMetadata(x, y, z); if(b == Blocks.grass || b == Blocks.dirt || @@ -571,7 +574,12 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn return true; } - return false; + return false;*/ + + Block b = worldObj.getBlock(x, y, z); + float hardness = b.getBlockHardness(worldObj, x, y, z); + + return hardness < 70 && hardness >= 0; } /** diff --git a/com/hbm/world/DesertAtom002.java b/com/hbm/world/DesertAtom002.java index 715023eaa..80136dc36 100644 --- a/com/hbm/world/DesertAtom002.java +++ b/com/hbm/world/DesertAtom002.java @@ -2353,57 +2353,57 @@ public class DesertAtom002 world.setBlock(x + 15, y + 2, z + 33, Blocks.iron_bars, 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, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 3, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 4, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 5, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 6, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 7, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 8, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 9, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 10, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 11, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 12, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 13, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 14, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 15, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 16, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 17, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 18, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 19, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 20, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 21, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 22, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 23, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 24, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 25, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 26, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 27, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 28, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 29, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 30, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 31, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 32, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 33, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 34, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 35, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 36, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 37, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 38, y + 3, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 39, y + 3, z + 0, Blocks.web, 0, 3); + world.setBlock(x + 1, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 3, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 4, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 5, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 6, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 7, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 8, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 9, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 10, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 11, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 12, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 13, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 14, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 15, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 16, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 17, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 18, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 19, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 20, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 21, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 22, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 23, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 24, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 25, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 26, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 27, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 28, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 29, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 30, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 31, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 32, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 33, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 34, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 35, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 36, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 37, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 38, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 39, y + 3, z + 0, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 40, y + 3, z + 0, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 1, Blocks.web, 0, 3); - world.setBlock(x + 40, y + 3, z + 1, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 2, Blocks.web, 0, 3); - world.setBlock(x + 40, y + 3, z + 2, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 3, Blocks.web, 0, 3); - world.setBlock(x + 40, y + 3, z + 3, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 4, Blocks.web, 0, 3); - world.setBlock(x + 40, y + 3, z + 4, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 5, Blocks.web, 0, 3); - world.setBlock(x + 40, y + 3, z + 5, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 6, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 1, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 40, y + 3, z + 1, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 2, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 40, y + 3, z + 2, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 3, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 40, y + 3, z + 3, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 4, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 40, y + 3, z + 4, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 5, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 40, y + 3, z + 5, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 6, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 16, y + 3, z + 6, Block1, 0, 3); world.setBlock(x + 17, y + 3, z + 6, Block1, 0, 3); world.setBlock(x + 18, y + 3, z + 6, Block1, 0, 3); @@ -2427,7 +2427,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 3, z + 6, Block1, 0, 3); world.setBlock(x + 37, y + 3, z + 6, Block1, 0, 3); world.setBlock(x + 40, y + 3, z + 6, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 7, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 7, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 7, y + 3, z + 7, Block8, 2, 3); world.setBlock(x + 9, y + 3, z + 7, Block8, 2, 3); world.setBlock(x + 16, y + 3, z + 7, Block1, 0, 3); @@ -2453,7 +2453,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 3, z + 7, Block6, 0, 3); world.setBlock(x + 37, y + 3, z + 7, Block1, 0, 3); world.setBlock(x + 40, y + 3, z + 7, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 8, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 8, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 6, y + 3, z + 8, Block5, 0, 3); world.setBlock(x + 7, y + 3, z + 8, Block5, 0, 3); world.setBlock(x + 8, y + 3, z + 8, Block5, 0, 3); @@ -2482,7 +2482,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 3, z + 8, Block6, 0, 3); world.setBlock(x + 37, y + 3, z + 8, Block1, 0, 3); world.setBlock(x + 40, y + 3, z + 8, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 9, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 9, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 5, y + 3, z + 9, Block5, 0, 3); world.setBlock(x + 6, y + 3, z + 9, Block5, 0, 3); world.setBlock(x + 7, y + 3, z + 9, Block5, 0, 3); @@ -2513,7 +2513,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 3, z + 9, Block6, 0, 3); world.setBlock(x + 37, y + 3, z + 9, Block1, 0, 3); world.setBlock(x + 40, y + 3, z + 9, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 10, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 10, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 10, Block5, 0, 3); world.setBlock(x + 5, y + 3, z + 10, Block5, 0, 3); world.setBlock(x + 6, y + 3, z + 10, Block5, 0, 3); @@ -2544,7 +2544,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 3, z + 10, Block6, 0, 3); world.setBlock(x + 37, y + 3, z + 10, Block1, 0, 3); world.setBlock(x + 40, y + 3, z + 10, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 11, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 11, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 11, Block5, 0, 3); world.setBlock(x + 5, y + 3, z + 11, Block5, 0, 3); world.setBlock(x + 6, y + 3, z + 11, Blocks.water, 0, 3); @@ -2575,7 +2575,7 @@ public class DesertAtom002 world.setBlock(x + 36, y + 3, z + 11, Block6, 0, 3); world.setBlock(x + 37, y + 3, z + 11, Block1, 0, 3); world.setBlock(x + 40, y + 3, z + 11, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 12, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 12, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 12, Block5, 0, 3); world.setBlock(x + 5, y + 3, z + 12, Block5, 0, 3); world.setBlock(x + 6, y + 3, z + 12, Block5, 0, 3); diff --git a/com/hbm/world/DesertAtom003.java b/com/hbm/world/DesertAtom003.java index 2516195d3..305fc6057 100644 --- a/com/hbm/world/DesertAtom003.java +++ b/com/hbm/world/DesertAtom003.java @@ -69,8 +69,8 @@ public class DesertAtom003 world.setBlock(x + 35, y + 3, z + 12, Block6, 0, 3); world.setBlock(x + 36, y + 3, z + 12, Block18, 0, 3); world.setBlock(x + 37, y + 3, z + 12, Block1, 0, 3); - world.setBlock(x + 40, y + 3, z + 12, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 13, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 12, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 13, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 13, Block5, 0, 3); world.setBlock(x + 5, y + 3, z + 13, Block5, 0, 3); world.setBlock(x + 6, y + 3, z + 13, Blocks.water, 0, 3); @@ -100,8 +100,8 @@ public class DesertAtom003 world.setBlock(x + 35, y + 3, z + 13, Block18, 0, 3); world.setBlock(x + 36, y + 3, z + 13, Block18, 0, 3); world.setBlock(x + 37, y + 3, z + 13, Block1, 0, 3); - world.setBlock(x + 40, y + 3, z + 13, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 14, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 13, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 14, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 14, Block5, 0, 3); world.setBlock(x + 5, y + 3, z + 14, Block5, 0, 3); world.setBlock(x + 6, y + 3, z + 14, Block5, 0, 3); @@ -132,8 +132,8 @@ public class DesertAtom003 world.setBlock(x + 35, y + 3, z + 14, Block18, 0, 3); world.setBlock(x + 36, y + 3, z + 14, Block18, 0, 3); world.setBlock(x + 37, y + 3, z + 14, Block1, 0, 3); - world.setBlock(x + 40, y + 3, z + 14, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 15, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 14, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 15, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 5, y + 3, z + 15, Block5, 0, 3); world.setBlock(x + 6, y + 3, z + 15, Block5, 0, 3); world.setBlock(x + 7, y + 3, z + 15, Block5, 0, 3); @@ -162,8 +162,8 @@ public class DesertAtom003 world.setBlock(x + 34, y + 3, z + 15, Block18, 0, 3); world.setBlock(x + 35, y + 3, z + 15, Block18, 0, 3); world.setBlock(x + 37, y + 3, z + 15, Block1, 0, 3); - world.setBlock(x + 40, y + 3, z + 15, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 16, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 15, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 16, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 6, y + 3, z + 16, Block5, 0, 3); world.setBlock(x + 7, y + 3, z + 16, Block5, 0, 3); world.setBlock(x + 8, y + 3, z + 16, Block5, 0, 3); @@ -189,8 +189,8 @@ public class DesertAtom003 world.setBlock(x + 33, y + 3, z + 16, Block18, 0, 3); world.setBlock(x + 34, y + 3, z + 16, Blocks.vine, 4, 3); world.setBlock(x + 37, y + 3, z + 16, Block1, 0, 3); - world.setBlock(x + 40, y + 3, z + 16, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 17, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 16, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 17, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 16, y + 3, z + 17, Block1, 0, 3); world.setBlock(x + 17, y + 3, z + 17, Block6, 0, 3); world.setBlock(x + 18, y + 3, z + 17, Block6, 0, 3); @@ -211,8 +211,8 @@ public class DesertAtom003 world.setBlock(x + 33, y + 3, z + 17, Block18, 0, 3); world.setBlock(x + 34, y + 3, z + 17, Block18, 0, 3); world.setBlock(x + 35, y + 3, z + 17, Blocks.vine, 2, 3); - world.setBlock(x + 40, y + 3, z + 17, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 18, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 17, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 18, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 16, y + 3, z + 18, Block1, 0, 3); world.setBlock(x + 17, y + 3, z + 18, Block1, 0, 3); world.setBlock(x + 18, y + 3, z + 18, Block1, 0, 3); @@ -234,107 +234,107 @@ public class DesertAtom003 world.setBlock(x + 34, y + 3, z + 18, Block1, 0, 3); world.setBlock(x + 35, y + 3, z + 18, Blocks.gravel, 0, 3); world.setBlock(x + 36, y + 3, z + 18, Blocks.gravel, 0, 3); - world.setBlock(x + 40, y + 3, z + 18, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 19, Blocks.web, 0, 3); - world.setBlock(x + 40, y + 3, z + 19, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 20, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 18, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 19, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 40, y + 3, z + 19, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 20, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 6, y + 3, z + 20, Block15, 0, 3); world.setBlock(x + 7, y + 3, z + 20, Block15, 0, 3); world.setBlock(x + 8, y + 3, z + 20, Block15, 0, 3); world.setBlock(x + 9, y + 3, z + 20, Block15, 0, 3); world.setBlock(x + 10, y + 3, z + 20, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 20, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 21, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 20, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 21, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 21, Block15, 0, 3); world.setBlock(x + 5, y + 3, z + 21, Block15, 0, 3); world.setBlock(x + 11, y + 3, z + 21, Block15, 0, 3); world.setBlock(x + 12, y + 3, z + 21, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 21, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 22, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 21, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 22, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 22, Block15, 0, 3); world.setBlock(x + 12, y + 3, z + 22, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 22, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 23, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 22, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 23, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 3, y + 3, z + 23, Block15, 0, 3); world.setBlock(x + 13, y + 3, z + 23, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 23, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 24, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 23, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 24, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 3, y + 3, z + 24, Block15, 0, 3); world.setBlock(x + 13, y + 3, z + 24, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 24, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 25, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 24, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 25, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 3, y + 3, z + 25, Block15, 0, 3); world.setBlock(x + 13, y + 3, z + 25, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 25, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 26, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 25, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 26, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 3, y + 3, z + 26, Block15, 0, 3); world.setBlock(x + 13, y + 3, z + 26, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 26, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 27, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 26, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 27, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 3, y + 3, z + 27, Block15, 0, 3); world.setBlock(x + 13, y + 3, z + 27, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 27, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 28, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 27, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 28, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 28, Block15, 0, 3); world.setBlock(x + 12, y + 3, z + 28, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 28, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 29, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 28, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 29, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 3, z + 29, Block15, 0, 3); world.setBlock(x + 5, y + 3, z + 29, Block15, 0, 3); world.setBlock(x + 11, y + 3, z + 29, Block15, 0, 3); world.setBlock(x + 12, y + 3, z + 29, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 29, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 30, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 29, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 30, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 6, y + 3, z + 30, Block15, 0, 3); world.setBlock(x + 7, y + 3, z + 30, Block15, 0, 3); world.setBlock(x + 8, y + 3, z + 30, Block15, 0, 3); world.setBlock(x + 9, y + 3, z + 30, Block15, 0, 3); world.setBlock(x + 10, y + 3, z + 30, Block15, 0, 3); - world.setBlock(x + 40, y + 3, z + 30, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 3, z + 31, Blocks.web, 0, 3); + world.setBlock(x + 40, y + 3, z + 30, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 16, y + 3, z + 31, Block5, 0, 3); - world.setBlock(x + 17, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 18, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 19, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 20, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 21, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 22, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 23, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 24, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 25, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 26, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 27, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 28, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 29, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 30, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 31, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 32, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 33, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 34, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 35, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 36, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 37, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 38, y + 3, z + 31, Blocks.web, 0, 3); - world.setBlock(x + 39, y + 3, z + 31, Blocks.web, 0, 3); + world.setBlock(x + 17, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 18, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 19, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 20, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 21, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 22, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 23, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 24, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 25, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 26, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 27, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 28, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 29, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 30, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 31, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 32, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 33, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 34, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 35, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 36, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 37, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 38, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 39, y + 3, z + 31, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 40, y + 3, z + 31, Block5, 0, 3); - world.setBlock(x + 0, y + 3, z + 32, Blocks.web, 0, 3); - world.setBlock(x + 16, y + 3, z + 32, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 3, z + 32, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 16, y + 3, z + 32, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 0, y + 3, z + 33, Block5, 0, 3); - world.setBlock(x + 1, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 3, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 4, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 5, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 6, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 7, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 8, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 9, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 10, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 11, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 12, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 13, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 14, y + 3, z + 33, Blocks.web, 0, 3); - world.setBlock(x + 15, y + 3, z + 33, Blocks.web, 0, 3); + world.setBlock(x + 1, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 3, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 4, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 5, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 6, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 7, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 8, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 9, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 10, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 11, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 12, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 13, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 14, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 15, y + 3, z + 33, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 16, y + 3, z + 33, Block5, 0, 3); world.setBlock(x + 16, y + 4, z + 6, Block1, 0, 3); world.setBlock(x + 17, y + 4, z + 6, Block1, 0, 3); diff --git a/com/hbm/world/Relay.java b/com/hbm/world/Relay.java index b9d00fa58..952a57911 100644 --- a/com/hbm/world/Relay.java +++ b/com/hbm/world/Relay.java @@ -784,56 +784,56 @@ public class Relay extends WorldGenerator world.setBlock(x + 9, y + 1, z + 15, Blocks.iron_bars, 0, 3); world.setBlock(x + 10, y + 1, z + 15, Block3, 0, 3); world.setBlock(x + 2, y + 2, z + 0, Block3, 0, 3); - world.setBlock(x + 3, y + 2, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 4, y + 2, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 5, y + 2, z + 0, Blocks.web, 0, 3); + world.setBlock(x + 3, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 4, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 5, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 6, y + 2, z + 0, Blocks.anvil, 3, 3); - world.setBlock(x + 7, y + 2, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 8, y + 2, z + 0, Blocks.web, 0, 3); - world.setBlock(x + 9, y + 2, z + 0, Blocks.web, 0, 3); + world.setBlock(x + 7, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 8, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 9, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 10, y + 2, z + 0, Block3, 0, 3); - world.setBlock(x + 2, y + 2, z + 1, Blocks.web, 0, 3); - world.setBlock(x + 10, y + 2, z + 1, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 2, z + 2, Blocks.web, 0, 3); + world.setBlock(x + 2, y + 2, z + 1, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 10, y + 2, z + 1, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 2, z + 2, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 5, y + 2, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 2, z + 2, Block2, 0, 3); world.setBlock(x + 7, y + 2, z + 2, Block4, 3, 3); - world.setBlock(x + 10, y + 2, z + 2, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 2, z + 3, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 2, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 2, z + 3, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 2, z + 3, Block4, 5, 3); world.setBlock(x + 5, y + 2, z + 3, Block2, 0, 3); world.setBlock(x + 6, y + 2, z + 3, Block2, 0, 3); world.setBlock(x + 7, y + 2, z + 3, Block2, 0, 3); world.setBlock(x + 8, y + 2, z + 3, Block4, 4, 3); - world.setBlock(x + 10, y + 2, z + 3, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 2, z + 4, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 3, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 2, z + 4, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 2, z + 4, Block2, 0, 3); world.setBlock(x + 5, y + 2, z + 4, Block2, 0, 3); world.setBlock(x + 6, y + 2, z + 4, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 7, y + 2, z + 4, Block2, 0, 3); world.setBlock(x + 8, y + 2, z + 4, Block2, 0, 3); - world.setBlock(x + 10, y + 2, z + 4, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 2, z + 5, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 4, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 2, z + 5, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 2, z + 5, Block4, 5, 3); world.setBlock(x + 5, y + 2, z + 5, Block2, 0, 3); world.setBlock(x + 6, y + 2, z + 5, Block2, 0, 3); world.setBlock(x + 7, y + 2, z + 5, Block2, 0, 3); world.setBlock(x + 8, y + 2, z + 5, Block4, 4, 3); - world.setBlock(x + 10, y + 2, z + 5, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 2, z + 6, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 5, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 2, z + 6, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 5, y + 2, z + 6, Block4, 2, 3); world.setBlock(x + 6, y + 2, z + 6, Block2, 0, 3); world.setBlock(x + 7, y + 2, z + 6, Block4, 2, 3); - world.setBlock(x + 10, y + 2, z + 6, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 6, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 0, y + 2, z + 7, Block3, 0, 3); - world.setBlock(x + 1, y + 2, z + 7, Blocks.web, 0, 3); + world.setBlock(x + 1, y + 2, z + 7, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 2, y + 2, z + 7, Block3, 0, 3); world.setBlock(x + 3, y + 2, z + 7, Blocks.iron_bars, 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, Blocks.web, 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); @@ -841,52 +841,52 @@ public class Relay extends WorldGenerator world.setBlock(x + 7, y + 2, z + 8, Block2, 0, 3); world.setBlock(x + 8, y + 2, z + 8, Block2, 0, 3); world.setBlock(x + 10, y + 2, z + 8, Blocks.anvil, 0, 3); - world.setBlock(x + 0, y + 2, z + 9, Blocks.web, 0, 3); + world.setBlock(x + 0, y + 2, z + 9, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 2, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 2, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 2, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 2, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 2, z + 9, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 2, z + 9, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 9, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 0, y + 2, z + 10, Block3, 0, 3); world.setBlock(x + 4, y + 2, z + 10, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 2, z + 10, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 2, z + 10, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 2, z + 10, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 2, z + 10, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 2, z + 10, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 10, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 2, z + 11, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 2, z + 11, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 2, z + 11, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 2, z + 11, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 2, z + 11, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 2, z + 11, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 11, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 0, y + 2, z + 12, Block3, 0, 3); world.setBlock(x + 4, y + 2, z + 12, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 2, z + 12, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 2, z + 12, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 2, z + 12, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 2, z + 12, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 2, z + 12, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 2, z + 13, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 12, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 2, z + 13, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 4, y + 2, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 5, y + 2, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 2, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 7, y + 2, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 8, y + 2, z + 13, Blocks.brick_block, 0, 3); - world.setBlock(x + 10, y + 2, z + 13, Blocks.web, 0, 3); - world.setBlock(x + 0, y + 2, z + 14, Blocks.web, 0, 3); - world.setBlock(x + 10, y + 2, z + 14, Blocks.web, 0, 3); + world.setBlock(x + 10, y + 2, z + 13, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 0, y + 2, z + 14, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 10, y + 2, z + 14, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 0, y + 2, z + 15, Block3, 0, 3); - world.setBlock(x + 1, y + 2, z + 15, Blocks.web, 0, 3); - world.setBlock(x + 2, y + 2, z + 15, Blocks.web, 0, 3); - world.setBlock(x + 3, y + 2, z + 15, Blocks.web, 0, 3); - world.setBlock(x + 4, y + 2, z + 15, Blocks.web, 0, 3); + world.setBlock(x + 1, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 2, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 3, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 4, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 5, y + 2, z + 15, Blocks.anvil, 1, 3); - world.setBlock(x + 6, y + 2, z + 15, Blocks.web, 0, 3); - world.setBlock(x + 7, y + 2, z + 15, Blocks.web, 0, 3); - world.setBlock(x + 8, y + 2, z + 15, Blocks.web, 0, 3); - world.setBlock(x + 9, y + 2, z + 15, Blocks.web, 0, 3); + world.setBlock(x + 6, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 7, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 8, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); + world.setBlock(x + 9, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3); world.setBlock(x + 10, y + 2, z + 15, Block3, 0, 3); world.setBlock(x + 5, y + 3, z + 2, Block4, 3, 3); world.setBlock(x + 6, y + 3, z + 2, Block2, 0, 3);