From 003177cba4ef6fcf404e89421bd175ee7e8f1845 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 31 Aug 2022 16:35:07 +0200 Subject: [PATCH] he's dead :tada: :tada: :tada: --- src/main/java/com/hbm/blocks/ModBlocks.java | 6 - .../blocks/machine/FactoryCoreAdvanced.java | 81 ------ .../blocks/machine/FactoryCoreTitanium.java | 82 ------ .../com/hbm/blocks/machine/FactoryHatch.java | 2 - .../inventory/recipes/ChemplantRecipes.java | 32 --- .../hbm/inventory/recipes/MagicRecipes.java | 2 +- src/main/java/com/hbm/items/ModItems.java | 48 +--- .../com/hbm/items/machine/ItemBattery.java | 4 +- src/main/java/com/hbm/lib/Library.java | 9 - .../java/com/hbm/main/CraftingManager.java | 9 +- src/main/java/com/hbm/main/MainRegistry.java | 13 + .../java/com/hbm/tileentity/TileMappings.java | 2 - .../machine/TileEntityCoreAdvanced.java | 250 ----------------- .../machine/TileEntityCoreTitanium.java | 253 ------------------ .../java/com/hbm/world/dungeon/Factory.java | 144 +++++----- src/main/java/com/hbm/world/feature/Dud.java | 6 - 16 files changed, 99 insertions(+), 844 deletions(-) delete mode 100644 src/main/java/com/hbm/blocks/machine/FactoryCoreAdvanced.java delete mode 100644 src/main/java/com/hbm/blocks/machine/FactoryCoreTitanium.java delete mode 100644 src/main/java/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java delete mode 100644 src/main/java/com/hbm/tileentity/machine/TileEntityCoreTitanium.java diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 8e507f00f..940a58afc 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -812,12 +812,10 @@ public class ModBlocks { public static Block factory_titanium_hull; @Deprecated public static Block factory_titanium_furnace; @Deprecated public static Block factory_titanium_conductor; - @Deprecated public static Block factory_titanium_core; public static Block factory_advanced_hull; @Deprecated public static Block factory_advanced_furnace; @Deprecated public static Block factory_advanced_conductor; - @Deprecated public static Block factory_advanced_core; public static Block reactor_element; public static Block reactor_control; @@ -1979,11 +1977,9 @@ public class ModBlocks { factory_titanium_hull = new BlockGeneric(Material.iron).setBlockName("factory_titanium_hull").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_hull"); factory_titanium_furnace = new FactoryHatch(Material.iron).setBlockName("factory_titanium_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_furnace"); factory_titanium_conductor = new BlockPillar(Material.iron, RefStrings.MODID + ":factory_titanium_conductor").setBlockName("factory_titanium_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_hull"); - factory_titanium_core = new FactoryCoreTitanium(Material.iron).setBlockName("factory_titanium_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_core"); factory_advanced_hull = new BlockGeneric(Material.iron).setBlockName("factory_advanced_hull").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_advanced_hull"); factory_advanced_furnace = new FactoryHatch(Material.iron).setBlockName("factory_advanced_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_advanced_furnace"); factory_advanced_conductor = new BlockPillar(Material.iron, RefStrings.MODID + ":factory_advanced_conductor").setBlockName("factory_advanced_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_advanced_hull"); - factory_advanced_core = new FactoryCoreAdvanced(Material.iron).setBlockName("factory_advanced_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_advanced_core"); reactor_element = new BlockPillar(Material.iron, RefStrings.MODID + ":reactor_element_top", RefStrings.MODID + ":reactor_element_base").setBlockName("reactor_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":reactor_element_side"); reactor_control = new BlockPillar(Material.iron, RefStrings.MODID + ":reactor_control_top").setBlockName("reactor_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":reactor_control_side"); @@ -3234,11 +3230,9 @@ public class ModBlocks { GameRegistry.registerBlock(factory_titanium_hull, factory_titanium_hull.getUnlocalizedName()); GameRegistry.registerBlock(factory_titanium_furnace, factory_titanium_furnace.getUnlocalizedName()); GameRegistry.registerBlock(factory_titanium_conductor, factory_titanium_conductor.getUnlocalizedName()); - GameRegistry.registerBlock(factory_titanium_core, factory_titanium_core.getUnlocalizedName()); GameRegistry.registerBlock(factory_advanced_hull, factory_advanced_hull.getUnlocalizedName()); GameRegistry.registerBlock(factory_advanced_furnace, factory_advanced_furnace.getUnlocalizedName()); GameRegistry.registerBlock(factory_advanced_conductor, factory_advanced_conductor.getUnlocalizedName()); - GameRegistry.registerBlock(factory_advanced_core, factory_advanced_core.getUnlocalizedName()); //The Fluid Inserter //GameRegistry.registerBlock(machine_inserter, machine_inserter.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/FactoryCoreAdvanced.java b/src/main/java/com/hbm/blocks/machine/FactoryCoreAdvanced.java deleted file mode 100644 index 63709f047..000000000 --- a/src/main/java/com/hbm/blocks/machine/FactoryCoreAdvanced.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hbm.blocks.machine; - -import java.util.Random; - -import com.hbm.tileentity.machine.TileEntityCoreAdvanced; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class FactoryCoreAdvanced extends BlockContainer { - - private final Random field_149933_a = new Random(); - private static boolean keepInventory; - - public FactoryCoreAdvanced(Material p_i45386_1_) { - super(p_i45386_1_); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityCoreAdvanced(); - } - - @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) - { - TileEntityCoreAdvanced tileentityfurnace = (TileEntityCoreAdvanced)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 (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; - - 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())); - - 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); - } - } - } - - 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_); - } -} diff --git a/src/main/java/com/hbm/blocks/machine/FactoryCoreTitanium.java b/src/main/java/com/hbm/blocks/machine/FactoryCoreTitanium.java deleted file mode 100644 index 9fff1f9b2..000000000 --- a/src/main/java/com/hbm/blocks/machine/FactoryCoreTitanium.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.hbm.blocks.machine; - -import java.util.Random; - -import com.hbm.tileentity.machine.TileEntityCoreTitanium; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class FactoryCoreTitanium extends BlockContainer { - - private final Random field_149933_a = new Random(); - private static boolean keepInventory; - - public FactoryCoreTitanium(Material p_i45386_1_) { - super(p_i45386_1_); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityCoreTitanium(); - } - - @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) - { - TileEntityCoreTitanium tileentityfurnace = (TileEntityCoreTitanium)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 (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; - - 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())); - - 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); - } - } - } - - 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_); - } - -} diff --git a/src/main/java/com/hbm/blocks/machine/FactoryHatch.java b/src/main/java/com/hbm/blocks/machine/FactoryHatch.java index b86e508a3..55d64c79d 100644 --- a/src/main/java/com/hbm/blocks/machine/FactoryHatch.java +++ b/src/main/java/com/hbm/blocks/machine/FactoryHatch.java @@ -5,8 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityCoreAdvanced; -import com.hbm.tileentity.machine.TileEntityCoreTitanium; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index bb3cc2522..6144d31bf 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -142,38 +142,6 @@ public class ChemplantRecipes extends SerializableRecipe { new OreDictStack(S.dust(), 2)) .inputFluids(new FluidStack(Fluids.ACID, 2000)) .outputFluids(new FluidStack(Fluids.SAS3, 1000))); - recipes.add(new ChemRecipe(50, "DYN_SCHRAB", 1200) - .inputItems( - new ComparableStack(ModItems.dynosphere_desh_charged, 3), - new OreDictStack(U.ingot()), - new ComparableStack(ModItems.catalyst_clay, 8)) - .outputItems( - new ItemStack(ModItems.ingot_schrabidium), - new ItemStack(ModItems.powder_desh, 12), - new ItemStack(ModItems.powder_desh_mix, 12)) - .outputFluids(new FluidStack(Fluids.WATZ, 50))); - recipes.add(new ChemRecipe(51, "DYN_EUPH", 3600) - .inputItems( - new ComparableStack(ModItems.dynosphere_schrabidium_charged, 1), - new OreDictStack(PU.ingot()), - new ComparableStack(ModItems.catalyst_clay, 16), - new OreDictStack(EUPH.ingot())) - .outputItems( - new ItemStack(ModItems.nugget_euphemium, 12), - new ItemStack(ModItems.powder_schrabidium, 4), - new ItemStack(ModItems.powder_power, 4)) - .outputFluids(new FluidStack(Fluids.WATZ, 100))); - recipes.add(new ChemRecipe(52, "DYN_DNT", 6000) - .inputItems( - new ComparableStack(ModItems.dynosphere_euphemium_charged, 2), - new ComparableStack(ModItems.powder_spark_mix), - new ComparableStack(ModItems.ingot_starmetal), - new ComparableStack(ModItems.catalyst_clay, 32)) - .outputItems( - new ItemStack(ModItems.ingot_dineutronium), - new ItemStack(ModItems.powder_euphemium, 8), - new ItemStack(ModItems.powder_nitan_mix, 8)) - .outputFluids(new FluidStack(Fluids.WATZ, 150))); recipes.add(new ChemRecipe(53, "CORDITE", 40) .inputItems( new OreDictStack(KNO.dust(), 2), diff --git a/src/main/java/com/hbm/inventory/recipes/MagicRecipes.java b/src/main/java/com/hbm/inventory/recipes/MagicRecipes.java index 3cb813da8..ada0f7399 100644 --- a/src/main/java/com/hbm/inventory/recipes/MagicRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MagicRecipes.java @@ -42,7 +42,7 @@ public class MagicRecipes { recipes.add(new MagicRecipe(new ItemStack(ModItems.rod_of_discord), new ComparableStack(Items.ender_pearl), new ComparableStack(Items.blaze_rod), new ComparableStack(ModItems.nugget_euphemium))); recipes.add(new MagicRecipe(new ItemStack(ModItems.balefire_and_steel), new OreDictStack("ingotSteel"), new ComparableStack(ModItems.egg_balefire_shard))); recipes.add(new MagicRecipe(new ItemStack(ModItems.mysteryshovel), new ComparableStack(Items.iron_shovel), new ComparableStack(Items.bone), new ComparableStack(ModItems.ingot_starmetal), new ComparableStack(ModItems.ducttape))); - recipes.add(new MagicRecipe(new ItemStack(ModItems.ingot_electronium), new ComparableStack(ModItems.dynosphere_dineutronium_charged), new ComparableStack(ModItems.dynosphere_dineutronium_charged), new ComparableStack(ModItems.dynosphere_dineutronium_charged), new ComparableStack(ModItems.dynosphere_dineutronium_charged))); + recipes.add(new MagicRecipe(new ItemStack(ModItems.ingot_electronium), new ComparableStack(ModItems.pellet_charged), new ComparableStack(ModItems.pellet_charged), new ComparableStack(ModItems.ingot_dineutronium), new ComparableStack(ModItems.ingot_dineutronium))); recipes.add(new MagicRecipe(new ItemStack(ModItems.ammo_44_pip), new ComparableStack(ModItems.ammo_44), diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 2bd682de5..9b54ad396 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -882,13 +882,13 @@ public class ModItems { @Deprecated public static Item canister_NITAN; @Deprecated public static Item canister_fracksol; - public static Item canister_heavyoil; - public static Item canister_bitumen; - public static Item canister_heatingoil; - public static Item canister_naphtha; - public static Item canister_lightoil; - public static Item canister_biofuel; - public static Item canister_ethanol; + @Deprecated public static Item canister_heavyoil; + @Deprecated public static Item canister_bitumen; + @Deprecated public static Item canister_heatingoil; + @Deprecated public static Item canister_naphtha; + @Deprecated public static Item canister_lightoil; + @Deprecated public static Item canister_biofuel; + @Deprecated public static Item canister_ethanol; public static Item gas_empty; public static Item gas_full; @@ -1925,7 +1925,7 @@ public class ModItems { public static Item arc_electrode; public static Item arc_electrode_burnt; public static Item arc_electrode_desh; - public static Item dynosphere_base; + /*public static Item dynosphere_base; public static Item dynosphere_desh; public static Item dynosphere_desh_charged; public static Item dynosphere_schrabidium; @@ -1933,12 +1933,12 @@ public class ModItems { public static Item dynosphere_euphemium; public static Item dynosphere_euphemium_charged; public static Item dynosphere_dineutronium; - public static Item dynosphere_dineutronium_charged; + public static Item dynosphere_dineutronium_charged;*/ public static Item tank_waste; - public static Item factory_core_titanium; - public static Item factory_core_advanced; + /*public static Item factory_core_titanium; + public static Item factory_core_advanced;*/ public static Item upgrade_template; public static Item upgrade_speed_1; @@ -4676,19 +4676,6 @@ public class ModItems { arc_electrode_burnt = new Item().setUnlocalizedName("arc_electrode_burnt").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":arc_electrode_burnt"); arc_electrode_desh = new ItemCustomLore().setUnlocalizedName("arc_electrode_desh").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setFull3D().setTextureName(RefStrings.MODID + ":arc_electrode_desh"); - dynosphere_base = new Item().setUnlocalizedName("dynosphere_base").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_base"); - dynosphere_desh = new ItemBattery(1000000L, 10000L, 0).setUnlocalizedName("dynosphere_desh").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_desh"); - dynosphere_desh_charged = new Item().setUnlocalizedName("dynosphere_desh_charged").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_desh_charged"); - dynosphere_schrabidium = new ItemBattery(100000000L, 500000L, 0).setUnlocalizedName("dynosphere_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_schrabidium"); - dynosphere_schrabidium_charged = new Item().setUnlocalizedName("dynosphere_schrabidium_charged").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_schrabidium_charged"); - dynosphere_euphemium = new ItemBattery(10000000000L, 25000000L, 0).setUnlocalizedName("dynosphere_euphemium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_euphemium"); - dynosphere_euphemium_charged = new Item().setUnlocalizedName("dynosphere_euphemium_charged").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_euphemium_charged"); - dynosphere_dineutronium = new ItemBattery(1000000000000L, 1250000000L, 0).setUnlocalizedName("dynosphere_dineutronium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_dineutronium"); - dynosphere_dineutronium_charged = new Item().setUnlocalizedName("dynosphere_dineutronium_charged").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":dynosphere_dineutronium_charged"); - - factory_core_titanium = new ItemBattery(7040000, 1000, 0).setUnlocalizedName("factory_core_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":factory_core_titanium"); - factory_core_advanced = new ItemBattery(4160000, 1000, 0).setUnlocalizedName("factory_core_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":factory_core_advanced"); - ams_focus_blank = new Item().setUnlocalizedName("ams_focus_blank").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_blank"); ams_focus_limiter = new ItemCustomLore().setUnlocalizedName("ams_focus_limiter").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_limiter"); ams_focus_booster = new ItemCustomLore().setUnlocalizedName("ams_focus_booster").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_booster"); @@ -6586,19 +6573,6 @@ public class ModItems { GameRegistry.registerItem(fusion_core, fusion_core.getUnlocalizedName()); GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName()); GameRegistry.registerItem(fusion_core_infinite, fusion_core_infinite.getUnlocalizedName()); - GameRegistry.registerItem(factory_core_titanium, factory_core_titanium.getUnlocalizedName()); - GameRegistry.registerItem(factory_core_advanced, factory_core_advanced.getUnlocalizedName()); - - //Dynospheres - GameRegistry.registerItem(dynosphere_base, dynosphere_base.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_desh, dynosphere_desh.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_desh_charged, dynosphere_desh_charged.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_schrabidium, dynosphere_schrabidium.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_schrabidium_charged, dynosphere_schrabidium_charged.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_euphemium, dynosphere_euphemium.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_euphemium_charged, dynosphere_euphemium_charged.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_dineutronium, dynosphere_dineutronium.getUnlocalizedName()); - GameRegistry.registerItem(dynosphere_dineutronium_charged, dynosphere_dineutronium_charged.getUnlocalizedName()); //Folders GameRegistry.registerItem(template_folder, template_folder.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemBattery.java b/src/main/java/com/hbm/items/machine/ItemBattery.java index 427ad2767..3f281f9e2 100644 --- a/src/main/java/com/hbm/items/machine/ItemBattery.java +++ b/src/main/java/com/hbm/items/machine/ItemBattery.java @@ -33,7 +33,7 @@ public class ItemBattery extends Item implements IBatteryItem { if(itemstack.hasTagCompound()) charge = getCharge(itemstack); - if(itemstack.getItem() != ModItems.fusion_core && itemstack.getItem() != ModItems.factory_core_titanium && itemstack.getItem() != ModItems.factory_core_advanced && itemstack.getItem() != ModItems.energy_core && itemstack.getItem() != ModItems.dynosphere_desh && itemstack.getItem() != ModItems.dynosphere_schrabidium && itemstack.getItem() != ModItems.dynosphere_euphemium && itemstack.getItem() != ModItems.dynosphere_dineutronium) { + if(itemstack.getItem() != ModItems.fusion_core && itemstack.getItem() != ModItems.energy_core) { list.add("Energy stored: " + BobMathUtil.getShortNumber(charge) + "/" + BobMathUtil.getShortNumber(maxCharge) + "HE"); } else { String charge1 = BobMathUtil.getShortNumber((charge * 100) / this.maxCharge); @@ -51,7 +51,7 @@ public class ItemBattery extends Item implements IBatteryItem { return EnumRarity.rare; } - if(this == ModItems.fusion_core || this == ModItems.factory_core_titanium || this == ModItems.factory_core_advanced || this == ModItems.energy_core || this == ModItems.dynosphere_desh || this == ModItems.dynosphere_schrabidium || this == ModItems.dynosphere_euphemium || this == ModItems.dynosphere_dineutronium) { + if(this == ModItems.fusion_core || this == ModItems.energy_core) { return EnumRarity.uncommon; } diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 6e13476dc..a4cd31470 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -355,15 +355,6 @@ public class Library { power -= toCharge; battery.chargeBattery(slots[index], toCharge); - - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_desh && battery.getCharge(slots[index]) >= battery.getMaxCharge()) - slots[index] = new ItemStack(ModItems.dynosphere_desh_charged); - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_schrabidium && battery.getCharge(slots[index]) >= battery.getMaxCharge()) - slots[index] = new ItemStack(ModItems.dynosphere_schrabidium_charged); - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_euphemium && battery.getCharge(slots[index]) >= battery.getMaxCharge()) - slots[index] = new ItemStack(ModItems.dynosphere_euphemium_charged); - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_dineutronium && battery.getCharge(slots[index]) >= battery.getMaxCharge()) - slots[index] = new ItemStack(ModItems.dynosphere_dineutronium_charged); } return power; diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 34f8aea09..dd73cdd3e 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -591,13 +591,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.inf_water, 1), new Object[] { "222", "131", "222", '1', Items.water_bucket, '2', AL.plate(), '3', DIAMOND.gem() }); addRecipeAuto(new ItemStack(ModItems.inf_water_mk2, 1), new Object[] { "BPB", "PTP", "BPB", 'B', ModItems.inf_water, 'P', ModBlocks.fluid_duct, 'T', ModItems.tank_steel }); - - addRecipeAuto(new ItemStack(ModItems.dynosphere_base), new Object[] { "RPR", "PBP", "RPR", 'R', MINGRADE.dust(), 'P', STEEL.plate(), 'B', REDSTONE.block() }); - addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.dynosphere_desh), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_desh_mix, 'P', DESH.ingot(), 'B', ModItems.dynosphere_base }); - addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.dynosphere_schrabidium), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_power, 'P', SA326.ingot(), 'B', ModItems.dynosphere_desh_charged }); - addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.dynosphere_euphemium), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_nitan_mix, 'P', EUPH.ingot(), 'B', ModItems.dynosphere_schrabidium_charged }); - addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.dynosphere_dineutronium), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_spark_mix, 'P', DNT.ingot(), 'B', ModItems.dynosphere_euphemium_charged }); - //not so Temporary Crappy Recipes addRecipeAuto(new ItemStack(ModItems.piston_selenium, 1), new Object[] { "SSS", "STS", " D ", 'S', STEEL.plate(), 'T', W.ingot(), 'D', ModItems.bolt_dura_steel }); addShapelessAuto(new ItemStack(ModItems.catalyst_clay), new Object[] { IRON.dust(), Items.clay_ball }); @@ -719,7 +712,7 @@ public class CraftingManager { addShapelessAuto(new ItemStack(ModBlocks.sand_lead, 8), new Object[] { "sand", "sand", "sand", "sand", "sand", "sand", "sand", "sand", PB.dust() }); addShapelessAuto(new ItemStack(ModBlocks.sand_quartz, 1), new Object[] { "sand", "sand", NETHERQUARTZ.dust(), NETHERQUARTZ.dust() }); - addRecipeAuto(new ItemStack(ModItems.rune_blank, 1), new Object[] { "PSP", "SDS", "PSP", 'P', ModItems.powder_magic, 'S', STAR.ingot(), 'D', ModItems.dynosphere_dineutronium_charged }); + addRecipeAuto(new ItemStack(ModItems.rune_blank, 1), new Object[] { "PSP", "SDS", "PSP", 'P', ModItems.powder_magic, 'S', STAR.ingot(), 'D', KEY_CIRCUIT_BISMUTH }); addShapelessAuto(new ItemStack(ModItems.rune_isa, 1), new Object[] { ModItems.rune_blank, ModItems.powder_spark_mix, ModItems.singularity_counter_resonant }); addShapelessAuto(new ItemStack(ModItems.rune_dagaz, 1), new Object[] { ModItems.rune_blank, ModItems.powder_spark_mix, ModItems.singularity }); addShapelessAuto(new ItemStack(ModItems.rune_hagalaz, 1), new Object[] { ModItems.rune_blank, ModItems.powder_spark_mix, ModItems.singularity_super_heated }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index d04e5c040..65a18d204 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -915,6 +915,19 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.sellafield_core"); ignoreMappings.add("hbm:tile.fusion_core"); ignoreMappings.add("hbm:tile.machine_telelinker"); + ignoreMappings.add("hbm:item.dynosphere_base"); + ignoreMappings.add("hbm:item.dynosphere_desh"); + ignoreMappings.add("hbm:item.dynosphere_desh_charged"); + ignoreMappings.add("hbm:item.dynosphere_schrabidium"); + ignoreMappings.add("hbm:item.dynosphere_schrabidium_charged"); + ignoreMappings.add("hbm:item.dynosphere_euphemium"); + ignoreMappings.add("hbm:item.dynosphere_euphemium_charged"); + ignoreMappings.add("hbm:item.dynosphere_dineutronium"); + ignoreMappings.add("hbm:item.dynosphere_dineutronium_charged"); + ignoreMappings.add("hbm:item.factory_core_titanium"); + ignoreMappings.add("hbm:item.factory_core_advanced"); + ignoreMappings.add("hbm:tile.factory_titanium_core"); + ignoreMappings.add("hbm:tile.factory_advanced_core"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index c1c42a6fe..96ce3d2c0 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -59,8 +59,6 @@ public class TileMappings { put(TileEntityDecoBlockAltW.class, "tileentity_deco_w"); put(TileEntityDecoBlockAltG.class, "tileentity_deco_g"); put(TileEntityDecoBlockAltF.class, "tileentity_deco_f"); - put(TileEntityCoreTitanium.class, "tileentity_core_titanium"); - put(TileEntityCoreAdvanced.class, "tileentity_core_advanced"); put(TileEntityCrashedBomb.class, "tileentity_crashed_balefire"); put(TileEntityConverterHeRf.class, "tileentity_converter_herf"); put(TileEntityConverterRfHe.class, "tileentity_converter_rfhe"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java deleted file mode 100644 index 27e1b8b90..000000000 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.hbm.tileentity.machine; - -import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IFactory; -import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemBattery; -import com.hbm.tileentity.TileEntityLoadedBase; - -import api.hbm.energy.IBatteryItem; -import api.hbm.energy.IEnergyUser; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -public class TileEntityCoreAdvanced extends TileEntityLoadedBase implements ISidedInventory, IFactory, IEnergyUser { - - public int progress = 0; - public long power = 0; - public int soundCycle = 0; - public final static int processTime = 100; - public final static int maxPower = (int)((ItemBattery)ModItems.factory_core_advanced).getMaxCharge(); - private ItemStack slots[]; - - private String customName; - - public TileEntityCoreAdvanced() { - slots = new ItemStack[27]; - } - @Override - public int getSizeInventory() { - return slots.length; - } - - @Override - public ItemStack getStackInSlot(int i) { - return slots[i]; - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - if(slots[i] != null) - { - ItemStack itemStack = slots[i]; - slots[i] = null; - return itemStack; - } else { - return null; - } - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemStack) { - slots[i] = itemStack; - if(itemStack != null && itemStack.stackSize > getInventoryStackLimit()) - { - itemStack.stackSize = getInventoryStackLimit(); - } - } - - @Override - public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.factoryAdvanced"; - } - - @Override - public boolean hasCustomInventoryName() { - return this.customName != null && this.customName.length() > 0; - } - - public void setCustomName(String name) { - this.customName = name; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) - { - return false; - }else{ - return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <=64; - } - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemStack) { - return true; - } - - @Override - public ItemStack decrStackSize(int i, int j) { - if(slots[i] != null) - { - if(slots[i].stackSize <= j) - { - ItemStack itemStack = slots[i]; - slots[i] = null; - return itemStack; - } - ItemStack itemStack1 = slots[i].splitStack(j); - if (slots[i].stackSize == 0) - { - slots[i] = null; - } - - return itemStack1; - } else { - return null; - } - } - - @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { - return false; - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - NBTTagList list = nbt.getTagList("items", 10); - - this.progress = nbt.getShort("cookTime"); - slots = new ItemStack[getSizeInventory()]; - - for(int i = 0; i < list.tagCount(); i++) - { - NBTTagCompound nbt1 = list.getCompoundTagAt(i); - byte b0 = nbt1.getByte("slot"); - if(b0 >= 0 && b0 < slots.length) - { - slots[b0] = ItemStack.loadItemStackFromNBT(nbt1); - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - nbt.setShort("cookTime", (short) progress); - NBTTagList list = new NBTTagList(); - - for(int i = 0; i < slots.length; i++) - { - if(slots[i] != null) - { - NBTTagCompound nbt1 = new NBTTagCompound(); - nbt1.setByte("slot", (byte)i); - slots[i].writeToNBT(nbt1); - list.appendTag(nbt1); - } - } - nbt.setTag("items", list); - } - - @Override - public boolean isStructureValid(World world) { - if(world.getBlock(this.xCoord, this.yCoord, this.zCoord) == ModBlocks.factory_advanced_core && - world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull && - (world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_conductor || world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull) && - world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord - 1, this.yCoord, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord, this.zCoord - 1) == ModBlocks.factory_advanced_furnace && - world.getBlock(this.xCoord + 1, this.yCoord, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord - 1, this.yCoord, this.zCoord) == ModBlocks.factory_advanced_furnace && - world.getBlock(this.xCoord + 1, this.yCoord, this.zCoord) == ModBlocks.factory_advanced_furnace && - world.getBlock(this.xCoord - 1, this.yCoord, this.zCoord + 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord, this.zCoord + 1) == ModBlocks.factory_advanced_furnace && - world.getBlock(this.xCoord + 1, this.yCoord, this.zCoord + 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull && - (world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_conductor || world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull) && - world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull) - { - return true; - } - return false; - } - - @Override - public long getPowerScaled(long i) { - return (power * i) / maxPower; - } - - @Override - public int getProgressScaled(int i) { - return (progress * i) / processTime; - } - - @Override - public boolean isProcessable(ItemStack item) { - if(item != null) - { - return FurnaceRecipes.smelting().getSmeltingResult(item) != null; - } else { - return false; - } - } - - @Override - public void updateEntity() { } - - @Override - public void setPower(long i) { } - - @Override - public long getPower() { - return power; - } - @Override - public long getMaxPower() { - return maxPower; - } -} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreTitanium.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreTitanium.java deleted file mode 100644 index 1af5b3cfd..000000000 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreTitanium.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.hbm.tileentity.machine; - -import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IFactory; -import com.hbm.interfaces.Spaghetti; -import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemBattery; -import com.hbm.tileentity.TileEntityLoadedBase; - -import api.hbm.energy.IBatteryItem; -import api.hbm.energy.IEnergyUser; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -public class TileEntityCoreTitanium extends TileEntityLoadedBase implements ISidedInventory, IFactory, IEnergyUser { - - public int progress = 0; - public long power = 0; - public int soundCycle = 0; - public final static int processTime = 200; - public final static int maxPower = (int)((ItemBattery)ModItems.factory_core_titanium).getMaxCharge(); - private ItemStack slots[]; - - private String customName; - - public TileEntityCoreTitanium() { - slots = new ItemStack[23]; - } - @Override - public int getSizeInventory() { - return slots.length; - } - - @Override - public ItemStack getStackInSlot(int i) { - return slots[i]; - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - if(slots[i] != null) - { - ItemStack itemStack = slots[i]; - slots[i] = null; - return itemStack; - } else { - return null; - } - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemStack) { - slots[i] = itemStack; - if(itemStack != null && itemStack.stackSize > getInventoryStackLimit()) - { - itemStack.stackSize = getInventoryStackLimit(); - } - } - - @Override - public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.factoryTitanium"; - } - - @Override - public boolean hasCustomInventoryName() { - return this.customName != null && this.customName.length() > 0; - } - - public void setCustomName(String name) { - this.customName = name; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) - { - return false; - }else{ - return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <=64; - } - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemStack) { - return true; - } - - @Override - public ItemStack decrStackSize(int i, int j) { - if(slots[i] != null) - { - if(slots[i].stackSize <= j) - { - ItemStack itemStack = slots[i]; - slots[i] = null; - return itemStack; - } - ItemStack itemStack1 = slots[i].splitStack(j); - if (slots[i].stackSize == 0) - { - slots[i] = null; - } - - return itemStack1; - } else { - return null; - } - } - - @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { - return false; - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - NBTTagList list = nbt.getTagList("items", 10); - - this.progress = nbt.getShort("cookTime"); - slots = new ItemStack[getSizeInventory()]; - - for(int i = 0; i < list.tagCount(); i++) - { - NBTTagCompound nbt1 = list.getCompoundTagAt(i); - byte b0 = nbt1.getByte("slot"); - if(b0 >= 0 && b0 < slots.length) - { - slots[b0] = ItemStack.loadItemStackFromNBT(nbt1); - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - nbt.setShort("cookTime", (short) progress); - NBTTagList list = new NBTTagList(); - - for(int i = 0; i < slots.length; i++) - { - if(slots[i] != null) - { - NBTTagCompound nbt1 = new NBTTagCompound(); - nbt1.setByte("slot", (byte)i); - slots[i].writeToNBT(nbt1); - list.appendTag(nbt1); - } - } - nbt.setTag("items", list); - } - - @Spaghetti("2016 bobcode *shudders*") - @Override - public boolean isStructureValid(World world) { - if(world.getBlock(this.xCoord, this.yCoord, this.zCoord) == ModBlocks.factory_titanium_core && - world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull && - (world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_conductor || world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull) && - world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord - 1, this.yCoord, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord, this.zCoord - 1) == ModBlocks.factory_titanium_furnace && - world.getBlock(this.xCoord + 1, this.yCoord, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord - 1, this.yCoord, this.zCoord) == ModBlocks.factory_titanium_furnace && - world.getBlock(this.xCoord + 1, this.yCoord, this.zCoord) == ModBlocks.factory_titanium_furnace && - world.getBlock(this.xCoord - 1, this.yCoord, this.zCoord + 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord, this.zCoord + 1) == ModBlocks.factory_titanium_furnace && - world.getBlock(this.xCoord + 1, this.yCoord, this.zCoord + 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull && - (world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_conductor || world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull) && - world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull) - { - return true; - } - return false; - } - - @Override - public long getPowerScaled(long i) { - return (power * i) / maxPower; - } - - @Override - public int getProgressScaled(int i) { - return (progress * i) / processTime; - } - - @Override - public boolean isProcessable(ItemStack item) { - if(item != null) - { - return FurnaceRecipes.smelting().getSmeltingResult(item) != null; - } else { - return false; - } - } - - @Override - public void updateEntity() { } - - @Override - public void setPower(long i) { } - - @Override - public long getPower() { - return power; - } - @Override - public long getMaxPower() { - return maxPower; - } - -} diff --git a/src/main/java/com/hbm/world/dungeon/Factory.java b/src/main/java/com/hbm/world/dungeon/Factory.java index 970f789fe..f8446778c 100644 --- a/src/main/java/com/hbm/world/dungeon/Factory.java +++ b/src/main/java/com/hbm/world/dungeon/Factory.java @@ -7,7 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; -import com.hbm.main.MainRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -21,7 +20,6 @@ public class Factory extends WorldGenerator { Block Block1 = ModBlocks.steel_scaffold; Block Block2 = ModBlocks.red_barrel; - Block Block3 = ModBlocks.factory_titanium_core; Block Block4 = ModBlocks.steel_wall; Block Block5 = ModBlocks.reinforced_light; @@ -594,9 +592,9 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 0, z + 3, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 4, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 4, ModBlocks.deco_lead, 5, 3); - world.setBlock(x + 6, y + 0, z + 4, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 4, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 4, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 4, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 4, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 4, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 9, y + 0, z + 4, Blocks.chest, 5, 3); world.setBlockMetadataWithNotify(x + 9, y + 0, z + 4, 5, 3); if(world.getBlock(x + 9, y + 0, z + 4) == Blocks.chest) @@ -607,16 +605,16 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 0, z + 4, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 5, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 5, Blocks.stonebrick, 0, 3); - world.setBlock(x + 6, y + 0, z + 5, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 5, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 5, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 5, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 5, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 5, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 0, z + 5, Blocks.chest, 4, 3); world.setBlock(x + 14, y + 0, z + 5, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 6, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 6, Blocks.stonebrick, 0, 3); - world.setBlock(x + 6, y + 0, z + 6, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 6, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 6, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 6, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 6, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 6, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 0, z + 6, Blocks.hopper, 2, 3); world.setBlock(x + 14, y + 0, z + 6, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 7, Blocks.stonebrick, 0, 3); @@ -630,9 +628,9 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 0, z + 9, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 10, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 10, ModBlocks.deco_lead, 5, 3); - world.setBlock(x + 6, y + 0, z + 10, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 10, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 10, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 10, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 10, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 10, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 9, y + 0, z + 10, Blocks.chest, 5, 3); world.setBlockMetadataWithNotify(x + 9, y + 0, z + 10, 5, 3); if(world.getBlock(x + 9, y + 0, z + 10) == Blocks.chest) @@ -643,16 +641,16 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 0, z + 10, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 11, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 11, Blocks.stonebrick, 0, 3); - world.setBlock(x + 6, y + 0, z + 11, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 11, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 11, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 11, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 11, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 11, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 0, z + 11, Blocks.chest, 4, 3); world.setBlock(x + 14, y + 0, z + 11, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 12, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 12, Blocks.stonebrick, 0, 3); - world.setBlock(x + 6, y + 0, z + 12, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 12, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 12, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 12, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 12, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 12, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 0, z + 12, Blocks.hopper, 2, 3); world.setBlock(x + 14, y + 0, z + 12, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 13, Blocks.stonebrick, 0, 3); @@ -666,9 +664,9 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 0, z + 15, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 16, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 16, ModBlocks.deco_lead, 5, 3); - world.setBlock(x + 6, y + 0, z + 16, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 16, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 16, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 16, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 16, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 16, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 9, y + 0, z + 16, Blocks.chest, 5, 3); world.setBlockMetadataWithNotify(x + 9, y + 0, z + 16, 5, 3); if(world.getBlock(x + 9, y + 0, z + 16) == Blocks.chest) @@ -679,16 +677,16 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 0, z + 16, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 17, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 17, Blocks.stonebrick, 0, 3); - world.setBlock(x + 6, y + 0, z + 17, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 17, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 17, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 17, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 17, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 17, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 0, z + 17, Blocks.chest, 4, 3); world.setBlock(x + 14, y + 0, z + 17, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 18, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 0, z + 18, Blocks.stonebrick, 0, 3); - world.setBlock(x + 6, y + 0, z + 18, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 0, z + 18, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 0, z + 18, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 0, z + 18, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 0, z + 18, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 0, z + 18, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 0, z + 18, Blocks.hopper, 2, 3); world.setBlock(x + 14, y + 0, z + 18, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 0, z + 19, Blocks.stonebrick, 0, 3); @@ -798,23 +796,23 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 1, z + 3, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 4, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 4, ModBlocks.deco_lead, 5, 3); - world.setBlock(x + 6, y + 1, z + 4, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 1, z + 4, ModBlocks.factory_titanium_furnace, 2, 3); - world.setBlock(x + 8, y + 1, z + 4, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 1, z + 4, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 4, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 1, z + 4, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 4, ModBlocks.machine_electric_furnace_off, 4, 3); world.setBlock(x + 14, y + 1, z + 4, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 5, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 5, Block2, 5, 3); - world.setBlock(x + 6, y + 1, z + 5, ModBlocks.factory_titanium_furnace, 4, 3); - world.setBlock(x + 7, y + 1, z + 5, Block3, 0, 3); - world.setBlock(x + 8, y + 1, z + 5, ModBlocks.factory_titanium_furnace, 5, 3); + world.setBlock(x + 6, y + 1, z + 5, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 5, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 1, z + 5, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 5, Blocks.stone_brick_stairs, 4, 3); world.setBlock(x + 14, y + 1, z + 5, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 6, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 6, Block2, 5, 3); - world.setBlock(x + 6, y + 1, z + 6, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 1, z + 6, ModBlocks.factory_titanium_furnace, 3, 3); - world.setBlock(x + 8, y + 1, z + 6, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 1, z + 6, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 6, ModBlocks.deco_steel, 3, 3); + world.setBlock(x + 8, y + 1, z + 6, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 6, ModBlocks.machine_electric_furnace_off, 4, 3); world.setBlock(x + 14, y + 1, z + 6, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 7, Blocks.stonebrick, 0, 3); @@ -827,23 +825,23 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 1, z + 9, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 10, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 10, ModBlocks.deco_lead, 5, 3); - world.setBlock(x + 6, y + 1, z + 10, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 1, z + 10, ModBlocks.factory_titanium_furnace, 2, 3); - world.setBlock(x + 8, y + 1, z + 10, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 1, z + 10, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 10, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 1, z + 10, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 10, ModBlocks.machine_electric_furnace_off, 4, 3); world.setBlock(x + 14, y + 1, z + 10, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 11, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 11, Block2, 5, 3); - world.setBlock(x + 6, y + 1, z + 11, ModBlocks.factory_titanium_furnace, 4, 3); - world.setBlock(x + 7, y + 1, z + 11, Block3, 0, 3); - world.setBlock(x + 8, y + 1, z + 11, ModBlocks.factory_titanium_furnace, 5, 3); + world.setBlock(x + 6, y + 1, z + 11, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 11, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 1, z + 11, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 11, Blocks.stone_brick_stairs, 4, 3); world.setBlock(x + 14, y + 1, z + 11, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 12, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 12, Block2, 5, 3); - world.setBlock(x + 6, y + 1, z + 12, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 1, z + 12, ModBlocks.factory_titanium_furnace, 3, 3); - world.setBlock(x + 8, y + 1, z + 12, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 1, z + 12, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 12, ModBlocks.deco_steel, 3, 3); + world.setBlock(x + 8, y + 1, z + 12, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 12, ModBlocks.machine_electric_furnace_off, 4, 3); world.setBlock(x + 14, y + 1, z + 12, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 13, Blocks.stonebrick, 0, 3); @@ -856,21 +854,21 @@ public class Factory extends WorldGenerator world.setBlock(x + 14, y + 1, z + 15, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 16, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 16, ModBlocks.deco_lead, 5, 3); - world.setBlock(x + 6, y + 1, z + 16, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 1, z + 16, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 1, z + 16, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 16, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 16, ModBlocks.machine_electric_furnace_off, 4, 3); world.setBlock(x + 14, y + 1, z + 16, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 17, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 17, Block2, 5, 3); - world.setBlock(x + 6, y + 1, z + 17, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 1, z + 17, Block3, 0, 3); - world.setBlock(x + 8, y + 1, z + 17, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 1, z + 17, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 17, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 1, z + 17, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 17, Blocks.stone_brick_stairs, 4, 3); world.setBlock(x + 14, y + 1, z + 17, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 18, Blocks.stonebrick, 0, 3); world.setBlock(x + 1, y + 1, z + 18, Block2, 5, 3); - world.setBlock(x + 6, y + 1, z + 18, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 1, z + 18, ModBlocks.factory_titanium_furnace, 3, 3); + world.setBlock(x + 6, y + 1, z + 18, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 1, z + 18, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 13, y + 1, z + 18, ModBlocks.machine_electric_furnace_off, 4, 3); world.setBlock(x + 14, y + 1, z + 18, Blocks.stonebrick, 0, 3); world.setBlock(x + 0, y + 1, z + 19, Blocks.stonebrick, 0, 3); @@ -965,19 +963,19 @@ public class Factory extends WorldGenerator world.setBlock(x + 8, y + 2, z + 3, Blocks.iron_bars, 0, 3); world.setBlock(x + 14, y + 2, z + 3, Blocks.glass, 0, 3); world.setBlock(x + 0, y + 2, z + 4, Blocks.glass, 0, 3); - world.setBlock(x + 6, y + 2, z + 4, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 2, z + 4, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 2, z + 4, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 2, z + 4, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 2, z + 4, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 2, z + 4, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 14, y + 2, z + 4, Blocks.glass, 0, 3); world.setBlock(x + 0, y + 2, z + 5, Blocks.brick_block, 0, 3); - world.setBlock(x + 6, y + 2, z + 5, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 2, z + 5, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 2, z + 5, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 2, z + 5, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 2, z + 5, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 2, z + 5, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 14, y + 2, z + 5, Blocks.brick_block, 0, 3); world.setBlock(x + 0, y + 2, z + 6, Blocks.brick_block, 0, 3); - world.setBlock(x + 6, y + 2, z + 6, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 2, z + 6, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 2, z + 6, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 2, z + 6, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 2, z + 6, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 2, z + 6, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 14, y + 2, z + 6, Blocks.brick_block, 0, 3); world.setBlock(x + 0, y + 2, z + 7, Blocks.glass, 0, 3); world.setBlock(x + 6, y + 2, z + 7, Blocks.iron_bars, 0, 3); @@ -992,19 +990,19 @@ public class Factory extends WorldGenerator world.setBlock(x + 8, y + 2, z + 9, Blocks.iron_bars, 0, 3); world.setBlock(x + 14, y + 2, z + 9, Blocks.brick_block, 0, 3); world.setBlock(x + 0, y + 2, z + 10, Blocks.brick_block, 0, 3); - world.setBlock(x + 6, y + 2, z + 10, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 2, z + 10, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 2, z + 10, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 2, z + 10, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 2, z + 10, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 2, z + 10, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 14, y + 2, z + 10, Blocks.brick_block, 0, 3); world.setBlock(x + 0, y + 2, z + 11, Blocks.glass, 0, 3); - world.setBlock(x + 6, y + 2, z + 11, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 2, z + 11, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 2, z + 11, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 2, z + 11, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 2, z + 11, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 2, z + 11, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 14, y + 2, z + 11, Blocks.glass, 0, 3); world.setBlock(x + 0, y + 2, z + 12, Blocks.glass, 0, 3); - world.setBlock(x + 6, y + 2, z + 12, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 7, y + 2, z + 12, ModBlocks.factory_titanium_hull, 0, 3); - world.setBlock(x + 8, y + 2, z + 12, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 2, z + 12, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 7, y + 2, z + 12, ModBlocks.deco_steel, 0, 3); + world.setBlock(x + 8, y + 2, z + 12, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 14, y + 2, z + 12, Blocks.glass, 0, 3); world.setBlock(x + 0, y + 2, z + 13, Blocks.brick_block, 0, 3); world.setBlock(x + 6, y + 2, z + 13, Blocks.iron_bars, 0, 3); @@ -1017,7 +1015,7 @@ public class Factory extends WorldGenerator world.setBlock(x + 6, y + 2, z + 15, Blocks.iron_bars, 0, 3); world.setBlock(x + 14, y + 2, z + 15, Blocks.glass, 0, 3); world.setBlock(x + 0, y + 2, z + 16, Blocks.glass, 0, 3); - world.setBlock(x + 6, y + 2, z + 16, ModBlocks.factory_titanium_hull, 0, 3); + world.setBlock(x + 6, y + 2, z + 16, ModBlocks.deco_steel, 0, 3); world.setBlock(x + 14, y + 2, z + 16, Blocks.glass, 0, 3); world.setBlock(x + 0, y + 2, z + 17, Blocks.brick_block, 0, 3); world.setBlock(x + 14, y + 2, z + 17, Blocks.brick_block, 0, 3); diff --git a/src/main/java/com/hbm/world/feature/Dud.java b/src/main/java/com/hbm/world/feature/Dud.java index 1622cfae4..85572aa4a 100644 --- a/src/main/java/com/hbm/world/feature/Dud.java +++ b/src/main/java/com/hbm/world/feature/Dud.java @@ -13,12 +13,6 @@ import net.minecraft.world.gen.feature.WorldGenerator; public class Dud extends WorldGenerator { - Block Block1 = ModBlocks.steel_scaffold; - Block Block2 = ModBlocks.machine_difurnace_off; - Block Block3 = ModBlocks.factory_titanium_core; - Block Block4 = ModBlocks.steel_wall; - Block Block5 = ModBlocks.reinforced_light; - protected Block[] GetValidSpawnBlocks() { return new Block[] { Blocks.grass,