xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved some packages, new AMS gui textures

Browse Source
This commit is contained in:
HbmMods 2020-03-08 13:34:52 +01:00
parent 2a62876353
commit 2a205c6b9b
94 changed files with 1098 additions and 806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/hbm/lang/de_DE.lang
View File

@ -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)

9
assets/hbm/lang/en_US.lang
View File

@ -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

BIN
assets/hbm/textures/gui/dfc/gui_core.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/hbm/textures/gui/dfc/gui_emitter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
assets/hbm/textures/gui/dfc/gui_receiver.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/hbm/textures/gui/fatManSchematic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
assets/hbm/textures/items/man_core.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 381 B

BIN
assets/hbm/textures/items/man_core_alt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 275 B

BIN
assets/hbm/textures/items/plutonium_core_new.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 381 B

3
com/hbm/blocks/ModBlocks.java
View File

@ -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());

36
com/hbm/blocks/machine/CoreCore.java Normal file
View File

@ -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;
}
}

2
com/hbm/blocks/test/TestEventTester.java
View File

@ -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;

2
com/hbm/handler/GunConfiguration.java
View File

@ -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 {

2
com/hbm/handler/guncfg/Gun12GaugeFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/Gun20GaugeFactory.java
View File

@ -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;

2
com/hbm/handler/guncfg/Gun22LRFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/Gun357MagnumFactory.java
View File

@ -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;

2
com/hbm/handler/guncfg/Gun44MagnumFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/Gun50AEFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/Gun50BMGFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/Gun5mmFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/Gun9mmFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/GunFatmanFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/GunGaussFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/GunGrenadeFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/GunOSIPRFactory.java
View File

@ -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 {

2
com/hbm/handler/guncfg/GunRocketFactory.java
View File

@ -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;

2
com/hbm/interfaces/IHoldableWeapon.java
View File

@ -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 {

8
com/hbm/interfaces/Spaghetti.java Normal file
View File

@ -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();
}

6
com/hbm/inventory/gui/GUIMachineCompactLauncher.java
View File

@ -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;

4
com/hbm/inventory/gui/GUIMachineLaunchTable.java
View File

@ -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;

6
com/hbm/inventory/gui/GUIMachineMissileAssembly.java
View File

@ -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;

4
com/hbm/inventory/gui/GUISoyuzLauncher.java
View File

@ -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;

14
com/hbm/items/ModItems.java
View File

@ -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");

3
com/hbm/items/special/ItemDrop.java
View File

@ -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

2
com/hbm/items/special/ItemFuelRod.java
View File

@ -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) {

11
com/hbm/items/special/ItemRadioactive.java
View File

@ -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]");
}
}

2
com/hbm/items/weapon/GunFolly.java
View File

@ -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;

2
com/hbm/items/weapon/GunLacunae.java
View File

@ -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;

2
com/hbm/items/weapon/GunUZI.java
View File

@ -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;

2
com/hbm/items/weapon/ItemCustomMissile.java
View File

@ -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;

2
com/hbm/items/weapon/ItemGunBase.java
View File

@ -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;

2
com/hbm/items/weapon/ItemGunGauss.java
View File

@ -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;

2
com/hbm/items/weapon/ItemGunOSIPR.java
View File

@ -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;

4
com/hbm/main/ClientProxy.java
View File

@ -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.*;

4
com/hbm/main/MainRegistry.java
View File

@ -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.*;

6
com/hbm/main/ModEventHandlerClient.java
View File

@ -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;

2
com/hbm/main/ResourceManager.java
View File

@ -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;

12
com/hbm/packet/AuxGaugePacket.java
View File

@ -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;
}

6
com/hbm/render/entity/RenderMissileCustom.java
View File

@ -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;

2
com/hbm/render/entity/RenderTom.java
View File

@ -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;

6
com/hbm/render/item/ItemRenderMissile.java
View File

@ -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;

2
com/hbm/render/item/ItemRenderMissilePart.java
View File

@ -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;

4
com/hbm/render/item/ItemRenderTemplate.java
View File

@ -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;

2
com/hbm/render/util/HFRWavefrontObject.java → com/hbm/render/loader/HFRWavefrontObject.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.util;
package com.hbm.render.loader;
import java.io.BufferedReader;
import java.io.IOException;

2
com/hbm/render/util/HbmFace.java → com/hbm/render/loader/HbmFace.java
View File

@ -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;

2
com/hbm/render/util/HbmGroupObject.java → com/hbm/render/loader/HbmGroupObject.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.util;
package com.hbm.render.loader;
import java.util.ArrayList;

