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

even more fixes

Browse Source
This commit is contained in:
Boblet 2023-01-11 12:46:38 +01:00
parent fda5389ac2
commit 20535ed839
16 changed files with 395 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/blocks/ModBlocks.java
View File

@ -1436,7 +1436,7 @@ public class ModBlocks {
ore_cinnebar = new BlockOre(Material.rock).setBlockName("ore_cinnebar").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_cinnebar");
ore_coltan = new BlockOre(Material.rock).setBlockName("ore_coltan").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_coltan");
ore_bedrock_coltan = new BlockBedrockOre().setBlockName("ore_bedrock_coltan").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(1_000_000).setBlockTextureName(RefStrings.MODID + ":ore_bedrock_coltan");
ore_bedrock_coltan = new BlockBedrockOre().setBlockName("ore_bedrock_coltan").setCreativeTab(null).setBlockUnbreakable().setResistance(1_000_000).setBlockTextureName(RefStrings.MODID + ":ore_bedrock_coltan");
ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil");
ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty");

8
src/main/java/com/hbm/config/WorldConfig.java
View File

@ -38,6 +38,9 @@ public class WorldConfig {
public static int bedrockBoraxSpawn = 300;
public static int bedrockAsbestosSpawn = 300;
public static int bedrockNiobiumSpawn = 300;
public static int bedrockTitaniumSpawn = 400;
public static int bedrockTungstenSpawn = 300;
public static int bedrockGoldSpawn = 500;
public static int ironClusterSpawn = 4;
public static int titaniumClusterSpawn = 2;
@ -45,7 +48,6 @@ public class WorldConfig {
public static int copperClusterSpawn = 4;
public static int alexandriteSpawn = 100;
public static int hematiteSpawn = 2;
public static int malachiteSpawn = 1;
public static int netherUraniumuSpawn = 8;
@ -135,13 +137,15 @@ public class WorldConfig {
bedrockBoraxSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B02_bedrockBoraxSpawn", "Spawns a bedrock borax deposit every nTH chunk", 300);
bedrockAsbestosSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B03_bedrockAsbestosSpawn", "Spawns a bedrock asbestos deposit every nTH chunk", 300);
bedrockNiobiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B04_bedrockNiobiumSpawn", "Spawns a bedrock niobium deposit every nTH chunk", 300);
bedrockTitaniumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B05_bedrockTitaniumSpawn", "Spawns a bedrock titanium deposit every nTH chunk", 500);
bedrockTungstenSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B06_bedrockTungstenSpawn", "Spawns a bedrock tungsten deposit every nTH chunk", 300);
bedrockGoldSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B07_bedrockGoldSpawn", "Spawns a bedrock gold deposit every nTH chunk", 500);
ironClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C00_ironClusterSpawn", "Amount of iron cluster veins per chunk", 4);
titaniumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C01_titaniumClusterSpawn", "Amount of titanium cluster veins per chunk", 2);
aluminiumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C02_aluminiumClusterSpawn", "Amount of aluminium cluster veins per chunk", 3);
copperClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C03_copperClusterSpawn", "Amount of copper cluster veins per chunk", 4);
hematiteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.L00_hematiteSpawn", "Amount of hematite block veins per chunk", 2);
malachiteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.L01_malachiteSpawn", "Amount of malachite block veins per chunk", 1);
netherUraniumuSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N00_uraniumSpawnrate", "Amount of nether uranium per chunk", 8);

4
src/main/java/com/hbm/explosion/ExplosionNukeRayBatched.java
View File

@ -102,8 +102,8 @@ public class ExplosionNukeRayBatched {
if(!world.getBlock((int)x0, (int)y0, (int)z0).getMaterial().isLiquid())
res -= Math.pow(world.getBlock((int)x0, (int)y0, (int)z0).getExplosionResistance(null), 7.5D - fac);
else
res -= Math.pow(Blocks.air.getExplosionResistance(null), 7.5D - fac);
//else
// res -= Math.pow(Blocks.air.getExplosionResistance(null), 7.5D - fac); // air is 0, might want to raise that is necessary
if(res > 0 && world.getBlock((int)x0, (int)y0, (int)z0) != Blocks.air) {
lastPos = new FloatTriplet(x0, y0, z0);

24
src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java
View File

@ -8,6 +8,7 @@ import java.util.Map.Entry;
import static com.hbm.inventory.OreDictManager.*;
import com.hbm.blocks.ModBlocks;
import com.hbm.handler.imc.IMCCrystallizer;
import com.hbm.inventory.FluidStack;
import com.hbm.inventory.RecipesCommon.ComparableStack;
import com.hbm.items.ModItems;
import com.hbm.items.special.ItemBedrockOre.EnumBedrockOre;
@ -145,5 +146,26 @@ public class CrystallizerRecipes {
return recipes;
}
// NYI
public void registerRecipe(Object input, CrystallizerRecipe recipe) {
//recipes.put(input, recipe);
}
// NYI
public static class CrystallizerRecipe {
public FluidStack acid;
public int duration;
public ItemStack output;
public CrystallizerRecipe(ItemStack output, int duration) {
this(output, duration, null);
}
public CrystallizerRecipe(ItemStack output, int duration, FluidStack acid) {
this.output = output;
this.duration = duration;
this.acid = acid;
}
}
}

16
src/main/java/com/hbm/items/special/ItemBedrockOre.java
View File

@ -9,13 +9,14 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
public class ItemBedrockOre extends ItemEnumMulti {
protected IIcon overlayIcon;
public ItemBedrockOre() {
super(EnumBedrockOre.class, true, false);
super(EnumBedrockOre.class, false, false);
}
@Override
@ -50,12 +51,23 @@ public class ItemBedrockOre extends ItemEnumMulti {
return 0xffffff;
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
EnumBedrockOre ore = EnumUtil.grabEnumSafely(EnumBedrockOre.class, stack.getItemDamage());
String oreName = StatCollector.translateToLocal("item.ore." + ore.oreName.toLowerCase());
return StatCollector.translateToLocalFormatted(this.getUnlocalizedNameInefficiently(stack) + ".name", oreName);
}
public static enum EnumBedrockOre {
IRON("Iron", 0xE2C0AA),
COPPER("Copper", 0xEC9A63),
BORAX("Borax", 0xE4BE74),
ASBESTOS("Asbestos", 0xBFBFB9),
NIOBIUM("Niobium", 0xAF58D8);
NIOBIUM("Niobium", 0xAF58D8),
TITANIUM("Titanium", 0xF2EFE2),
TUNGSTEN("Tungsten", 0x2C293C),
GOLD("Gold", 0xF9D738);
public String oreName;
public int color;

29
src/main/java/com/hbm/lib/HbmWorldGen.java
View File

@ -31,6 +31,7 @@ import com.hbm.world.dungeon.Satellite;
import com.hbm.world.dungeon.Silo;
import com.hbm.world.dungeon.Spaceship;
import com.hbm.world.dungeon.Vertibird;
import com.hbm.world.feature.BedrockOre;
import com.hbm.world.feature.DepthDeposit;
import com.hbm.world.feature.Dud;
import com.hbm.world.feature.Geyser;
@ -153,14 +154,17 @@ public class HbmWorldGen implements IWorldGenerator {
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.aluminiumClusterSpawn, 6, 15, 35, ModBlocks.cluster_aluminium);
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.copperClusterSpawn, 6, 15, 20, ModBlocks.cluster_copper);
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.hematiteSpawn, 10, 4, 80, ModBlocks.stone_resource, EnumStoneType.HEMATITE.ordinal());
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.malachiteSpawn, 10, 4, 40, ModBlocks.stone_resource, EnumStoneType.MALACHITE.ordinal());
//DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.hematiteSpawn, 10, 4, 80, ModBlocks.stone_resource, EnumStoneType.HEMATITE.ordinal());
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.malachiteSpawn, 10, 6, 40, ModBlocks.stone_resource, EnumStoneType.MALACHITE.ordinal());
if(WorldConfig.bedrockIronSpawn > 0 && rand.nextInt(WorldConfig.bedrockIronSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.IRON, 1);
if(WorldConfig.bedrockCopperSpawn > 0 && rand.nextInt(WorldConfig.bedrockCopperSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.COPPER, 1);
if(WorldConfig.bedrockBoraxSpawn > 0 && rand.nextInt(WorldConfig.bedrockBoraxSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.BORAX, new FluidStack(Fluids.SULFURIC_ACID, 500), 3);
if(WorldConfig.bedrockAsbestosSpawn > 0 && rand.nextInt(WorldConfig.bedrockAsbestosSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.ASBESTOS, 2);
if(WorldConfig.bedrockNiobiumSpawn > 0 && rand.nextInt(WorldConfig.bedrockNiobiumSpawn) == 0) DungeonToolbox.generateBedrockOre(world, rand, i, j, EnumBedrockOre.NIOBIUM, new FluidStack(Fluids.ACID, 1_000), 2);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.IRON, 1, WorldConfig.bedrockIronSpawn);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.COPPER, 1, WorldConfig.bedrockCopperSpawn);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.BORAX, new FluidStack(Fluids.SULFURIC_ACID, 500), 3, WorldConfig.bedrockBoraxSpawn);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.ASBESTOS, 2, WorldConfig.bedrockAsbestosSpawn);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.NIOBIUM, new FluidStack(Fluids.ACID, 1_000), 2, WorldConfig.bedrockNiobiumSpawn);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.TITANIUM, new FluidStack(Fluids.SULFURIC_ACID, 500), 2, WorldConfig.bedrockTitaniumSpawn);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.TUNGSTEN, new FluidStack(Fluids.ACID, 1_000), 2, WorldConfig.bedrockTungstenSpawn);
DungeonToolbox.generateBedrockOreWithChance(world, rand, i, j, EnumBedrockOre.GOLD, 1, WorldConfig.bedrockGoldSpawn);
for(int k = 0; k < WorldConfig.randomSpawn; k++) {
BlockMotherOfAllOres.shuffleOverride(rand);
@ -178,16 +182,11 @@ public class HbmWorldGen implements IWorldGenerator {
int colRange = 750;
if((GeneralConfig.enable528BedrockSpawn || GeneralConfig.enable528BedrockDeposit) && rand.nextInt(GeneralConfig.bedrockRate) != 0) {
int x = i + rand.nextInt(16);
int z = j + rand.nextInt(16);
int x = i + rand.nextInt(16) + 8;
int z = j + rand.nextInt(16) + 8;
if(GeneralConfig.enable528BedrockSpawn || (GeneralConfig.enable528BedrockDeposit && x <= colX + colRange && x >= colX - colRange && z <= colZ + colRange && z >= colZ - colRange)) {
for(int y = 6; y >= 0; y--) {
if(world.getBlock(x, y, z).isReplaceableOreGen(world, x, y, z, Blocks.bedrock)) {
world.setBlock(x, y, z, ModBlocks.ore_bedrock_coltan);
}
}
BedrockOre.generate(world, x, z, new ItemStack(ModItems.fragment_coltan), null, 0xA78D7A, 1);
}
}

2
src/main/java/com/hbm/lib/RefStrings.java
View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.27 BETA (4474)";
public static final String VERSION = "1.0.27 BETA (4476)";
//HBM's Beta Naming Convention:
//V T (X)
//V -> next release version

30
src/main/java/com/hbm/world/dungeon/Factory.java
View File

@ -23,6 +23,8 @@ public class Factory extends WorldGenerator
Block Block4 = ModBlocks.steel_wall;
Block Block5 = ModBlocks.reinforced_light;
int s4 = 8;
protected Block[] GetValidSpawnBlocks()
{
return new Block[]
@ -726,7 +728,7 @@ public class Factory extends WorldGenerator
world.setBlock(x + 5, y + 0, z + 24, Blocks.lava, 0, 3);
world.setBlock(x + 6, y + 0, z + 24, Blocks.stonebrick, 0, 3);
world.setBlock(x + 7, y + 0, z + 24, Blocks.stone_brick_stairs, 6, 3);
world.setBlock(x + 14, y + 0, z + 24, Block1, 4, 3);
world.setBlock(x + 14, y + 0, z + 24, Block1, s4, 3);
world.setBlock(x + 0, y + 0, z + 25, Blocks.stonebrick, 0, 3);
world.setBlock(x + 2, y + 0, z + 25, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 0, z + 25, Blocks.lava, 0, 3);
@ -739,7 +741,7 @@ public class Factory extends WorldGenerator
world.setBlock(x + 5, y + 0, z + 25, Blocks.lava, 0, 3);
world.setBlock(x + 6, y + 0, z + 25, Blocks.stonebrick, 0, 3);
world.setBlock(x + 7, y + 0, z + 25, Blocks.stone_brick_stairs, 5, 3);
world.setBlock(x + 14, y + 0, z + 25, Block1, 4, 3);
world.setBlock(x + 14, y + 0, z + 25, Block1, s4, 3);
world.setBlock(x + 0, y + 0, z + 26, Blocks.stonebrick, 0, 3);
world.setBlock(x + 2, y + 0, z + 26, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 0, z + 26, Blocks.lava, 0, 3);
@ -747,14 +749,14 @@ public class Factory extends WorldGenerator
world.setBlock(x + 5, y + 0, z + 26, Blocks.lava, 0, 3);
world.setBlock(x + 6, y + 0, z + 26, Blocks.stonebrick, 0, 3);
world.setBlock(x + 7, y + 0, z + 26, Blocks.stone_brick_stairs, 7, 3);
world.setBlock(x + 14, y + 0, z + 26, Block1, 4, 3);
world.setBlock(x + 14, y + 0, z + 26, Block1, s4, 3);
world.setBlock(x + 0, y + 0, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 2, y + 0, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 0, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 4, y + 0, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 5, y + 0, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 6, y + 0, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 14, y + 0, z + 27, Block1, 4, 3);
world.setBlock(x + 14, y + 0, z + 27, Block1, s4, 3);
world.setBlock(x + 0, y + 0, z + 28, Blocks.stonebrick, 0, 3);
world.setBlock(x + 14, y + 0, z + 28, Blocks.stonebrick, 0, 3);
world.setBlock(x + 0, y + 0, z + 29, Blocks.stonebrick, 0, 3);
@ -894,7 +896,7 @@ public class Factory extends WorldGenerator
world.setBlock(x + 5, y + 1, z + 24, Blocks.lava, 0, 3);
world.setBlock(x + 6, y + 1, z + 24, Blocks.lit_furnace, 5, 3);
world.setBlock(x + 7, y + 1, z + 24, Blocks.heavy_weighted_pressure_plate, 0, 3);
world.setBlock(x + 14, y + 1, z + 24, Block1, 4, 3);
world.setBlock(x + 14, y + 1, z + 24, Block1, s4, 3);
world.setBlock(x + 0, y + 1, z + 25, Blocks.stonebrick, 0, 3);
world.setBlock(x + 2, y + 1, z + 25, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 1, z + 25, Blocks.lava, 0, 3);
@ -902,7 +904,7 @@ public class Factory extends WorldGenerator
world.setBlock(x + 5, y + 1, z + 25, Blocks.lava, 0, 3);
world.setBlock(x + 6, y + 1, z + 25, Blocks.lit_furnace, 5, 3);
world.setBlock(x + 7, y + 1, z + 25, Blocks.heavy_weighted_pressure_plate, 0, 3);
world.setBlock(x + 14, y + 1, z + 25, Block1, 4, 3);
world.setBlock(x + 14, y + 1, z + 25, Block1, s4, 3);
world.setBlock(x + 0, y + 1, z + 26, Blocks.stonebrick, 0, 3);
world.setBlock(x + 2, y + 1, z + 26, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 1, z + 26, Blocks.lava, 0, 3);
@ -910,14 +912,14 @@ public class Factory extends WorldGenerator
world.setBlock(x + 5, y + 1, z + 26, Blocks.lava, 0, 3);
world.setBlock(x + 6, y + 1, z + 26, Blocks.lit_furnace, 5, 3);
world.setBlock(x + 7, y + 1, z + 26, Blocks.heavy_weighted_pressure_plate, 0, 3);
world.setBlock(x + 14, y + 1, z + 26, Block1, 4, 3);
world.setBlock(x + 14, y + 1, z + 26, Block1, s4, 3);
world.setBlock(x + 0, y + 1, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 2, y + 1, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 1, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 4, y + 1, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 5, y + 1, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 6, y + 1, z + 27, Blocks.stonebrick, 0, 3);
world.setBlock(x + 14, y + 1, z + 27, Block1, 4, 3);
world.setBlock(x + 14, y + 1, z + 27, Block1, s4, 3);
world.setBlock(x + 0, y + 1, z + 28, Blocks.stonebrick, 0, 3);
world.setBlock(x + 14, y + 1, z + 28, Blocks.stonebrick, 0, 3);
world.setBlock(x + 0, y + 1, z + 29, Blocks.stonebrick, 0, 3);
@ -1040,16 +1042,16 @@ public class Factory extends WorldGenerator
world.setBlock(x + 0, y + 2, z + 24, Blocks.brick_block, 0, 3);
world.setBlock(x + 2, y + 2, z + 24, Blocks.brick_block, 0, 3);
world.setBlock(x + 6, y + 2, z + 24, Blocks.stonebrick, 0, 3);
world.setBlock(x + 14, y + 2, z + 24, Block1, 4, 3);
world.setBlock(x + 14, y + 2, z + 24, Block1, s4, 3);
world.setBlock(x + 0, y + 2, z + 25, Blocks.brick_block, 0, 3);
world.setBlock(x + 1, y + 2, z + 25, Blocks.iron_bars, 0, 3);
world.setBlock(x + 2, y + 2, z + 25, Blocks.brick_block, 0, 3);
world.setBlock(x + 6, y + 2, z + 25, Blocks.lit_furnace, 5, 3);
world.setBlock(x + 14, y + 2, z + 25, Block1, 4, 3);
world.setBlock(x + 14, y + 2, z + 25, Block1, s4, 3);
world.setBlock(x + 0, y + 2, z + 26, Blocks.brick_block, 0, 3);
world.setBlock(x + 2, y + 2, z + 26, Blocks.brick_block, 0, 3);
world.setBlock(x + 6, y + 2, z + 26, Blocks.stonebrick, 0, 3);
world.setBlock(x + 14, y + 2, z + 26, Block1, 4, 3);
world.setBlock(x + 14, y + 2, z + 26, Block1, s4, 3);
world.setBlock(x + 0, y + 2, z + 27, Blocks.brick_block, 0, 3);
world.setBlock(x + 1, y + 2, z + 27, Blocks.iron_bars, 0, 3);
world.setBlock(x + 2, y + 2, z + 27, Blocks.brick_block, 0, 3);
@ -1057,7 +1059,7 @@ public class Factory extends WorldGenerator
world.setBlock(x + 4, y + 2, z + 27, Blocks.brick_block, 0, 3);
world.setBlock(x + 5, y + 2, z + 27, Blocks.brick_block, 0, 3);
world.setBlock(x + 6, y + 2, z + 27, Blocks.brick_block, 0, 3);
world.setBlock(x + 14, y + 2, z + 27, Block1, 4, 3);
world.setBlock(x + 14, y + 2, z + 27, Block1, s4, 3);
world.setBlock(x + 0, y + 2, z + 28, Blocks.brick_block, 0, 3);
world.setBlock(x + 2, y + 2, z + 28, Blocks.iron_bars, 0, 3);
world.setBlock(x + 4, y + 2, z + 28, Blocks.iron_bars, 0, 3);
@ -1151,11 +1153,11 @@ public class Factory extends WorldGenerator
world.setBlock(x + 0, y + 3, z + 25, Blocks.brick_block, 0, 3);
world.setBlock(x + 2, y + 3, z + 25, Blocks.brick_block, 0, 3);
world.setBlock(x + 6, y + 3, z + 25, Blocks.brick_block, 0, 3);
world.setBlock(x + 14, y + 3, z + 25, Block1, 4, 3);
world.setBlock(x + 14, y + 3, z + 25, Block1, s4, 3);
world.setBlock(x + 0, y + 3, z + 26, Blocks.brick_block, 0, 3);
world.setBlock(x + 2, y + 3, z + 26, Blocks.brick_block, 0, 3);
world.setBlock(x + 6, y + 3, z + 26, Blocks.brick_block, 0, 3);
world.setBlock(x + 14, y + 3, z + 26, Block1, 4, 3);
world.setBlock(x + 14, y + 3, z + 26, Block1, s4, 3);
world.setBlock(x + 0, y + 3, z + 27, Blocks.brick_block, 0, 3);
world.setBlock(x + 2, y + 3, z + 27, Blocks.brick_block, 0, 3);
world.setBlock(x + 3, y + 3, z + 27, Blocks.brick_block, 0, 3);

487
src/main/java/com/hbm/world/dungeon/Relay.java
View File

@ -34,6 +34,11 @@ public class Relay extends WorldGenerator
Block Block8 = ModBlocks.deco_tungsten;
Block Block9 = ModBlocks.pole_top;
int s2 = 0;
int s3 = 0;
int s4 = 8;
int s5 = 8;
protected Block[] GetValidSpawnBlocks()
{
return new Block[]
@ -594,16 +599,16 @@ public class Relay extends WorldGenerator
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 + 5, y + 0, z + 2, Block4, s3, 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 + 7, y + 0, z + 2, Block4, s3, 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 + 4, y + 0, z + 3, Block4, s5, 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 + 8, y + 0, z + 3, Block4, s4, 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);
@ -613,16 +618,16 @@ public class Relay extends WorldGenerator
world.setBlock(x + 8, y + 0, z + 4, Block2, 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 + 4, y + 0, z + 5, Block4, s5, 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 + 8, y + 0, z + 5, Block4, s4, 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 + 5, y + 0, z + 6, Block4, s2, 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 + 7, y + 0, z + 6, Block4, s2, 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, ModBlocks.fence_metal, 0, 3);
@ -717,16 +722,16 @@ public class Relay extends WorldGenerator
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 + 5, y + 1, z + 2, Block4, s3, 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 + 7, y + 1, z + 2, Block4, s3, 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 + 4, y + 1, z + 3, Block4, s5, 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 + 8, y + 1, z + 3, Block4, s4, 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);
@ -736,16 +741,16 @@ public class Relay extends WorldGenerator
world.setBlock(x + 8, y + 1, z + 4, Block2, 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 + 4, y + 1, z + 5, Block4, s5, 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 + 8, y + 1, z + 5, Block4, s4, 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 + 5, y + 1, z + 6, Block4, s2, 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 + 7, y + 1, z + 6, Block4, s2, 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, ModBlocks.fence_metal, 0, 3);
@ -817,16 +822,16 @@ public class Relay extends WorldGenerator
world.setBlock(x + 2, y + 2, z + 1, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 10, y + 2, z + 1, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 2, y + 2, z + 2, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 5, y + 2, z + 2, Block4, 3, 3);
world.setBlock(x + 5, y + 2, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 2, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 2, z + 2, Block4, 3, 3);
world.setBlock(x + 7, y + 2, z + 2, Block4, s3, 3);
world.setBlock(x + 10, y + 2, z + 2, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 2, y + 2, z + 3, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 4, y + 2, z + 3, Block4, 5, 3);
world.setBlock(x + 4, y + 2, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 2, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 2, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 2, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 2, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 2, z + 3, Block4, s4, 3);
world.setBlock(x + 10, y + 2, z + 3, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 2, y + 2, z + 4, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 4, y + 2, z + 4, Block2, 0, 3);
@ -836,16 +841,16 @@ public class Relay extends WorldGenerator
world.setBlock(x + 8, y + 2, z + 4, Block2, 0, 3);
world.setBlock(x + 10, y + 2, z + 4, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 2, y + 2, z + 5, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 4, y + 2, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 2, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 2, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 2, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 2, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 2, z + 5, Block4, 4, 3);
world.setBlock(x + 8, y + 2, z + 5, Block4, s4, 3);
world.setBlock(x + 10, y + 2, z + 5, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 2, y + 2, z + 6, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 5, y + 2, z + 6, Block4, 2, 3);
world.setBlock(x + 5, y + 2, z + 6, Block4, s2, 3);
world.setBlock(x + 6, y + 2, z + 6, Block2, 0, 3);
world.setBlock(x + 7, y + 2, z + 6, Block4, 2, 3);
world.setBlock(x + 7, y + 2, z + 6, Block4, s2, 3);
world.setBlock(x + 10, y + 2, z + 6, ModBlocks.barbed_wire, 0, 3);
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);
@ -910,28 +915,28 @@ public class Relay extends WorldGenerator
world.setBlock(x + 8, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 9, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 10, y + 2, z + 15, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 5, y + 3, z + 2, Block4, 3, 3);
world.setBlock(x + 5, y + 3, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 3, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 3, z + 2, Block4, 3, 3);
world.setBlock(x + 4, y + 3, z + 3, Block4, 5, 3);
world.setBlock(x + 7, y + 3, z + 2, Block4, s3, 3);
world.setBlock(x + 4, y + 3, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 3, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 3, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 3, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 3, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 3, z + 3, Block4, s4, 3);
world.setBlock(x + 4, y + 3, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 3, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 3, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 3, z + 4, Block2, 0, 3);
world.setBlock(x + 8, y + 3, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 3, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 3, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 3, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 3, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 3, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 3, z + 5, Block4, 4, 3);
world.setBlock(x + 8, y + 3, z + 5, Block4, s4, 3);
world.setBlock(x + 9, y + 3, z + 5, Block2, 0, 3);
world.setBlock(x + 5, y + 3, z + 6, Block4, 2, 3);
world.setBlock(x + 5, y + 3, z + 6, Block4, s2, 3);
world.setBlock(x + 6, y + 3, z + 6, Block2, 0, 3);
world.setBlock(x + 7, y + 3, z + 6, Block4, 2, 3);
world.setBlock(x + 7, y + 3, z + 6, Block4, s2, 3);
world.setBlock(x + 8, y + 3, z + 6, Block2, 0, 3);
world.setBlock(x + 9, y + 3, z + 6, Block2, 0, 3);
world.setBlock(x + 10, y + 3, z + 6, Block2, 0, 3);
@ -942,30 +947,30 @@ public class Relay extends WorldGenerator
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);
world.setBlock(x + 5, y + 4, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 4, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 4, z + 2, Block4, 3, 3);
world.setBlock(x + 4, y + 4, z + 3, Block4, 5, 3);
world.setBlock(x + 7, y + 4, z + 2, Block4, s3, 3);
world.setBlock(x + 4, y + 4, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 4, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 4, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 4, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 4, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 4, z + 3, Block4, s4, 3);
world.setBlock(x + 4, y + 4, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 4, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 4, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 4, z + 4, Block2, 0, 3);
world.setBlock(x + 8, y + 4, z + 4, Block2, 0, 3);
world.setBlock(x + 9, y + 4, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 4, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 4, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 4, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 4, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 4, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 4, z + 5, Block4, 4, 3);
world.setBlock(x + 8, y + 4, z + 5, Block4, s4, 3);
world.setBlock(x + 9, y + 4, z + 5, Block2, 0, 3);
world.setBlock(x + 10, y + 4, z + 5, Block2, 0, 3);
world.setBlock(x + 5, y + 4, z + 6, Block4, 2, 3);
world.setBlock(x + 5, y + 4, z + 6, Block4, s2, 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 + 7, y + 4, z + 6, Block4, s2, 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);
@ -973,14 +978,14 @@ public class Relay extends WorldGenerator
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 + 5, y + 5, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 5, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 5, z + 2, Block4, 3, 3);
world.setBlock(x + 4, y + 5, z + 3, Block4, 5, 3);
world.setBlock(x + 7, y + 5, z + 2, Block4, s3, 3);
world.setBlock(x + 4, y + 5, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 5, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 5, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 5, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 5, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 5, z + 3, Block4, s4, 3);
world.setBlock(x + 9, y + 5, z + 3, Block2, 0, 3);
world.setBlock(x + 4, y + 5, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 5, z + 4, Block2, 0, 3);
@ -989,31 +994,31 @@ public class Relay extends WorldGenerator
world.setBlock(x + 8, y + 5, z + 4, Block2, 0, 3);
world.setBlock(x + 9, y + 5, z + 4, Block2, 0, 3);
world.setBlock(x + 10, y + 5, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 5, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 5, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 5, z + 5, Block2, 0, 3);
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 + 8, y + 5, z + 5, Block4, s4, 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 + 5, y + 5, z + 6, Block4, s2, 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 + 7, y + 5, z + 6, Block4, s2, 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);
world.setBlock(x + 9, y + 6, z + 1, Block2, 0, 3);
world.setBlock(x + 5, y + 6, z + 2, Block4, 3, 3);
world.setBlock(x + 5, y + 6, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 6, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 6, z + 2, Block4, 3, 3);
world.setBlock(x + 7, y + 6, z + 2, Block4, s3, 3);
world.setBlock(x + 8, y + 6, z + 2, Block2, 0, 3);
world.setBlock(x + 9, y + 6, z + 2, Block2, 0, 3);
world.setBlock(x + 10, y + 6, z + 2, Block2, 0, 3);
world.setBlock(x + 4, y + 6, z + 3, Block4, 5, 3);
world.setBlock(x + 4, y + 6, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 6, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 6, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 6, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 6, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 6, z + 3, Block4, s4, 3);
world.setBlock(x + 9, y + 6, z + 3, Block2, 0, 3);
world.setBlock(x + 10, y + 6, z + 3, Block2, 0, 3);
world.setBlock(x + 4, y + 6, z + 4, Block2, 0, 3);
@ -1022,15 +1027,15 @@ public class Relay extends WorldGenerator
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, ModBlocks.fence_metal, 0, 3);
world.setBlock(x + 4, y + 6, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 6, z + 5, Block4, s5, 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 + 8, y + 6, z + 5, Block4, s4, 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 + 5, y + 6, z + 6, Block4, s2, 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 + 6, z + 6, Block4, s2, 3);
world.setBlock(x + 7, y + 7, z + 0, Block2, 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);
@ -1038,15 +1043,15 @@ public class Relay extends WorldGenerator
world.setBlock(x + 7, y + 7, z + 1, Block2, 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 + 5, y + 7, z + 2, Block4, s3, 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 + 7, y + 7, z + 2, Block4, s3, 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 + 4, y + 7, z + 3, Block4, s5, 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 + 8, y + 7, z + 3, Block4, s4, 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);
@ -1054,40 +1059,40 @@ public class Relay extends WorldGenerator
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, ModBlocks.fence_metal, 0, 3);
world.setBlock(x + 4, y + 7, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 7, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 7, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 7, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 7, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 7, z + 5, Block4, 4, 3);
world.setBlock(x + 5, y + 7, z + 6, Block4, 2, 3);
world.setBlock(x + 8, y + 7, z + 5, Block4, s4, 3);
world.setBlock(x + 5, y + 7, z + 6, Block4, s2, 3);
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 + 7, y + 7, z + 6, Block4, s2, 3);
world.setBlock(x + 6, y + 8, z + 0, Block2, 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);
world.setBlock(x + 5, y + 8, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 8, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 8, z + 2, Block4, 3, 3);
world.setBlock(x + 4, y + 8, z + 3, Block4, 5, 3);
world.setBlock(x + 7, y + 8, z + 2, Block4, s3, 3);
world.setBlock(x + 4, y + 8, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 8, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 8, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 8, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 8, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 8, z + 3, Block4, s4, 3);
world.setBlock(x + 4, y + 8, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 8, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 8, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 8, z + 4, Block2, 0, 3);
world.setBlock(x + 8, y + 8, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 8, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 8, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 8, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 8, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 8, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 8, z + 5, Block4, 4, 3);
world.setBlock(x + 5, y + 8, z + 6, Block4, 2, 3);
world.setBlock(x + 8, y + 8, z + 5, Block4, s4, 3);
world.setBlock(x + 5, y + 8, z + 6, Block4, s2, 3);
world.setBlock(x + 6, y + 8, z + 6, Block2, 0, 3);
world.setBlock(x + 7, y + 8, z + 6, Block4, 2, 3);
world.setBlock(x + 7, y + 8, z + 6, Block4, s2, 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, ModBlocks.fence_metal, 0, 3);
@ -1098,28 +1103,28 @@ public class Relay extends WorldGenerator
world.setBlock(x + 2, y + 9, z + 2, Block2, 0, 3);
world.setBlock(x + 3, y + 9, z + 2, Block2, 0, 3);
world.setBlock(x + 4, y + 9, z + 2, Block2, 0, 3);
world.setBlock(x + 5, y + 9, z + 2, Block4, 3, 3);
world.setBlock(x + 5, y + 9, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 9, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 9, z + 2, Block4, 3, 3);
world.setBlock(x + 7, y + 9, z + 2, Block4, s3, 3);
world.setBlock(x + 3, y + 9, z + 3, Block2, 0, 3);
world.setBlock(x + 4, y + 9, z + 3, Block4, 5, 3);
world.setBlock(x + 4, y + 9, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 9, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 9, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 9, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 9, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 9, z + 3, Block4, s4, 3);
world.setBlock(x + 4, y + 9, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 9, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 9, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 9, z + 4, Block2, 0, 3);
world.setBlock(x + 8, y + 9, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 9, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 9, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 9, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 9, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 9, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 9, z + 5, Block4, 4, 3);
world.setBlock(x + 5, y + 9, z + 6, Block4, 2, 3);
world.setBlock(x + 8, y + 9, z + 5, Block4, s4, 3);
world.setBlock(x + 5, y + 9, z + 6, Block4, s2, 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 + 7, y + 9, z + 6, Block4, s2, 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);
@ -1127,40 +1132,40 @@ public class Relay extends WorldGenerator
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 + 5, y + 10, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 10, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 10, z + 2, Block4, 3, 3);
world.setBlock(x + 7, y + 10, z + 2, Block4, s3, 3);
world.setBlock(x + 2, y + 10, z + 3, Block2, 0, 3);
world.setBlock(x + 3, y + 10, z + 3, Block2, 0, 3);
world.setBlock(x + 4, y + 10, z + 3, Block4, 5, 3);
world.setBlock(x + 4, y + 10, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 10, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 10, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 10, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 10, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 10, z + 3, Block4, s4, 3);
world.setBlock(x + 3, y + 10, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 10, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 10, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 10, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 10, z + 4, Block2, 0, 3);
world.setBlock(x + 8, y + 10, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 10, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 10, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 10, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 10, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 10, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 10, z + 5, Block4, 4, 3);
world.setBlock(x + 5, y + 10, z + 6, Block4, 2, 3);
world.setBlock(x + 8, y + 10, z + 5, Block4, s4, 3);
world.setBlock(x + 5, y + 10, z + 6, Block4, s2, 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 + 7, y + 10, z + 6, Block4, s2, 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 + 5, y + 11, z + 2, Block4, s3, 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 + 7, y + 11, z + 2, Block4, s3, 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 + 4, y + 11, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 11, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 11, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 11, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 11, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 11, z + 3, Block4, s4, 3);
world.setBlock(x + 10, y + 11, z + 3, Block6, 0, 3);
world.setBlock(x + 2, y + 11, z + 4, Block2, 0, 3);
world.setBlock(x + 3, y + 11, z + 4, Block2, 0, 3);
@ -1171,25 +1176,25 @@ public class Relay extends WorldGenerator
world.setBlock(x + 8, y + 11, z + 4, Block2, 0, 3);
world.setBlock(x + 10, y + 11, z + 4, Block6, 0, 3);
world.setBlock(x + 3, y + 11, z + 5, Block2, 0, 3);
world.setBlock(x + 4, y + 11, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 11, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 11, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 11, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 11, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 11, z + 5, Block4, 4, 3);
world.setBlock(x + 8, y + 11, z + 5, Block4, s4, 3);
world.setBlock(x + 10, y + 11, z + 5, Block6, 0, 3);
world.setBlock(x + 5, y + 11, z + 6, Block4, 2, 3);
world.setBlock(x + 5, y + 11, z + 6, Block4, s2, 3);
world.setBlock(x + 6, y + 11, z + 6, Block2, 0, 3);
world.setBlock(x + 7, y + 11, z + 6, Block4, 2, 3);
world.setBlock(x + 5, y + 12, z + 2, Block4, 3, 3);
world.setBlock(x + 7, y + 11, z + 6, Block4, s2, 3);
world.setBlock(x + 5, y + 12, z + 2, Block4, s3, 3);
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 + 7, y + 12, z + 2, Block4, s3, 3);
world.setBlock(x + 10, y + 12, z + 2, Block6, 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 + 4, y + 12, z + 3, Block4, s5, 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 + 8, y + 12, z + 3, Block4, s4, 3);
world.setBlock(x + 9, y + 12, z + 3, Block6, 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);
@ -1200,32 +1205,32 @@ public class Relay extends WorldGenerator
world.setBlock(x + 9, y + 12, z + 4, Block6, 0, 3);
world.setBlock(x + 2, y + 12, z + 5, Block2, 0, 3);
world.setBlock(x + 3, y + 12, z + 5, Block2, 0, 3);
world.setBlock(x + 4, y + 12, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 12, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 12, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 12, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 12, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 12, z + 5, Block4, 4, 3);
world.setBlock(x + 8, y + 12, z + 5, Block4, s4, 3);
world.setBlock(x + 9, y + 12, z + 5, Block6, 0, 3);
world.setBlock(x + 2, y + 12, z + 6, Block2, 0, 3);
world.setBlock(x + 3, y + 12, z + 6, Block2, 0, 3);
world.setBlock(x + 4, y + 12, z + 6, Block2, 0, 3);
world.setBlock(x + 5, y + 12, z + 6, Block4, 2, 3);
world.setBlock(x + 5, y + 12, z + 6, Block4, s2, 3);
world.setBlock(x + 6, y + 12, z + 6, Block2, 0, 3);
world.setBlock(x + 7, y + 12, z + 6, Block4, 2, 3);
world.setBlock(x + 7, y + 12, z + 6, Block4, s2, 3);
world.setBlock(x + 10, y + 12, z + 6, Block6, 0, 3);
world.setBlock(x + 3, y + 12, z + 7, Block2, 0, 3);
world.setBlock(x + 4, y + 12, z + 7, Block2, 0, 3);
world.setBlock(x + 5, y + 12, z + 7, Block2, 0, 3);
world.setBlock(x + 4, y + 12, z + 8, Block2, 0, 3);
world.setBlock(x + 5, y + 13, z + 2, Block4, 3, 3);
world.setBlock(x + 5, y + 13, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 13, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 13, z + 2, Block4, 3, 3);
world.setBlock(x + 7, y + 13, z + 2, Block4, s3, 3);
world.setBlock(x + 10, y + 13, z + 2, Block6, 0, 3);
world.setBlock(x + 4, y + 13, z + 3, Block4, 5, 3);
world.setBlock(x + 4, y + 13, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 13, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 13, z + 3, Block2, 0, 3);
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 + 8, y + 13, z + 3, Block4, s4, 3);
world.setBlock(x + 9, y + 13, z + 3, Block6, 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);
@ -1237,16 +1242,16 @@ public class Relay extends WorldGenerator
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, ModBlocks.fence_metal, 0, 3);
world.setBlock(x + 4, y + 13, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 13, z + 5, Block4, s5, 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 + 8, y + 13, z + 5, Block4, s4, 3);
world.setBlock(x + 9, y + 13, z + 5, Block6, 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 + 5, y + 13, z + 6, Block4, s2, 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 + 7, y + 13, z + 6, Block4, s2, 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);
@ -1263,15 +1268,15 @@ public class Relay extends WorldGenerator
world.setBlock(x + 6, y + 13, z + 8, Block2, 0, 3);
world.setBlock(x + 7, y + 13, z + 8, Block2, 0, 3);
world.setBlock(x + 8, y + 13, z + 8, Block2, 0, 3);
world.setBlock(x + 5, y + 14, z + 2, Block4, 3, 3);
world.setBlock(x + 5, y + 14, z + 2, Block4, s3, 3);
world.setBlock(x + 6, y + 14, z + 2, Block2, 0, 3);
world.setBlock(x + 7, y + 14, z + 2, Block4, 3, 3);
world.setBlock(x + 7, y + 14, z + 2, Block4, s3, 3);
world.setBlock(x + 10, y + 14, z + 2, Block6, 0, 3);
world.setBlock(x + 4, y + 14, z + 3, Block4, 5, 3);
world.setBlock(x + 4, y + 14, z + 3, Block4, s5, 3);
world.setBlock(x + 5, y + 14, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 14, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 14, z + 3, Block2, 0, 3);
world.setBlock(x + 8, y + 14, z + 3, Block4, 4, 3);
world.setBlock(x + 8, y + 14, z + 3, Block4, s4, 3);
world.setBlock(x + 9, y + 14, z + 3, Block6, 0, 3);
world.setBlock(x + 4, y + 14, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 14, z + 4, Block2, 0, 3);
@ -1279,15 +1284,15 @@ public class Relay extends WorldGenerator
world.setBlock(x + 7, y + 14, z + 4, Block2, 0, 3);
world.setBlock(x + 8, y + 14, z + 4, Block2, 0, 3);
world.setBlock(x + 9, y + 14, z + 4, Block6, 0, 3);
world.setBlock(x + 4, y + 14, z + 5, Block4, 5, 3);
world.setBlock(x + 4, y + 14, z + 5, Block4, s5, 3);
world.setBlock(x + 5, y + 14, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 14, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 14, z + 5, Block2, 0, 3);
world.setBlock(x + 8, y + 14, z + 5, Block4, 4, 3);
world.setBlock(x + 8, y + 14, z + 5, Block4, s4, 3);
world.setBlock(x + 9, y + 14, z + 5, Block6, 0, 3);
world.setBlock(x + 5, y + 14, z + 6, Block4, 2, 3);
world.setBlock(x + 5, y + 14, z + 6, Block4, s2, 3);
world.setBlock(x + 6, y + 14, z + 6, Block2, 0, 3);
world.setBlock(x + 7, y + 14, z + 6, Block4, 2, 3);
world.setBlock(x + 7, y + 14, z + 6, Block4, s2, 3);
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.antenna, (TileEntityCrateIron)world.getTileEntity(x + 8, y + 14, z + 6), 8);
@ -1337,109 +1342,109 @@ public class Relay extends WorldGenerator
world.setBlock(x + 6, y + 16, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 16, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 16, z + 6, Block2, 0, 3);
world.setBlock(x + 5, y + 17, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 17, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 17, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 17, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 17, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 17, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 17, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 17, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 17, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 17, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 17, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 17, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 18, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 17, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 18, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 18, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 18, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 18, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 18, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 18, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 18, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 18, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 18, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 18, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 18, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 19, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 18, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 19, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 19, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 19, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 19, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 19, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 19, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 19, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 19, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 19, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 19, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 19, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 20, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 19, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 20, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 20, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 20, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 20, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 20, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 20, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 20, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 20, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 20, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 20, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 20, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 21, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 20, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 21, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 21, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 21, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 21, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 21, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 21, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 21, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 21, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 21, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 21, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 21, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 22, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 21, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 22, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 22, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 22, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 22, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 22, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 22, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 22, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 22, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 22, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 22, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 22, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 23, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 22, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 23, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 23, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 23, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 23, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 23, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 23, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 23, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 23, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 23, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 23, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 23, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 24, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 23, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 24, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 24, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 24, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 24, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 24, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 24, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 24, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 24, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 24, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 24, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 24, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 24, z + 5, Block4, s2, 3);
world.setBlock(x + 3, y + 25, z + 3, Block6, 0, 3);
world.setBlock(x + 5, y + 25, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 25, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 25, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 25, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 25, z + 3, Block4, s3, 3);
world.setBlock(x + 3, y + 25, z + 4, Block6, 0, 3);
world.setBlock(x + 5, y + 25, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 25, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 25, z + 4, Block2, 0, 3);
world.setBlock(x + 3, y + 25, z + 5, Block6, 0, 3);
world.setBlock(x + 5, y + 25, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 25, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 25, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 25, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 25, z + 5, Block4, s2, 3);
world.setBlock(x + 3, y + 26, z + 2, Block6, 0, 3);
world.setBlock(x + 4, y + 26, z + 3, Block6, 0, 3);
world.setBlock(x + 5, y + 26, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 26, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 26, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 26, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 26, z + 3, Block4, s3, 3);
world.setBlock(x + 4, y + 26, z + 4, Block6, 0, 3);
world.setBlock(x + 5, y + 26, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 26, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 26, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 26, z + 5, Block6, 0, 3);
world.setBlock(x + 5, y + 26, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 26, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 26, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 26, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 26, z + 5, Block4, s2, 3);
world.setBlock(x + 3, y + 26, z + 6, Block6, 0, 3);
world.setBlock(x + 3, y + 27, z + 2, Block6, 0, 3);
world.setBlock(x + 4, y + 27, z + 3, Block6, 0, 3);
world.setBlock(x + 5, y + 27, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 27, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 27, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 27, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 27, z + 3, Block4, s3, 3);
world.setBlock(x + 2, y + 27, z + 4, Block8, 0, 3);
world.setBlock(x + 3, y + 27, z + 4, Block7, 0, 3);
world.setBlock(x + 4, y + 27, z + 4, Block7, 0, 3);
@ -1447,62 +1452,62 @@ public class Relay extends WorldGenerator
world.setBlock(x + 6, y + 27, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 27, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 27, z + 5, Block6, 0, 3);
world.setBlock(x + 5, y + 27, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 27, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 27, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 27, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 27, z + 5, Block4, s2, 3);
world.setBlock(x + 3, y + 27, z + 6, Block6, 0, 3);
world.setBlock(x + 3, y + 28, z + 2, Block6, 0, 3);
world.setBlock(x + 4, y + 28, z + 3, Block6, 0, 3);
world.setBlock(x + 5, y + 28, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 28, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 28, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 28, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 28, z + 3, Block4, s3, 3);
world.setBlock(x + 4, y + 28, z + 4, Block6, 0, 3);
world.setBlock(x + 5, y + 28, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 28, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 28, z + 4, Block2, 0, 3);
world.setBlock(x + 4, y + 28, z + 5, Block6, 0, 3);
world.setBlock(x + 5, y + 28, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 28, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 28, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 28, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 28, z + 5, Block4, s2, 3);
world.setBlock(x + 3, y + 28, z + 6, Block6, 0, 3);
world.setBlock(x + 3, y + 29, z + 3, Block6, 0, 3);
world.setBlock(x + 5, y + 29, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 29, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 29, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 29, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 29, z + 3, Block4, s3, 3);
world.setBlock(x + 3, y + 29, z + 4, Block6, 0, 3);
world.setBlock(x + 5, y + 29, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 29, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 29, z + 4, Block2, 0, 3);
world.setBlock(x + 3, y + 29, z + 5, Block6, 0, 3);
world.setBlock(x + 5, y + 29, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 29, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 29, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 29, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 29, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 30, z + 1, Block6, 0, 3);
world.setBlock(x + 6, y + 30, z + 1, Block6, 0, 3);
world.setBlock(x + 7, y + 30, z + 1, Block6, 0, 3);
world.setBlock(x + 5, y + 30, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 30, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 30, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 30, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 30, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 30, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 30, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 30, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 30, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 30, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 30, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 30, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 30, z + 5, Block4, s2, 3);
world.setBlock(x + 4, y + 31, z + 1, Block6, 0, 3);
world.setBlock(x + 8, y + 31, z + 1, Block6, 0, 3);
world.setBlock(x + 5, y + 31, z + 2, Block6, 0, 3);
world.setBlock(x + 6, y + 31, z + 2, Block6, 0, 3);
world.setBlock(x + 7, y + 31, z + 2, Block6, 0, 3);
world.setBlock(x + 5, y + 31, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 31, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 31, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 31, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 31, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 31, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 31, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 31, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 31, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 31, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 31, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 31, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 31, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 32, z + 0, Block8, 0, 3);
world.setBlock(x + 4, y + 32, z + 1, Block6, 0, 3);
world.setBlock(x + 6, y + 32, z + 1, Block7, 0, 3);
@ -1512,41 +1517,41 @@ public class Relay extends WorldGenerator
world.setBlockMetadataWithNotify(x + 6, y + 32, z + 2, 2, 3);
WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.expensive, (TileEntityCrateIron)world.getTileEntity(x + 6, y + 32, z + 2), 8);
world.setBlock(x + 7, y + 32, z + 2, Block6, 0, 3);
world.setBlock(x + 5, y + 32, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 32, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 32, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 32, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 32, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 32, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 32, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 32, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 32, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 32, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 32, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 32, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 32, z + 5, Block4, s2, 3);
world.setBlock(x + 4, y + 33, z + 1, Block6, 0, 3);
world.setBlock(x + 8, y + 33, z + 1, Block6, 0, 3);
world.setBlock(x + 5, y + 33, z + 2, Block6, 0, 3);
world.setBlock(x + 6, y + 33, z + 2, Block6, 0, 3);
world.setBlock(x + 7, y + 33, z + 2, Block6, 0, 3);
world.setBlock(x + 5, y + 33, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 33, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 33, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 33, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 33, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 33, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 33, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 33, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 33, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 33, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 33, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 33, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 33, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 34, z + 1, Block6, 0, 3);
world.setBlock(x + 6, y + 34, z + 1, Block6, 0, 3);
world.setBlock(x + 7, y + 34, z + 1, Block6, 0, 3);
world.setBlock(x + 5, y + 34, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 34, z + 3, Block4, s3, 3);
world.setBlock(x + 6, y + 34, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 34, z + 3, Block4, 3, 3);
world.setBlock(x + 7, y + 34, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 34, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 34, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 34, z + 4, Block2, 0, 3);
world.setBlock(x + 5, y + 34, z + 5, Block4, 2, 3);
world.setBlock(x + 5, y + 34, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 34, z + 5, Block2, 0, 3);
world.setBlock(x + 7, y + 34, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 34, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 35, z + 3, Block2, 0, 3);
world.setBlock(x + 6, y + 35, z + 3, Block2, 0, 3);
world.setBlock(x + 7, y + 35, z + 3, Block2, 0, 3);
@ -1561,47 +1566,47 @@ public class Relay extends WorldGenerator
world.setBlock(x + 6, y + 36, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 36, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 36, z + 5, Block2, 0, 3);
world.setBlock(x + 6, y + 37, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 37, z + 4, Block4, 5, 3);
world.setBlock(x + 6, y + 37, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 37, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 37, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 37, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 37, z + 5, Block4, 2, 3);
world.setBlock(x + 6, y + 38, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 38, z + 4, Block4, 5, 3);
world.setBlock(x + 7, y + 37, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 37, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 38, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 38, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 38, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 38, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 38, z + 5, Block4, 2, 3);
world.setBlock(x + 6, y + 39, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 39, z + 4, Block4, 5, 3);
world.setBlock(x + 7, y + 38, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 38, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 39, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 39, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 39, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 39, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 39, z + 5, Block4, 2, 3);
world.setBlock(x + 6, y + 40, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 40, z + 4, Block4, 5, 3);
world.setBlock(x + 7, y + 39, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 39, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 40, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 40, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 40, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 40, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 40, z + 5, Block4, 2, 3);
world.setBlock(x + 6, y + 41, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 41, z + 4, Block4, 5, 3);
world.setBlock(x + 7, y + 40, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 40, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 41, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 41, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 41, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 41, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 41, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 41, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 41, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 41, z + 6, Block6, 0, 3);
world.setBlock(x + 6, y + 41, z + 6, Block6, 0, 3);
world.setBlock(x + 7, y + 41, z + 6, Block6, 0, 3);
world.setBlock(x + 6, y + 42, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 42, z + 4, Block4, 5, 3);
world.setBlock(x + 6, y + 42, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 42, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 42, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 42, z + 4, Block4, 4, 3);
world.setBlock(x + 7, y + 42, z + 4, Block4, s4, 3);
world.setBlock(x + 5, y + 42, z + 5, Block6, 0, 3);
world.setBlock(x + 6, y + 42, z + 5, Block6, 0, 3);
world.setBlock(x + 7, y + 42, z + 5, Block6, 0, 3);
world.setBlock(x + 4, y + 42, z + 6, Block6, 0, 3);
world.setBlock(x + 8, y + 42, z + 6, Block6, 0, 3);
world.setBlock(x + 6, y + 43, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 43, z + 4, Block4, 5, 3);
world.setBlock(x + 6, y + 43, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 43, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 43, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 43, z + 4, Block4, 4, 3);
world.setBlock(x + 7, y + 43, z + 4, Block4, s4, 3);
world.setBlock(x + 5, y + 43, z + 5, Block6, 0, 3);
world.setBlock(x + 6, y + 43, z + 5, Block7, 0, 3);
world.setBlock(x + 7, y + 43, z + 5, Block6, 0, 3);
@ -1609,17 +1614,17 @@ public class Relay extends WorldGenerator
world.setBlock(x + 6, y + 43, z + 6, Block7, 0, 3);
world.setBlock(x + 8, y + 43, z + 6, Block6, 0, 3);
world.setBlock(x + 6, y + 43, z + 7, Block8, 0, 3);
world.setBlock(x + 6, y + 44, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 44, z + 4, Block4, 5, 3);
world.setBlock(x + 6, y + 44, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 44, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 44, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 44, z + 4, Block4, 4, 3);
world.setBlock(x + 7, y + 44, z + 4, Block4, s4, 3);
world.setBlock(x + 5, y + 44, z + 5, Block6, 0, 3);
world.setBlock(x + 6, y + 44, z + 5, Block6, 0, 3);
world.setBlock(x + 7, y + 44, z + 5, Block6, 0, 3);
world.setBlock(x + 4, y + 44, z + 6, Block6, 0, 3);
world.setBlock(x + 8, y + 44, z + 6, Block6, 0, 3);
world.setBlock(x + 6, y + 45, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 45, z + 4, Block4, 5, 3);
world.setBlock(x + 6, y + 45, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 45, z + 4, Block4, s5, 3);
generate_r02(world, rand, x, y, z);
return true;
@ -1629,31 +1634,31 @@ public class Relay extends WorldGenerator
{
world.setBlock(x + 6, y + 45, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 45, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 45, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 45, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 45, z + 5, Block4, s2, 3);
world.setBlock(x + 5, y + 45, z + 6, Block6, 0, 3);
world.setBlock(x + 6, y + 45, z + 6, Block6, 0, 3);
world.setBlock(x + 7, y + 45, z + 6, Block6, 0, 3);
world.setBlock(x + 6, y + 46, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 46, z + 4, Block4, 5, 3);
world.setBlock(x + 6, y + 46, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 46, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 46, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 46, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 46, z + 5, Block4, 2, 3);
world.setBlock(x + 6, y + 47, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 47, z + 4, Block4, 5, 3);
world.setBlock(x + 7, y + 46, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 46, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 47, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 47, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 47, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 47, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 47, z + 5, Block4, 2, 3);
world.setBlock(x + 6, y + 48, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 48, z + 4, Block4, 5, 3);
world.setBlock(x + 7, y + 47, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 47, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 48, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 48, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 48, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 48, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 48, z + 5, Block4, 2, 3);
world.setBlock(x + 6, y + 49, z + 3, Block4, 3, 3);
world.setBlock(x + 5, y + 49, z + 4, Block4, 5, 3);
world.setBlock(x + 7, y + 48, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 48, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 49, z + 3, Block4, s3, 3);
world.setBlock(x + 5, y + 49, z + 4, Block4, s5, 3);
world.setBlock(x + 6, y + 49, z + 4, ModBlocks.red_wire_coated, 0, 3);
world.setBlock(x + 7, y + 49, z + 4, Block4, 4, 3);
world.setBlock(x + 6, y + 49, z + 5, Block4, 2, 3);
world.setBlock(x + 7, y + 49, z + 4, Block4, s4, 3);
world.setBlock(x + 6, y + 49, z + 5, Block4, s2, 3);
world.setBlock(x + 6, y + 50, z + 3, Block2, 0, 3);
world.setBlock(x + 5, y + 50, z + 4, Block2, 0, 3);
world.setBlock(x + 6, y + 50, z + 4, ModBlocks.red_wire_coated, 0, 3);

52
src/main/java/com/hbm/world/dungeon/Satellite.java
View File

@ -8,7 +8,6 @@ import com.hbm.blocks.ModBlocks;
import com.hbm.config.GeneralConfig;
import com.hbm.lib.HbmChestContents;
import com.hbm.lib.Library;
import com.hbm.main.MainRegistry;
import com.hbm.util.LootGenerator;
import net.minecraft.block.Block;
@ -28,6 +27,11 @@ public class Satellite extends WorldGenerator
Block dTape = ModBlocks.tape_recorder;
Block Block7 = ModBlocks.deco_tungsten;
int s2 = 0;
int s3 = 0;
int s4 = 8;
int s5 = 8;
protected Block[] GetValidSpawnBlocks() {
return new Block[] { Blocks.grass, Blocks.dirt, Blocks.stone, Blocks.sand, Blocks.sandstone };
}
@ -296,8 +300,8 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 18, y + -1, z + 30, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 19, y + -1, z + 30, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 20, y + -1, z + 30, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 5, y + 0, z + 8, Block3, 3, 3);
world.setBlock(x + 13, y + 0, z + 8, Block3, 3, 3);
world.setBlock(x + 5, y + 0, z + 8, Block3, s3, 3);
world.setBlock(x + 13, y + 0, z + 8, Block3, s3, 3);
world.setBlock(x + 19, y + 0, z + 8, dSteel, 0, 3);
world.setBlock(x + 20, y + 0, z + 8, dSteel, 0, 3);
world.setBlock(x + 21, y + 0, z + 8, ModBlocks.fence_metal, 0, 3);
@ -327,11 +331,11 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 20, y + 0, z + 14, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 7, y + 0, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 0, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 0, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 0, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 0, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 0, z + 29, Block4, 0, 3);
world.setBlock(x + 5, y + 1, z + 8, Block3, 3, 3);
world.setBlock(x + 13, y + 1, z + 8, Block3, 3, 3);
world.setBlock(x + 5, y + 1, z + 8, Block3, s3, 3);
world.setBlock(x + 13, y + 1, z + 8, Block3, s3, 3);
world.setBlock(x + 17, y + 1, z + 8, dSteel, 0, 3);
world.setBlock(x + 18, y + 1, z + 8, dSteel, 0, 3);
world.setBlock(x + 19, y + 1, z + 8, ModBlocks.fence_metal, 0, 3);
@ -362,11 +366,11 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 20, y + 1, z + 14, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 7, y + 1, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 1, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 1, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 1, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 1, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 1, z + 29, Block4, 0, 3);
world.setBlock(x + 5, y + 2, z + 8, Block3, 3, 3);
world.setBlock(x + 13, y + 2, z + 8, Block3, 3, 3);
world.setBlock(x + 5, y + 2, z + 8, Block3, s3, 3);
world.setBlock(x + 13, y + 2, z + 8, Block3, s3, 3);
world.setBlock(x + 15, y + 2, z + 8, dSteel, 0, 3);
world.setBlock(x + 16, y + 2, z + 8, dSteel, 0, 3);
world.setBlock(x + 17, y + 2, z + 8, ModBlocks.fence_metal, 0, 3);
@ -397,10 +401,10 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 20, y + 2, z + 14, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 7, y + 2, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 2, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 2, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 2, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 2, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 2, z + 29, Block4, 0, 3);
world.setBlock(x + 5, y + 3, z + 8, Block3, 3, 3);
world.setBlock(x + 5, y + 3, z + 8, Block3, s3, 3);
world.setBlock(x + 13, y + 3, z + 8, dSteel, 0, 3);
world.setBlock(x + 14, y + 3, z + 8, dSteel, 0, 3);
world.setBlock(x + 15, y + 3, z + 8, ModBlocks.fence_metal, 0, 3);
@ -431,10 +435,10 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 20, y + 3, z + 14, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 7, y + 3, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 3, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 3, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 3, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 3, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 3, z + 29, Block4, 0, 3);
world.setBlock(x + 5, y + 4, z + 8, Block3, 3, 3);
world.setBlock(x + 5, y + 4, z + 8, Block3, s3, 3);
world.setBlock(x + 11, y + 4, z + 8, dSteel, 0, 3);
world.setBlock(x + 12, y + 4, z + 8, dSteel, 0, 3);
world.setBlock(x + 13, y + 4, z + 8, ModBlocks.fence_metal, 0, 3);
@ -465,10 +469,10 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 20, y + 4, z + 14, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 7, y + 4, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 4, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 4, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 4, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 4, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 4, z + 29, Block4, 0, 3);
world.setBlock(x + 5, y + 5, z + 8, Block3, 3, 3);
world.setBlock(x + 5, y + 5, z + 8, Block3, s3, 3);
world.setBlock(x + 9, y + 5, z + 8, dSteel, 0, 3);
world.setBlock(x + 10, y + 5, z + 8, dSteel, 0, 3);
world.setBlock(x + 11, y + 5, z + 8, ModBlocks.fence_metal, 0, 3);
@ -499,10 +503,10 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 20, y + 5, z + 14, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 7, y + 5, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 5, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 5, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 5, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 5, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 5, z + 29, Block4, 0, 3);
world.setBlock(x + 5, y + 6, z + 8, Block3, 3, 3);
world.setBlock(x + 5, y + 6, z + 8, Block3, s3, 3);
world.setBlock(x + 7, y + 6, z + 8, dSteel, 0, 3);
world.setBlock(x + 8, y + 6, z + 8, dSteel, 0, 3);
world.setBlock(x + 9, y + 6, z + 8, ModBlocks.fence_metal, 0, 3);
@ -533,7 +537,7 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 20, y + 6, z + 14, Library.getRandomConcrete(), 0, 3);
world.setBlock(x + 7, y + 6, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 6, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 6, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 6, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 6, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 6, z + 29, Block4, 0, 3);
world.setBlock(x + 5, y + 7, z + 8, dSteel, 0, 3);
@ -580,7 +584,7 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 6, y + 7, z + 16, dSteel, 0, 3);
world.setBlock(x + 7, y + 7, z + 17, Block4, 0, 3);
world.setBlock(x + 19, y + 7, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 7, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 7, z + 23, Block3, s5, 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, ModBlocks.fence_metal, 0, 3);
@ -621,7 +625,7 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 19, y + 8, z + 17, Block4, 0, 3);
world.setBlock(x + 5, y + 8, z + 18, dSteel, 0, 3);
world.setBlock(x + 6, y + 8, z + 18, dSteel, 0, 3);
world.setBlock(x + 5, y + 8, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 8, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 8, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 8, z + 29, Block4, 0, 3);
world.setBlock(x + 18, y + 9, z + 10, Library.getRandomConcrete(), 0, 3);
@ -654,7 +658,7 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 6, y + 9, z + 19, dSteel, 0, 3);
world.setBlock(x + 5, y + 9, z + 20, dSteel, 0, 3);
world.setBlock(x + 6, y + 9, z + 20, dSteel, 0, 3);
world.setBlock(x + 5, y + 9, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 9, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 9, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 9, z + 29, Block4, 0, 3);
world.setBlock(x + 18, y + 10, z + 10, Library.getRandomConcrete(), 0, 3);
@ -687,7 +691,7 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 6, y + 10, z + 21, dSteel, 0, 3);
world.setBlock(x + 5, y + 10, z + 22, dSteel, 0, 3);
world.setBlock(x + 6, y + 10, z + 22, dSteel, 0, 3);
world.setBlock(x + 5, y + 10, z + 23, Block3, 5, 3);
world.setBlock(x + 5, y + 10, z + 23, Block3, s5, 3);
world.setBlock(x + 7, y + 10, z + 29, Block4, 0, 3);
world.setBlock(x + 19, y + 10, z + 29, Block4, 0, 3);
world.setBlock(x + 18, y + 11, z + 10, Library.getRandomConcrete(), 0, 3);
@ -1067,7 +1071,7 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 14, y + 15, z + 23, dTape, 4, 3);
world.setBlock(x + 19, y + 15, z + 23, dSteel, 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 + 14, y + 15, z + 24, Block3, s5, 3);
world.setBlock(x + 19, y + 15, z + 24, dSteel, 0, 3);
world.setBlock(x + 19, y + 15, z + 25, dSteel, 0, 3);
world.setBlock(x + 19, y + 15, z + 26, dSteel, 0, 3);
@ -1136,7 +1140,7 @@ public class Satellite extends WorldGenerator
world.setBlock(x + 7, y + 16, z + 23, ModBlocks.fence_metal, 0, 3);
world.setBlock(x + 19, y + 16, z + 23, dSteel, 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 + 14, y + 16, z + 24, Block3, s5, 3);
world.setBlock(x + 19, y + 16, z + 24, dSteel, 0, 3);
world.setBlock(x + 19, y + 16, z + 25, dSteel, 0, 3);
world.setBlock(x + 19, y + 16, z + 26, dSteel, 0, 3);

