diff --git a/changelog b/changelog index 94440b72f..7908d76a1 100644 --- a/changelog +++ b/changelog @@ -57,6 +57,9 @@ * Removed the factory hull blocks * Removed the vacuum block that has been unused for like 5 years at this point * Removed five of the 10 stuurdy ladder variants because they were hella ugly anyway +* Added a new alternate recipe "instant aggregate" in the chemical plant, turning 16 cobblestone into 8 gravel and 8 sand +* Added a new alternate recipe for making obsidian in the chemical plant +* Removed the water and steam geysers, which were so obscenely rare most people have never seen either one of them, and became functionally useless without the old geothermal generator ## Fixed * Fixed RoR graph showing the wrong name in the GUI diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 1869b0ca5..b153716c9 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -525,9 +525,7 @@ public class ModBlocks { public static Block ore_sellafield_schrabidium; public static Block ore_sellafield_radgem; - public static Block geysir_water; public static Block geysir_chlorine; - public static Block geysir_vapor; public static Block geysir_nether; public static Block flame_war; @@ -694,8 +692,8 @@ public class ModBlocks { public static Block machine_furnace_brick_off; public static Block machine_furnace_brick_on; - public static Block machine_rtg_furnace_off; - public static Block machine_rtg_furnace_on; + @Deprecated public static Block machine_rtg_furnace_off; + @Deprecated public static Block machine_rtg_furnace_on; public static Block machine_industrial_generator; @@ -1685,9 +1683,7 @@ public class ModBlocks { ore_sellafield_schrabidium = new BlockSellafieldOre(Material.rock).setBlockName("ore_sellafield_schrabidium").setStepSound(Block.soundTypeStone).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setBlockTextureName(RefStrings.MODID + ":ore_overlay_schrabidium"); ore_sellafield_radgem = new BlockSellafieldOre(Material.rock).setBlockName("ore_sellafield_radgem").setStepSound(Block.soundTypeStone).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setBlockTextureName(RefStrings.MODID + ":ore_overlay_radgem"); - geysir_water = new BlockGeysir(Material.rock).setBlockName("geysir_water").setStepSound(Block.soundTypeStone).setHardness(5.0F); geysir_chlorine = new BlockGeysir(Material.rock).setBlockName("geysir_chlorine").setStepSound(Block.soundTypeStone).setHardness(5.0F); - geysir_vapor = new BlockGeysir(Material.rock).setBlockName("geysir_vapor").setStepSound(Block.soundTypeStone).setHardness(5.0F); geysir_nether = new BlockGeysir(Material.rock).setBlockName("geysir_nether").setLightLevel(1.0F).setStepSound(Block.soundTypeStone).setHardness(2.0F); nuke_gadget = new NukeGadget(Material.iron).setBlockName("nuke_gadget").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(200.0F).setBlockTextureName(RefStrings.MODID + ":theGadget"); @@ -2840,9 +2836,7 @@ public class ModBlocks { GameRegistry.registerBlock(sellafield, ItemBlockNamedMeta.class, sellafield.getUnlocalizedName()); //Geysirs - GameRegistry.registerBlock(geysir_water, geysir_water.getUnlocalizedName()); GameRegistry.registerBlock(geysir_chlorine, geysir_chlorine.getUnlocalizedName()); - GameRegistry.registerBlock(geysir_vapor, geysir_vapor.getUnlocalizedName()); GameRegistry.registerBlock(geysir_nether, geysir_nether.getUnlocalizedName()); //Nukes diff --git a/src/main/java/com/hbm/blocks/generic/BlockGeysir.java b/src/main/java/com/hbm/blocks/generic/BlockGeysir.java index 1cff744d6..332113134 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockGeysir.java +++ b/src/main/java/com/hbm/blocks/generic/BlockGeysir.java @@ -60,16 +60,6 @@ public class BlockGeysir extends BlockContainer { @SideOnly(Side.CLIENT) public void randomDisplayTick(World p_149734_1_, int x, int y, int z, Random rand) { - int l = p_149734_1_.getBlockMetadata(x, y, z); - - if(this == ModBlocks.geysir_vapor && l == 1) { - float f = x + 0.5F; - float f1 = y + 1.0F; - float f2 = z + 0.5F; - - p_149734_1_.spawnParticle("cloud", f, f1, f2, 0.0D, 0.1D, 0.0D); - } - if(this == ModBlocks.geysir_nether) { p_149734_1_.spawnParticle("flame", x + 0.5F, y + 1.0625F, z + 0.5F, 0.0D, 0.0D, 0.0D); } diff --git a/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java index ce1a44c4a..0300faf9b 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java @@ -27,12 +27,13 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +@Deprecated public class MachineRtgFurnace extends BlockContainer { - private final Random field_149933_a = new Random(); + private final Random field_149933_a = new Random(); private final boolean isActive; private static boolean keepInventory; - + @SideOnly(Side.CLIENT) private IIcon iconTop; @SideOnly(Side.CLIENT) @@ -42,7 +43,7 @@ public class MachineRtgFurnace extends BlockContainer { super(Material.iron); isActive = blockState; } - + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { @@ -50,93 +51,47 @@ public class MachineRtgFurnace extends BlockContainer { this.iconFront = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":machine_rtg_furnace_on_alt" : ":machine_rtg_furnace_off_alt")); this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_rtg_furnace_side_alt"); } - + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { return metadata == 0 && side == 3 ? this.iconFront : (side == metadata ? this.iconFront : (side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon))); } - + @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) - { - return Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off); - } - - @Override - public void onBlockAdded(World world, int x, int y, int z) { - super.onBlockAdded(world, x, y, z); - this.setDefaultDirection(world, x, y, z); + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + return null; } - - private void setDefaultDirection(World world, int x, int y, int z) { - if(!world.isRemote) - { - Block block1 = world.getBlock(x, y, z - 1); - Block block2 = world.getBlock(x, y, z + 1); - Block block3 = world.getBlock(x - 1, y, z); - Block block4 = world.getBlock(x + 1, y, z); - - byte b0 = 3; - - if(block1.func_149730_j() && !block2.func_149730_j()) - { - b0 = 3; - } - if(block2.func_149730_j() && !block1.func_149730_j()) - { - b0 = 2; - } - if(block3.func_149730_j() && !block4.func_149730_j()) - { - b0 = 5; - } - if(block4.func_149730_j() && !block3.func_149730_j()) - { - b0 = 4; - } - - world.setBlockMetadataWithNotify(x, y, z, b0, 2); - } - } - + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - if(i == 0) - { + + if(i == 0) { world.setBlockMetadataWithNotify(x, y, z, 2, 2); } - if(i == 1) - { + if(i == 1) { world.setBlockMetadataWithNotify(x, y, z, 5, 2); } - if(i == 2) - { + if(i == 2) { world.setBlockMetadataWithNotify(x, y, z, 3, 2); } - if(i == 3) - { + if(i == 3) { world.setBlockMetadataWithNotify(x, y, z, 4, 2); } - - if(itemStack.hasDisplayName()) - { - ((TileEntityRtgFurnace)world.getTileEntity(x, y, z)).setCustomName(itemStack.getDisplayName()); + + if(itemStack.hasDisplayName()) { + ((TileEntityRtgFurnace) world.getTileEntity(x, y, z)).setCustomName(itemStack.getDisplayName()); } } - + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if(world.isRemote) - { + if(world.isRemote) { return true; - } else if(!player.isSneaking()) - { + } else if(!player.isSneaking()) { TileEntityRtgFurnace entity = (TileEntityRtgFurnace) world.getTileEntity(x, y, z); - if(entity != null) - { + if(entity != null) { FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; @@ -154,117 +109,98 @@ public class MachineRtgFurnace extends BlockContainer { int i = world.getBlockMetadata(x, y, z); TileEntity entity = world.getTileEntity(x, y, z); keepInventory = true; - - if(isProcessing) - { + + if(isProcessing) { world.setBlock(x, y, z, ModBlocks.machine_rtg_furnace_on); - }else{ + } else { world.setBlock(x, y, z, ModBlocks.machine_rtg_furnace_off); } - + keepInventory = false; world.setBlockMetadataWithNotify(x, y, z, i, 2); - + if(entity != null) { entity.validate(); world.setTileEntity(x, y, z, entity); } } - + @Override - public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) - { - if (!keepInventory) - { - ISidedInventory tileentityfurnace = (ISidedInventory)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) { + if(!keepInventory) { + ISidedInventory tileentityfurnace = (ISidedInventory) p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); - if (tileentityfurnace != null) - { - for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) - { - ItemStack itemstack = tileentityfurnace.getStackInSlot(i1); + if(tileentityfurnace != null) { + for(int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) { + ItemStack itemstack = tileentityfurnace.getStackInSlot(i1); - if (itemstack != null) - { - float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F; - float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; - float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + if(itemstack != null) { + float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; - while (itemstack.stackSize > 0) - { - int j1 = this.field_149933_a.nextInt(21) + 10; + while(itemstack.stackSize > 0) { + int j1 = this.field_149933_a.nextInt(21) + 10; - if (j1 > itemstack.stackSize) - { - j1 = itemstack.stackSize; - } + if(j1 > itemstack.stackSize) { + j1 = itemstack.stackSize; + } - itemstack.stackSize -= j1; - EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); - if (itemstack.hasTagCompound()) - { - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } + if(itemstack.hasTagCompound()) { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); + } - float f3 = 0.05F; - entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3; - entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3; - p_149749_1_.spawnEntityInWorld(entityitem); - } - } - } + float f3 = 0.05F; + entityitem.motionX = (float) this.field_149933_a.nextGaussian() * f3; + entityitem.motionY = (float) this.field_149933_a.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float) this.field_149933_a.nextGaussian() * f3; + p_149749_1_.spawnEntityInWorld(entityitem); + } + } + } - p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); - } - } + p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); + } + } + + super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); + } - super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); - } - @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(World p_149734_1_, int x, int y, int z, Random rand) - { - if (isActive) - { - int l = p_149734_1_.getBlockMetadata(x, y, z); - float f = x + 0.5F; - float f1 = y + 0.25F + rand.nextFloat() * 6.0F / 16.0F; - float f2 = z + 0.5F; - float f3 = 0.52F; - float f4 = rand.nextFloat() * 0.6F - 0.3F; - rand.nextFloat(); - rand.nextFloat(); + public void randomDisplayTick(World p_149734_1_, int x, int y, int z, Random rand) { + if(isActive) { + int l = p_149734_1_.getBlockMetadata(x, y, z); + float f = x + 0.5F; + float f1 = y + 0.25F + rand.nextFloat() * 6.0F / 16.0F; + float f2 = z + 0.5F; + float f3 = 0.52F; + float f4 = rand.nextFloat() * 0.6F - 0.3F; + rand.nextFloat(); + rand.nextFloat(); - if (l == 4) - { - p_149734_1_.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - p_149734_1_.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - } - else if (l == 5) - { - p_149734_1_.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - p_149734_1_.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - } - else if (l == 2) - { - p_149734_1_.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - p_149734_1_.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - } - else if (l == 3) - { - p_149734_1_.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); - p_149734_1_.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); - } - } - } + if(l == 4) { + p_149734_1_.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + } else if(l == 5) { + p_149734_1_.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + } else if(l == 2) { + p_149734_1_.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + } else if(l == 3) { + p_149734_1_.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + } + } + } - @Override + @Override @SideOnly(Side.CLIENT) - public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) - { - return Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off); - } + public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) { + return Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off); + } } diff --git a/src/main/java/com/hbm/config/WorldConfig.java b/src/main/java/com/hbm/config/WorldConfig.java index b3df9a213..ce87ae285 100644 --- a/src/main/java/com/hbm/config/WorldConfig.java +++ b/src/main/java/com/hbm/config/WorldConfig.java @@ -88,7 +88,6 @@ public class WorldConfig { public static int dudStructure = 500; public static int spaceshipStructure = 1000; public static int barrelStructure = 5000; - public static int geyserWater = 3000; public static int geyserChlorine = 3000; public static int geyserVapor = 250; public static int capsuleStructure = 100; @@ -212,7 +211,6 @@ public class WorldConfig { minefreq = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.14_landmineSpawn", "Spawn AP landmine on every nTH chunk", 64); radfreq = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.15_radHotspotSpawn", "Spawn radiation hotspot on every nTH chunk", 5000); vaultfreq = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.16_vaultSpawn", "Spawn locked safe on every nTH chunk", 2500); - geyserWater = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.17_geyserWaterSpawn", "Spawn water geyser on every nTH chunk", 3000); geyserChlorine = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.18_geyserChlorineSpawn", "Spawn poison geyser on every nTH chunk", 3000); geyserVapor = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.19_geyserVaporSpawn", "Spawn vapor geyser on every nTH chunk", 250); capsuleStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.21_capsuleSpawn", "Spawn landing capsule on every nTH chunk", 100); @@ -246,7 +244,6 @@ public class WorldConfig { dudStructure = CommonConfig.setDefZero(dudStructure, 1000); spaceshipStructure = CommonConfig.setDefZero(spaceshipStructure, 1000); barrelStructure = CommonConfig.setDefZero(barrelStructure, 1000); - geyserWater = CommonConfig.setDefZero(geyserWater, 1000); geyserChlorine = CommonConfig.setDefZero(geyserChlorine, 1000); geyserVapor = CommonConfig.setDefZero(geyserVapor, 1000); broadcaster = CommonConfig.setDefZero(broadcaster, 1000); diff --git a/src/main/java/com/hbm/entity/EntityMappings.java b/src/main/java/com/hbm/entity/EntityMappings.java index 671545643..ae6341aad 100644 --- a/src/main/java/com/hbm/entity/EntityMappings.java +++ b/src/main/java/com/hbm/entity/EntityMappings.java @@ -104,7 +104,6 @@ public class EntityMappings { addEntity(EntityDuchessGambit.class, "entity_duchessgambit", 1000); addEntity(EntityMissileEMPStrong.class, "entity_missile_emp_strong", 1000); addEntity(EntityEMP.class, "entity_emp_logic", 1000); - addEntity(EntityWaterSplash.class, "entity_water_splash", 1000); addEntity(EntityBobmazon.class, "entity_bobmazon_delivery", 1000); addEntity(EntityMissileCustom.class, "entity_custom_missile", 1000); addEntity(EntityBalefire.class, "entity_balefire", 1000); diff --git a/src/main/java/com/hbm/entity/projectile/EntityWaterSplash.java b/src/main/java/com/hbm/entity/projectile/EntityWaterSplash.java deleted file mode 100644 index 49ea4ae20..000000000 --- a/src/main/java/com/hbm/entity/projectile/EntityWaterSplash.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hbm.entity.projectile; - -import com.hbm.main.MainRegistry; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -public class EntityWaterSplash extends EntityThrowable { - - public EntityWaterSplash(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityWaterSplash(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - @Override - public void entityInit() { - } - - public EntityWaterSplash(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void onUpdate() { - super.onUpdate(); - - if(!worldObj.isRemote) { - - if(this.ticksExisted > 200) { - this.setDead(); - } - } else { - NBTTagCompound data = new NBTTagCompound(); - data.setString("type", "waterSplash"); - data.setDouble("posX", posX); - data.setDouble("posY", posY); - data.setDouble("posZ", posZ); - MainRegistry.proxy.effectNT(data); - } - } - - @Override - protected void onImpact(MovingObjectPosition p_70184_1_) { - if(this.ticksExisted > 5) { - worldObj.spawnParticle("splash", posX, posY, posZ, 0.0D, 0.0D, 0.0D); - this.setDead(); - } - } - - @Override - public boolean writeToNBTOptional(NBTTagCompound nbt) { - return false; - } - - @Override - public void readEntityFromNBT(NBTTagCompound nbt) { - super.readEntityFromNBT(nbt); - this.setDead(); - } -} diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 730c9c5b1..f99b86ee1 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -237,7 +237,7 @@ public class Fluids { public static final FT_Polluting P_OIL = new FT_Polluting().burn(PollutionType.SOOT, SOOT_UNREFINED_OIL).release(PollutionType.POISON, POISON_OIL); public static final FT_Polluting P_FUEL = new FT_Polluting().burn(PollutionType.SOOT, SOOT_REFINED_OIL).release(PollutionType.POISON, POISON_OIL); public static final FT_Polluting P_FUEL_LEADED = new FT_Polluting().burn(PollutionType.SOOT, SOOT_REFINED_OIL).burn(PollutionType.HEAVYMETAL, LEAD_FUEL).release(PollutionType.POISON, POISON_OIL).release(PollutionType.HEAVYMETAL, LEAD_FUEL * 0.1F); - public static final FT_Polluting P_GAS = new FT_Polluting().burn(PollutionType.SOOT, SOOT_GAS); + public static final FT_Polluting P_GAS = new FT_Polluting().burn(PollutionType.SOOT, SOOT_GAS).release(PollutionType.POISON, POISON_OIL); public static final FT_Polluting P_LIQUID_GAS = new FT_Polluting().burn(PollutionType.SOOT, SOOT_GAS * 2F); public static void init() { @@ -348,7 +348,7 @@ public class Fluids { HEAVYOIL_VACUUM = new FluidType("HEAVYOIL_VACUUM", 0x131214, 2, 1, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, P_OIL).addContainers(new CD_Canister(0x513F39)); REFORMATE = new FluidType("REFORMATE", 0x835472, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, P_FUEL).addContainers(new CD_Canister(0xD180D6)); LIGHTOIL_VACUUM = new FluidType("LIGHTOIL_VACUUM", 0x8C8851, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID, P_FUEL).addContainers(new CD_Canister(0xB46B52)); - SOURGAS = new FluidType("SOURGAS", 0xC9BE0D, 4, 4, 0, EnumSymbol.ACID).addContainers(new CD_Gastank(0xC9BE0D, 0x303030)).addTraits(GASEOUS, new FT_Corrosive(10), new FT_Poison(false, 1), P_GAS); + SOURGAS = new FluidType("SOURGAS", 0xC9BE0D, 4, 4, 0, EnumSymbol.ACID).addContainers(new CD_Gastank(0xC9BE0D, 0x303030)).addTraits(GASEOUS, new FT_Corrosive(10), new FT_Poison(false, 1), new FT_Polluting().burn(PollutionType.SOOT, SOOT_GAS).release(PollutionType.POISON, POISON_EXTREME)); XYLENE = new FluidType("XYLENE", 0x5C4E76, 2, 3, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, P_FUEL).addContainers(new CD_Canister(0xA380D6)); HEATINGOIL_VACUUM = new FluidType("HEATINGOIL_VACUUM", 0x211D06, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, P_OIL).addContainers(new CD_Canister(0x694235)); DIESEL_REFORM = new FluidType("DIESEL_REFORM", 0xCDC3C6, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID, P_FUEL).addContainers(new CD_Canister(0xFFC500)); diff --git a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java index 9fb9ddff7..08331008d 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java @@ -128,9 +128,15 @@ public class ChemicalPlantRecipes extends GenericRecipes { this.register(new GenericRecipe("chem.cobble").setup(20, 100) .inputFluids(new FluidStack(Fluids.WATER, 1_000), new FluidStack(Fluids.LAVA, 25)) .outputItems(new ItemStack(Blocks.cobblestone))); - this.register(new GenericRecipe("chem.stone").setup(60, 500).setPools(GenericRecipes.POOL_PREFIX_DISCOVER) + this.register(new GenericRecipe("chem.stone").setup(60, 500).setPools(GenericRecipes.POOL_PREFIX_DISCOVER + ".stone") .inputFluids(new FluidStack(Fluids.WATER, 1_000), new FluidStack(Fluids.LAVA, 25), new FluidStack(Fluids.AIR, 4_000)) .outputItems(new ItemStack(Blocks.stone))); + this.register(new GenericRecipe("chem.obsidian").setup(60, 500).setPools(GenericRecipes.POOL_PREFIX_DISCOVER + ".stone") + .inputFluids(new FluidStack(Fluids.WATER, 1_000), new FluidStack(Fluids.LAVA, 500), new FluidStack(Fluids.AIR, 4_000)) + .outputItems(new ItemStack(Blocks.obsidian))); + this.register(new GenericRecipe("chem.aggregate").setup(320, 500).setPools(GenericRecipes.POOL_PREFIX_DISCOVER + ".stone") + .inputItems(new ComparableStack(Blocks.cobblestone, 16)) + .outputItems(new ItemStack(Blocks.gravel, 8), new ItemStack(Blocks.sand, 8))); this.register(new GenericRecipe("chem.concrete").setup(100, 100) .inputItems(new ComparableStack(ModItems.powder_cement, 1), new ComparableStack(Blocks.gravel, 8), new OreDictStack(KEY_SAND, 8)) .inputFluids(new FluidStack(Fluids.WATER, 2_000)) diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index e8a4171ad..20ee810dd 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -345,7 +345,7 @@ public class HbmWorldGen implements IWorldGenerator { } } - if (WorldConfig.geyserChlorine > 0 && biome == BiomeGenBase.plains && rand.nextInt(WorldConfig.geyserWater) == 0) { + if (WorldConfig.geyserChlorine > 0 && biome == BiomeGenBase.plains && rand.nextInt(WorldConfig.geyserChlorine) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -354,15 +354,6 @@ public class HbmWorldGen implements IWorldGenerator { new Geyser().generate(world, rand, x, y, z); } - if (WorldConfig.geyserWater > 0 && biome == BiomeGenBase.desert && rand.nextInt(WorldConfig.geyserChlorine) == 0) { - int x = i + rand.nextInt(16); - int z = j + rand.nextInt(16); - int y = world.getHeightValue(x, z); - - if(world.getBlock(x, y - 1, z) == Blocks.sand) - new GeyserLarge().generate(world, rand, x, y, z); - } - if (WorldConfig.capsuleStructure > 0 && biome == BiomeGenBase.beach && rand.nextInt(WorldConfig.capsuleStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); @@ -383,20 +374,6 @@ public class HbmWorldGen implements IWorldGenerator { } } - if (WorldConfig.geyserVapor > 0 && rand.nextInt(WorldConfig.geyserVapor) == 0) { - int x = i + rand.nextInt(16); - int z = j + rand.nextInt(16); - int y = world.getHeightValue(x, z); - - for(int k = 1; k >= -1; k--) { - if(world.getBlock(x, y + k, z) == Blocks.stone) { - world.setBlock(x, y + k, z, ModBlocks.geysir_vapor); - MainRegistry.logger.info("[Debug] Successfully spawned vapor geyser at " + x + " " + z); - break; - } - } - } - if (rand.nextInt(1000) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index da185a2c1..fd92d2261 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -622,7 +622,6 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerEntityRenderingHandler(EntityRubble.class, new RenderRubble()); RenderingRegistry.registerEntityRenderingHandler(EntityShrapnel.class, new RenderShrapnel()); RenderingRegistry.registerEntityRenderingHandler(EntityFireworks.class, new RenderShrapnel()); - RenderingRegistry.registerEntityRenderingHandler(EntityWaterSplash.class, new RenderEmpty()); RenderingRegistry.registerEntityRenderingHandler(EntityEMP.class, new RenderEmpty()); RenderingRegistry.registerEntityRenderingHandler(EntityRBMKDebris.class, new RenderRBMKDebris()); RenderingRegistry.registerEntityRenderingHandler(EntityZirnoxDebris.class, new RenderZirnoxDebris()); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 5b92a388e..53bb60690 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1615,6 +1615,8 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.ladder_lead"); ignoreMappings.add("hbm:tile.ladder_cobalt"); ignoreMappings.add("hbm:tile.ladder_tungsten"); + ignoreMappings.add("hbm:tile.geysir_water"); + ignoreMappings.add("hbm:tile.geysir_vapor"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/tileentity/deco/TileEntityGeysir.java b/src/main/java/com/hbm/tileentity/deco/TileEntityGeysir.java index 273cb198d..af6be5a6e 100644 --- a/src/main/java/com/hbm/tileentity/deco/TileEntityGeysir.java +++ b/src/main/java/com/hbm/tileentity/deco/TileEntityGeysir.java @@ -1,24 +1,18 @@ package com.hbm.tileentity.deco; -import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.particle.EntityOrangeFX; import com.hbm.entity.projectile.EntityShrapnel; -import com.hbm.entity.projectile.EntityWaterSplash; import com.hbm.handler.threading.PacketThreading; import com.hbm.packet.toclient.AuxParticlePacketNT; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -50,17 +44,6 @@ public class TileEntityGeysir extends TileEntity { } } - private void water() { - - EntityWaterSplash fx = new EntityWaterSplash(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5); - - fx.motionX = worldObj.rand.nextGaussian() * 0.35; - fx.motionZ = worldObj.rand.nextGaussian() * 0.35; - fx.motionY = 2; - - worldObj.spawnEntityInWorld(fx); - } - private void chlorine() { for(int i = 0; i < 3; i++) { @@ -75,21 +58,6 @@ public class TileEntityGeysir extends TileEntity { } - private void vapor() { - - List entities = this.worldObj.getEntitiesWithinAABB(Entity.class, - AxisAlignedBB.getBoundingBox(this.xCoord - 0.5, this.yCoord + 0.5, this.zCoord - 0.5, this.xCoord + 1.5, - this.yCoord + 2, this.zCoord + 1.5)); - - if (!entities.isEmpty()) { - for (Entity e : entities) { - - if(e instanceof EntityLivingBase) - ((EntityLivingBase)e).addPotionEffect(new PotionEffect(Potion.regeneration.id, 20, 0)); - } - } - } - private void fire() { int range = 32; @@ -121,22 +89,10 @@ public class TileEntityGeysir extends TileEntity { int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); Random rand = worldObj.rand; - if(b == ModBlocks.geysir_water) { - - return (meta == 0 ? 30 : 100 + rand.nextInt(40)); - - } else if(b == ModBlocks.geysir_chlorine) { - + if(b == ModBlocks.geysir_chlorine) { return (meta == 0 ? 20 : 400 + rand.nextInt(100)); - - } else if(b == ModBlocks.geysir_vapor) { - - return (meta == 0 ? 20 : 30 + rand.nextInt(20)); - } else if(b == ModBlocks.geysir_nether) { - return (meta == 0 ? (rand.nextBoolean() ? 300 : 450) : 80 + rand.nextInt(60)); - } return 0; @@ -146,18 +102,8 @@ public class TileEntityGeysir extends TileEntity { Block b = worldObj.getBlock(xCoord, yCoord, zCoord); - if(b == ModBlocks.geysir_water) { - water(); - - } else if(b == ModBlocks.geysir_chlorine) { - chlorine(); - - } else if(b == ModBlocks.geysir_vapor) { - vapor(); - - } else if(b == ModBlocks.geysir_nether) { - fire(); - } + if(b == ModBlocks.geysir_chlorine) chlorine(); + else if(b == ModBlocks.geysir_nether) fire(); } } diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom002.java b/src/main/java/com/hbm/world/dungeon/DesertAtom002.java index 0ce58ea95..0742c39e1 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom002.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom002.java @@ -26,7 +26,7 @@ public class DesertAtom002 Block Block7 = ModBlocks.deco_tungsten; Block Block8 = ModBlocks.steel_poles; Block Block9 = ModBlocks.tape_recorder; - Block Block10 = ModBlocks.machine_rtg_furnace_off; + Block Block10 = ModBlocks.machine_electric_furnace_off; Block Block11 = ModBlocks.reinforced_glass; Block Block12 = ModBlocks.reinforced_lamp_off; Block Block13 = ModBlocks.pole_satellite_receiver; diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java index 32e135806..6aba43d93 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java @@ -30,7 +30,7 @@ public class DesertAtom003 Block Block7 = ModBlocks.deco_tungsten; Block Block8 = ModBlocks.steel_poles; Block Block9 = ModBlocks.tape_recorder; - Block Block10 = ModBlocks.machine_rtg_furnace_off; + Block Block10 = ModBlocks.machine_electric_furnace_off; Block Block11 = ModBlocks.reinforced_glass; Block Block12 = ModBlocks.reinforced_lamp_off; Block Block13 = ModBlocks.pole_satellite_receiver; diff --git a/src/main/java/com/hbm/world/feature/GeyserLarge.java b/src/main/java/com/hbm/world/feature/GeyserLarge.java deleted file mode 100755 index 4b0976f69..000000000 --- a/src/main/java/com/hbm/world/feature/GeyserLarge.java +++ /dev/null @@ -1,505 +0,0 @@ -//Schematic to java Structure by jajo_11 | inspired by "MITHION'S .SCHEMATIC TO JAVA CONVERTINGTOOL" - -package com.hbm.world.feature; - -import java.util.Random; - -import com.hbm.blocks.ModBlocks; - -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -public class GeyserLarge extends WorldGenerator { - - public boolean generate(World world, Random rand, int x, int y, int z) { - int i = rand.nextInt(1); - - if (i == 0) { - generate_r0(world, rand, x, y, z); - } - - return true; - - } - - public boolean generate_r0(World world, Random rand, int x, int y, int z) { - - x -= 4; - y -= 10; - z -= 4; - world.setBlock(x + 3, y + 5, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 5, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 5, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 5, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 5, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 5, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 5, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 5, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 5, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 5, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 5, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 5, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 5, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 5, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 5, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 5, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 5, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 5, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 5, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 5, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 5, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 6, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 6, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 6, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 6, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 6, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 6, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 6, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 6, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 6, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 6, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 6, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 6, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 6, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 6, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 6, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 6, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 6, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 6, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 6, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 6, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 6, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 6, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 6, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 6, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 6, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 6, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 6, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 6, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 6, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 6, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 6, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 6, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 6, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 6, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 6, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 6, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 6, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 7, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 7, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 7, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 7, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 7, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 7, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 7, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 7, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 7, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 7, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 7, z + 2, Blocks.water, 0, 3); - world.setBlock(x + 4, y + 7, z + 2, Blocks.water, 0, 3); - world.setBlock(x + 5, y + 7, z + 2, Blocks.water, 0, 3); - world.setBlock(x + 6, y + 7, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 7, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 7, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 7, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 7, z + 3, Blocks.water, 0, 3); - world.setBlock(x + 3, y + 7, z + 3, Blocks.water, 0, 3); - world.setBlock(x + 4, y + 7, z + 3, Blocks.water, 0, 3); - world.setBlock(x + 5, y + 7, z + 3, Blocks.water, 0, 3); - world.setBlock(x + 6, y + 7, z + 3, Blocks.water, 0, 3); - world.setBlock(x + 7, y + 7, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 7, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 7, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 7, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 7, z + 4, Blocks.water, 0, 3); - world.setBlock(x + 3, y + 7, z + 4, Blocks.water, 0, 3); - world.setBlock(x + 4, y + 7, z + 4, Blocks.water, 0, 3); - world.setBlock(x + 5, y + 7, z + 4, Blocks.water, 0, 3); - world.setBlock(x + 6, y + 7, z + 4, Blocks.water, 0, 3); - world.setBlock(x + 7, y + 7, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 7, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 7, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 7, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 7, z + 5, Blocks.water, 0, 3); - world.setBlock(x + 3, y + 7, z + 5, Blocks.water, 0, 3); - world.setBlock(x + 4, y + 7, z + 5, Blocks.water, 0, 3); - world.setBlock(x + 5, y + 7, z + 5, Blocks.water, 0, 3); - world.setBlock(x + 6, y + 7, z + 5, Blocks.water, 0, 3); - world.setBlock(x + 7, y + 7, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 7, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 7, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 7, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 7, z + 6, Blocks.water, 0, 3); - world.setBlock(x + 4, y + 7, z + 6, Blocks.water, 0, 3); - world.setBlock(x + 5, y + 7, z + 6, Blocks.water, 0, 3); - world.setBlock(x + 6, y + 7, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 7, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 7, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 7, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 7, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 7, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 7, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 7, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 7, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 7, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 8, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 8, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 8, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 8, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 8, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 8, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 8, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 8, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 8, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 8, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 8, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 8, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 8, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 8, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 8, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 8, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 8, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 8, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 8, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 8, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 8, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 8, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 8, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 8, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 8, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 8, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 8, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 8, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 8, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 8, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 8, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 8, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 8, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 8, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 8, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 8, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 8, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 8, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 8, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 8, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 8, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 8, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 8, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 8, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 8, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 8, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 8, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 8, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 8, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 8, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 8, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 8, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 8, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 8, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 8, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 8, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 8, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 8, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 8, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 8, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 8, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 9, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 9, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 9, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 9, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 9, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 9, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 9, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 9, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 9, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 9, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 9, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 9, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 9, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 9, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 9, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 9, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 9, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 9, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 9, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 9, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 9, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 9, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 9, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 9, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 9, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 9, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 9, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 9, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 9, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 9, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 9, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 9, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 9, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 9, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 9, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 9, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 9, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 9, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 9, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 9, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 9, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 9, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 9, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 9, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 9, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 9, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 9, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 9, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 9, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 9, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 9, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 9, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 9, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 9, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 9, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 9, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 9, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 9, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 9, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 9, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 9, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 0, Blocks.gravel, 0, 3); - world.setBlock(x + 4, y + 10, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 10, z + 0, Blocks.gravel, 0, 3); - world.setBlock(x + 6, y + 10, z + 0, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 10, z + 1, Blocks.gravel, 0, 3); - world.setBlock(x + 2, y + 10, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 10, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 10, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 10, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 10, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 10, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 10, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 10, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 10, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 10, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 10, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 10, z + 2, Blocks.gravel, 0, 3); - world.setBlock(x + 0, y + 10, z + 3, Blocks.gravel, 0, 3); - world.setBlock(x + 1, y + 10, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 10, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 10, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 10, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 10, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 10, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 10, z + 4, Blocks.gravel, 0, 3); - world.setBlock(x + 1, y + 10, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 10, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 10, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 10, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 10, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 10, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 10, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 10, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 10, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 10, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 10, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 10, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 10, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 10, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 0, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 10, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 8, y + 10, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 10, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 10, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 10, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 10, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 10, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 10, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 10, z + 8, Blocks.gravel, 0, 3); - world.setBlock(x + 4, y + 10, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 10, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 10, z + 8, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 11, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 11, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 11, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 11, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 11, z + 1, Blocks.gravel, 0, 3); - world.setBlock(x + 1, y + 11, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 11, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 11, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 11, z + 2, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 11, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 11, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 11, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 11, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 11, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 11, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 11, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 11, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 11, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 11, z + 3, Blocks.gravel, 0, 3); - world.setBlock(x + 1, y + 11, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 11, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 3, y + 11, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 11, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 11, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 11, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 7, y + 11, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 11, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 11, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 11, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 11, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 11, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 11, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 11, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 11, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 11, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 11, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 11, z + 6, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 11, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 11, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 11, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 11, z + 7, Blocks.gravel, 0, 3); - world.setBlock(x + 3, y + 11, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 11, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 11, z + 7, Blocks.gravel, 0, 3); - world.setBlock(x + 6, y + 11, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 12, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 12, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 12, z + 1, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 12, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 12, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 12, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 12, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 12, z + 2, Blocks.gravel, 0, 3); - world.setBlock(x + 1, y + 12, z + 3, Blocks.gravel, 0, 3); - world.setBlock(x + 2, y + 12, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 12, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 12, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 12, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 12, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 12, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 12, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 12, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 12, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 12, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 12, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 12, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 12, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 12, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 12, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 12, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 12, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 12, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 12, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 12, z + 5, Blocks.gravel, 0, 3); - world.setBlock(x + 2, y + 12, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 12, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 12, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 12, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 12, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 12, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 12, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 12, z + 7, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 13, z + 1, Blocks.gravel, 0, 3); - world.setBlock(x + 3, y + 13, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 13, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 13, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 13, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 13, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 13, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 13, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 13, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 1, y + 13, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 13, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 13, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 13, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 13, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 13, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 7, y + 13, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 13, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 13, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 13, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 13, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 13, z + 5, Blocks.gravel, 0, 3); - world.setBlock(x + 3, y + 13, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 13, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 13, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 13, z + 7, Blocks.gravel, 0, 3); - world.setBlock(x + 3, y + 14, z + 2, Blocks.gravel, 0, 3); - world.setBlock(x + 4, y + 14, z + 2, Blocks.gravel, 0, 3); - world.setBlock(x + 5, y + 14, z + 2, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 14, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 14, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 14, z + 3, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 14, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 14, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 14, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 14, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 4, y + 14, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 14, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 6, y + 14, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 2, y + 14, z + 5, Blocks.gravel, 0, 3); - world.setBlock(x + 3, y + 14, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 14, z + 5, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 14, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 6, y + 14, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 14, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 14, z + 6, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 14, z + 6, Blocks.gravel, 0, 3); - world.setBlock(x + 3, y + 15, z + 3, Blocks.gravel, 0, 3); - world.setBlock(x + 4, y + 15, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 15, z + 3, Blocks.gravel, 0, 3); - world.setBlock(x + 3, y + 15, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 15, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 15, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 15, z + 5, Blocks.gravel, 0, 3); - world.setBlock(x + 4, y + 15, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 5, y + 15, z + 5, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 16, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 16, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 16, z + 4, ModBlocks.geysir_water, 0, 3); - world.setBlock(x + 5, y + 16, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 16, z + 5, Blocks.stone, 0, 3); - - world.setBlock(x + 4, y + 17, z + 3, Blocks.stone, 0, 3); - world.setBlock(x + 3, y + 17, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 17, z + 4, Blocks.air, 0, 3); - world.setBlock(x + 5, y + 17, z + 4, Blocks.stone, 0, 3); - world.setBlock(x + 4, y + 17, z + 5, Blocks.stone, 0, 3); - - return true; - - } -} diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 3ed8190ee..51c87586e 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -202,6 +202,7 @@ chem.reoil=Wiederaufbereitetes Öl chem.gasoline=Benzin chem.tarsand=Bitumen aus Teersand chem.meatprocessing=Glyphidflesch-Verarbeitung +chem.aggregate=Instant-Betonzuschlag chem.birkeland=Salpetersäure aus Luft chem.biooilsolidfuel=Festbrennstoff aus Biomasse chem.biosolidfuel=Festbrennstoff aus Öl und Biomasse diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 42e5ed1cf..642432169 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -592,6 +592,7 @@ chem.reoil=Reclaimed Oil chem.gasoline=Gasoline chem.tarsand=Bitumen from Tar Sand chem.meatprocessing=Glyphid Meat Processing +chem.aggregate=Instant Aggregate chem.birkeland=Nitric Acid from Air chem.biooilsolidfuel=Solid Fuel from Oil and Biomass chem.biosolidfuel=Solid Fuel from Biomass