2
com/hbm/render/util/HbmModelObject.java → com/hbm/render/loader/HbmModelObject.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.util;
package com.hbm.render.loader;
import java.io.BufferedReader;
import java.io.IOException;

2
com/hbm/render/util/HmfController.java → com/hbm/render/loader/HmfController.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.util;
package com.hbm.render.loader;
public class HmfController {

2
com/hbm/render/util/HmfModelLoader.java → com/hbm/render/loader/HmfModelLoader.java
View File

@ -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;

2
com/hbm/render/util/RUVertice.java → com/hbm/render/loader/RUVertice.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.util;
package com.hbm.render.loader;
public class RUVertice {

2
com/hbm/render/util/S_Face.java → com/hbm/render/loader/S_Face.java
View File

@ -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;

2
com/hbm/render/util/S_GroupObject.java → com/hbm/render/loader/S_GroupObject.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.util;
package com.hbm.render.loader;
import java.util.ArrayList;

2
com/hbm/render/util/S_ModelCustom.java → com/hbm/render/loader/S_ModelCustom.java
View File

@ -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;

2
com/hbm/render/util/S_WavefrontObject.java → com/hbm/render/loader/S_WavefrontObject.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.util;
package com.hbm.render.loader;
import java.io.BufferedReader;
import java.io.IOException;

2
com/hbm/render/tileentity/RenderChemplant.java
View File

@ -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;

8
com/hbm/render/tileentity/RenderCompactLauncher.java
View File

@ -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;

2
com/hbm/render/tileentity/RenderDecoBlockAlt.java
View File

@ -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;

2
com/hbm/render/tileentity/RenderEPress.java
View File

@ -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;

8
com/hbm/render/tileentity/RenderLaunchTable.java
View File

@ -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;

6
com/hbm/render/tileentity/RenderMissileAssembly.java
View File

@ -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;

2
com/hbm/render/tileentity/RenderPress.java
View File

@ -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;

2
com/hbm/render/tileentity/RenderSoyuzLauncher.java
View File

@ -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;

2
com/hbm/render/tileentity/RenderTaint.java
View File

@ -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;

10
com/hbm/render/tileentity/RendererObjTester.java
View File

@ -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;

2
com/hbm/render/misc/BeamPronter.java → com/hbm/render/util/BeamPronter.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import java.util.Random;

2
com/hbm/render/misc/ErrorPronter.java → com/hbm/render/util/ErrorPronter.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import org.lwjgl.opengl.GL11;

2
com/hbm/render/misc/MissileMultipart.java → com/hbm/render/util/MissileMultipart.java
View File

@ -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;

2
com/hbm/render/misc/MissilePart.java → com/hbm/render/util/MissilePart.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import java.util.ArrayList;
import java.util.HashMap;

2
com/hbm/render/misc/MissilePronter.java → com/hbm/render/util/MissilePronter.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import org.lwjgl.opengl.GL11;

2
com/hbm/render/misc/RenderAccessoryUtility.java → com/hbm/render/util/RenderAccessoryUtility.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;

2
com/hbm/render/misc/RenderDecoItem.java → com/hbm/render/util/RenderDecoItem.java
View File

@ -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;

2
com/hbm/render/misc/RenderItemStack.java → com/hbm/render/util/RenderItemStack.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import org.lwjgl.opengl.GL11;

2
com/hbm/render/misc/RenderScreenOverlay.java → com/hbm/render/util/RenderScreenOverlay.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.CROSSHAIRS;

2
com/hbm/render/misc/SoyuzLauncherPronter.java → com/hbm/render/util/SoyuzLauncherPronter.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import org.lwjgl.opengl.GL11;

2
com/hbm/render/misc/SoyuzPronter.java → com/hbm/render/util/SoyuzPronter.java
View File

@ -1,4 +1,4 @@
package com.hbm.render.misc;
package com.hbm.render.util;
import org.lwjgl.opengl.GL11;

4
com/hbm/render/misc/TomPronter.java → com/hbm/render/util/TomPronter.java
View File

@ -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;

188
com/hbm/tileentity/TileEntityMachineBase.java Normal file
View File

@ -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);
}
}

23
com/hbm/tileentity/machine/TileEntityCore.java Normal file
View File

@ -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() {
}
}

4
com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java
View File

@ -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;

822
com/hbm/world/DesertAtom002.java
View File

File diff suppressed because it is too large Load Diff

90
com/hbm/world/DesertAtom003.java
View File

@ -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);

266
com/hbm/world/Relay.java
View File

@ -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);

208
com/hbm/world/Satellite.java
View File

@ -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);