2
src/main/java/com/hbm/world/feature/BedrockOre.java
View File

@ -34,7 +34,7 @@ public class BedrockOre {
for(int iz = z - 3; iz <= z + 3; iz++) {
for(int iy = 1; iy < 7; iy++) {
if(world.getBlock(ix, iy, iz) == Blocks.bedrock) {
if(iy < 3 || world.getBlock(ix, iy, iz) == Blocks.bedrock) {
world.setBlock(ix, iy, iz, ModBlocks.stone_depth);
}
}

12
src/main/java/com/hbm/world/generator/DungeonToolbox.java
View File

@ -94,13 +94,21 @@ public class DungeonToolbox {
}
}
public static void generateBedrockOreWithChance(World world, Random rand, int chunkX, int chunkZ, EnumBedrockOre ore, int tier, int chance) {
if(chance > 0 && rand.nextInt(chance) == 0) generateBedrockOre(world, rand, chunkX, chunkZ, ore, null, tier);
}
public static void generateBedrockOreWithChance(World world, Random rand, int chunkX, int chunkZ, EnumBedrockOre ore, FluidStack stack, int tier, int chance) {
if(chance > 0 && rand.nextInt(chance) == 0) generateBedrockOre(world, rand, chunkX, chunkZ, ore, null, tier);
}
public static void generateBedrockOre(World world, Random rand, int chunkX, int chunkZ, EnumBedrockOre ore, int tier) {
generateBedrockOre(world, rand, chunkX, chunkZ, ore, null, tier);
}
public static void generateBedrockOre(World world, Random rand, int chunkX, int chunkZ, EnumBedrockOre ore, FluidStack stack, int tier) {
int randPosX = chunkX + rand.nextInt(16);
int randPosZ = chunkZ + rand.nextInt(16);
int randPosX = chunkX + rand.nextInt(16) + 8;
int randPosZ = chunkZ + rand.nextInt(16) + 8;
BedrockOre.generate(world, randPosX, randPosZ, new ItemStack(ModItems.ore_bedrock, 1, ore.ordinal()), stack, ore.color, tier);
}

8
src/main/java/com/hbm/world/worldgen/components/CivilianFeatures.java
View File

@ -247,8 +247,8 @@ public class CivilianFeatures {
this.hasPlacedLoot[0] = true;
}
this.fillWithBlocks(world, box, 4, 1, sizeZ - 1, 5, 1, sizeZ - 1, ModBlocks.crate, Blocks.air, false);
this.fillWithMetadataBlocks(world, box, 5, 1, 4, 5, 3, 4, ModBlocks.steel_scaffold, eastMeta, Blocks.air, 0, false);
this.fillWithMetadataBlocks(world, box, 5, 1, 6, 5, 3, 6, ModBlocks.steel_scaffold, eastMeta, Blocks.air, 0, false);
this.fillWithMetadataBlocks(world, box, 5, 1, 4, 5, 3, 4, ModBlocks.steel_scaffold, eastMeta < 4 ? 0 : 8, Blocks.air, 0, false);
this.fillWithMetadataBlocks(world, box, 5, 1, 6, 5, 3, 6, ModBlocks.steel_scaffold, eastMeta < 4 ? 0 : 8, Blocks.air, 0, false);
this.placeBlockAtCurrentPosition(world, ModBlocks.steel_grate, 7, 5, 1, 5, box);
this.placeBlockAtCurrentPosition(world, ModBlocks.crate_weapon, 0, 5, 2, 5, box);
@ -377,7 +377,7 @@ public class CivilianFeatures {
ItemDoor.placeDoorBlock(world, this.getXWithOffset(3, sizeZ - 1), this.getYWithOffset(1), this.getZWithOffset(3, sizeZ - 1), doorMeta, ModBlocks.door_office);
int northDecoMeta = this.getDecoMeta(3);
this.fillWithMetadataBlocks(world, box, 5, sizeY - 1, 1, sizeX - 1, sizeY - 1, 1, ModBlocks.steel_scaffold, westDecoMeta, Blocks.air, 0, false);
this.fillWithMetadataBlocks(world, box, 5, sizeY - 1, 1, sizeX - 1, sizeY - 1, 1, ModBlocks.steel_scaffold, westDecoMeta < 4 ? 0 : 8, Blocks.air, 0, false);
this.fillWithMetadataBlocks(world, box, 5, sizeY - 1, 2, sizeX - 1, sizeY - 1, 2, ModBlocks.steel_wall, northDecoMeta, Blocks.air, 0, false);
this.placeBlockAtCurrentPosition(world, ModBlocks.machine_electric_furnace_off, northDecoMeta, 5, 1, 1, box);
this.placeBlockAtCurrentPosition(world, ModBlocks.machine_microwave, northDecoMeta, 5, 2, 1, box);
@ -695,7 +695,7 @@ public class CivilianFeatures {
this.fillWithBlocks(world, box, 5, 1, 1, 5, 1, 2, ModBlocks.deco_beryllium, Blocks.air, false);
this.fillWithBlocks(world, box, 6, 1, 1, 6, 3, 1, ModBlocks.deco_red_copper, Blocks.air, false);
this.fillWithBlocks(world, box, 3, 1, 4, 4, 1, 4, ModBlocks.concrete_super_broken, Blocks.air, false);
this.fillWithMetadataBlocks(world, box, 6, 1, 4, 6, 3, 4, ModBlocks.steel_scaffold, eastMeta, Blocks.air, 0, false);
this.fillWithMetadataBlocks(world, box, 6, 1, 4, 6, 3, 4, ModBlocks.steel_scaffold, eastMeta < 4 ? 0 : 8, Blocks.air, 0, false);
this.fillWithMetadataBlocks(world, box, 6, 1, 5, 6, 1, 7, ModBlocks.steel_grate, 7, Blocks.air, 0, false);
this.placeBlockAtCurrentPosition(world, ModBlocks.radiorec, eastMeta, 6, 2, sizeZ - 1, box);
this.fillWithMetadataBlocks(world, box, 2, 1, sizeZ - 1, 3, 1, sizeZ - 1, ModBlocks.machine_electric_furnace_off, southMeta, Blocks.air, 0, false);

44
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -2330,36 +2330,20 @@ item.oil_tar.name=Ölteer
item.oil_tar.crude.name=Erdölteer
item.oil_tar.crack.name=Crackölteer
item.oil_tar.wood.name=Holzteer
item.ore_bedrock.asbestos.name=Bedrock-Asbesterz
item.ore_bedrock.borax.name=Bedrock-Boraxerz
item.ore_bedrock.copper.name=Bedrock-Kupfererz
item.ore_bedrock.iron.name=Bedrock-Eisenerz
item.ore_bedrock.niobium.name=Bedrock-Nioberz
item.ore_centrifuged.asbestos.name=Zentrifugiertes Asbesterz
item.ore_centrifuged.borax.name=Zentrifugiertes Boraxerz
item.ore_centrifuged.copper.name=Zentrifugiertes Kupfererz
item.ore_centrifuged.iron.name=Zentrifugiertes Eisenerz
item.ore_centrifuged.niobium.name=Zentrifugiertes Nioberz
item.ore_cleaned.asbestos.name=Gereinigtes Asbesterz
item.ore_cleaned.borax.name=Gereinigtes Boraxerz
item.ore_cleaned.copper.name=Gereinigtes Kupfererz
item.ore_cleaned.iron.name=Gereinigtes Eisenerz
item.ore_cleaned.niobium.name=Gereinigtes Nioberz
item.ore_enriched.asbestos.name=Reiches Asbesterz
item.ore_enriched.borax.name=Reiches Boraxerz
item.ore_enriched.copper.name=Reiches Kupfererz
item.ore_enriched.iron.name=Reiches Eisenerz
item.ore_enriched.niobium.name=Reiches Nioberz
item.ore_purified.asbestos.name=Pures Asbesterz
item.ore_purified.borax.name=Pures Boraxerz
item.ore_purified.copper.name=Pures Kupfererz
item.ore_purified.iron.name=Pures Eisenerz
item.ore_purified.niobium.name=Pures Nioberz
item.ore_separated.asbestos.name=Separiertes Asbesterz
item.ore_separated.borax.name=Separiertes Boraxerz
item.ore_separated.copper.name=Separiertes Kupfererz
item.ore_separated.iron.name=Separiertes Eisenerz
item.ore_separated.niobium.name=Separiertes Nioberz
item.ore.asbestos=Asbest
item.ore.borax=Borax
item.ore.copper=Kupfer
item.ore.gold=Gold
item.ore.iron=Eisen
item.ore.niobium=Niob
item.ore.titanium=Titan
item.ore.tungsten=Wolfram
item.ore_bedrock.name=Bedrock-%serz
item.ore_centrifuged.name=Zentrifugiertes %serz
item.ore_cleaned.name=Gereinigtes %serz
item.ore_enriched.name=Reiches %serz
item.ore_purified.name=Pures %serz
item.ore_separated.name=Separiertes %serz
item.overfuse.name=Singularitätsschraubenzieher
item.oxy_mask.name=Sauerstoffmaske
item.paa_boots.name=PaA-"olle Latschen"

44
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -2768,36 +2768,20 @@ item.oil_tar.coal.name=Coal Tar
item.oil_tar.crude.name=Oil Tar
item.oil_tar.crack.name=Crack Oil Tar
item.oil_tar.wood.name=Wood Tar
item.ore_bedrock.asbestos.name=Asbestos Bedrock Ore
item.ore_bedrock.borax.name=Borax Bedrock Ore
item.ore_bedrock.copper.name=Copper Bedrock Ore
item.ore_bedrock.iron.name=Iron Bedrock Ore
item.ore_bedrock.niobium.name=Niobium Bedrock Ore
item.ore_centrifuged.asbestos.name=Centrifuged Asbestos Ore
item.ore_centrifuged.borax.name=Centrifuged Borax Ore
item.ore_centrifuged.copper.name=Centrifuged Copper Ore
item.ore_centrifuged.iron.name=Centrifuged Iron Ore
item.ore_centrifuged.niobium.name=Centrifuged Niobium Ore
item.ore_cleaned.asbestos.name=Cleaned Asbestos Ore
item.ore_cleaned.borax.name=Cleaned Borax Ore
item.ore_cleaned.copper.name=Cleaned Copper Ore
item.ore_cleaned.iron.name=Cleaned Iron Ore
item.ore_cleaned.niobium.name=Cleaned Niobium Ore
item.ore_enriched.asbestos.name=Enriched Asbestos Ore
item.ore_enriched.borax.name=Enriched Borax Ore
item.ore_enriched.copper.name=Enriched Copper Ore
item.ore_enriched.iron.name=Enriched Iron Ore
item.ore_enriched.niobium.name=Enriched Niobium Ore
item.ore_purified.asbestos.name=Purified Asbestos Ore
item.ore_purified.borax.name=Purified Borax Ore
item.ore_purified.copper.name=Purified Copper Ore
item.ore_purified.iron.name=Purified Iron Ore
item.ore_purified.niobium.name=Purified Niobium Ore
item.ore_separated.asbestos.name=Separated Asbestos Ore
item.ore_separated.borax.name=Separated Borax Ore
item.ore_separated.copper.name=Separated Copper Ore
item.ore_separated.iron.name=Separated Iron Ore
item.ore_separated.niobium.name=Separated Niobium Ore
item.ore.asbestos=Asbestos
item.ore.borax=Borax
item.ore.copper=Copper
item.ore.gold=Gold
item.ore.iron=Iron
item.ore.niobium=Niobium
item.ore.titanium=Titanium
item.ore.tungsten=Tungsten
item.ore_bedrock.name=%s Bedrock Ore
item.ore_centrifuged.name=Centrifuged %s Ore
item.ore_cleaned.name=Cleaned %s Ore
item.ore_enriched.name=Enriched %s Ore
item.ore_purified.name=Purified %s Ore
item.ore_separated.name=Separated %s Ore
item.overfuse.name=Singularity Screwdriver
item.overfuse.desc=Say what?
item.oxy_mask.name=Oxygen Mask

2
src/main/resources/mcmod.info
View File

@ -3,7 +3,7 @@
"modid": "hbm",
"name": "Hbm's Nuclear Tech",
"description": "A mod that adds weapons, nuclear themed stuff and machines",
"version":"1.0.27_X4474",
"version":"1.0.27_X4476",
"mcversion": "1.7.10",
"url": "",
"updateUrl": "",