From 0c34901864b023605e9d3446318a2596e22e6286 Mon Sep 17 00:00:00 2001 From: Vaern Date: Sun, 19 Jun 2022 22:23:18 -0700 Subject: [PATCH 1/4] ZIRNOX stuff + lil bit of Igen Added Mox ZFB rods for fast technetium breeding (50k ticks); Increased the lifetimes for almost all ZIRNOX fuels by approximately 2, along with minor changes to heat values; reduced buffs to boosted presto logs in the IGen: shouldn't be *as* broken anymore, but still nowhere near unremarkable; Added Hopper IO functionality to the ZIRNOX; Changed ZIRNOX and destroyed variant's model textures slightly --- .../java/com/hbm/crafting/RodRecipes.java | 2 + .../java/com/hbm/hazard/HazardRegistry.java | 3 + .../inventory/recipes/CentrifugeRecipes.java | 8 ++- .../inventory/recipes/FuelPoolRecipes.java | 1 + src/main/java/com/hbm/items/ModItems.java | 31 ++++++--- .../com/hbm/items/machine/ItemFuelRod.java | 2 +- .../machine/TileEntityMachineIGenerator.java | 10 +-- .../machine/TileEntityReactorZirnox.java | 63 +++++++++++++++--- src/main/resources/assets/hbm/lang/en_US.lang | 41 ++++++------ .../hbm/textures/items/rod_zirnox_zfb_mox.png | Bin 0 -> 494 bytes .../items/rod_zirnox_zfb_mox_depleted.png | Bin 0 -> 477 bytes .../hbm/textures/items/waste_zfb_mox.png | Bin 0 -> 475 bytes .../assets/hbm/textures/models/zirnox.png | Bin 13149 -> 6732 bytes .../hbm/textures/models/zirnox_destroyed.png | Bin 11183 -> 25106 bytes 14 files changed, 113 insertions(+), 48 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/rod_zirnox_zfb_mox.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod_zirnox_zfb_mox_depleted.png create mode 100644 src/main/resources/assets/hbm/textures/items/waste_zfb_mox.png diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index 834b6849c..91b675b0a 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -31,6 +31,7 @@ public class RodRecipes { addZIRNOXRod(U235, ModItems.rod_zirnox_u235_fuel); addZIRNOXRod(ModItems.billet_les, ModItems.rod_zirnox_les_fuel); CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_zirnox_lithium), new Object[] { ModItems.rod_zirnox_empty, LI.ingot(), LI.ingot() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_zirnox_zfb_mox), new Object[] { ModItems.rod_zirnox_empty, ModItems.billet_mox_fuel, ZR.billet() }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_natural_uranium, 2, 1), new Object[] { ModItems.rod_zirnox_natural_uranium_fuel_depleted }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_uranium, 2, 1), new Object[] { ModItems.rod_zirnox_uranium_fuel_depleted }); @@ -40,6 +41,7 @@ public class RodRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_u233, 2, 1), new Object[] { ModItems.rod_zirnox_u233_fuel_depleted }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_u235, 2, 1), new Object[] { ModItems.rod_zirnox_u235_fuel_depleted }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_schrabidium, 2, 1), new Object[] { ModItems.rod_zirnox_les_fuel_depleted }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_zfb_mox, 2, 1), new Object[] { ModItems.rod_zirnox_zfb_mox_depleted }); //Breeding Rods CraftingManager.addRecipeAuto(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', STEEL.plate(), 'L', PB.plate() }); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index c1c0f1ffb..89f939901 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -222,6 +222,7 @@ public class HazardRegistry { registerOtherFuel(rod_zirnox_u235_fuel, u235 * rod_dual, wst * rod_dual * 11F, false); registerOtherFuel(rod_zirnox_les_fuel, saf * rod_dual, wst * rod_dual * 15F, false); registerOtherFuel(rod_zirnox_lithium, 0, 0.001F * rod_dual, false); + registerOtherFuel(rod_zirnox_zfb_mox, mox * rod_dual, wst * rod_dual * 5F, false); HazardSystem.register(rod_zirnox_natural_uranium_fuel_depleted, makeData(RADIATION, wst * rod_dual * 11.5F)); HazardSystem.register(rod_zirnox_uranium_fuel_depleted, makeData(RADIATION, wst * rod_dual * 10F)); @@ -232,6 +233,7 @@ public class HazardRegistry { HazardSystem.register(rod_zirnox_u235_fuel_depleted, makeData(RADIATION, wst * rod_dual * 11F)); HazardSystem.register(rod_zirnox_les_fuel_depleted, makeData().addEntry(RADIATION, wst * rod_dual * 15F).addEntry(BLINDING, 20F)); HazardSystem.register(rod_zirnox_tritium, makeData(RADIATION, 0.001F * rod_dual)); + HazardSystem.register(rod_zirnox_zfb_mox_depleted, makeData(RADIATION, wst * rod_dual * 5F)); registerOtherWaste(waste_natural_uranium, wst * billet * 11.5F); registerOtherWaste(waste_uranium, wst * billet * 10F); @@ -241,6 +243,7 @@ public class HazardRegistry { registerOtherWaste(waste_u233, wst * billet * 10F); registerOtherWaste(waste_u235, wst * billet * 11F); registerOtherWaste(waste_schrabidium, wst * billet * 15F); + registerOtherWaste(waste_zfb_mox, wst * billet * 5F); registerOtherFuel(pellet_schrabidium, sa326 * ingot * 5, wst * ingot * 100, true); registerOtherFuel(pellet_hes, saf * ingot * 5, wst * ingot * 75, true); diff --git a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java index cc18449b7..a48ff6e2f 100644 --- a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java @@ -71,9 +71,15 @@ public class CentrifugeRecipes { recipes.put(new ComparableStack(ModItems.waste_schrabidium), new ItemStack[] { new ItemStack(ModItems.nugget_beryllium, 2), new ItemStack(ModItems.nugget_pu239, 1), - new ItemStack(ModItems.nuclear_waste_tiny, 2), + new ItemStack(ModItems.nuclear_waste_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 2) }); + recipes.put(new ComparableStack(ModItems.waste_zfb_mox), new ItemStack[] { + new ItemStack(ModItems.nugget_zirconium, 3), + new ItemStack(ModItems.nugget_technetium, 1), + new ItemStack(ModItems.nugget_pu_mix, 1), + new ItemStack(ModItems.nuclear_waste_tiny, 1) }); + recipes.put(new ComparableStack(ModItems.waste_plate_mox), new ItemStack[] { new ItemStack(ModItems.powder_sr90_tiny, 1), new ItemStack(ModItems.nugget_pu_mix, 3), diff --git a/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java b/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java index 43ef32c73..2e80c2bb4 100644 --- a/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java @@ -29,6 +29,7 @@ public class FuelPoolRecipes extends SerializableRecipe { recipes.put(new ComparableStack(ModItems.waste_u233, 1, 1), new ItemStack(ModItems.waste_u233)); recipes.put(new ComparableStack(ModItems.waste_u235, 1, 1), new ItemStack(ModItems.waste_u235)); recipes.put(new ComparableStack(ModItems.waste_schrabidium, 1, 1), new ItemStack(ModItems.waste_schrabidium)); + recipes.put(new ComparableStack(ModItems.waste_zfb_mox, 1, 1), new ItemStack(ModItems.waste_zfb_mox)); recipes.put(new ComparableStack(ModItems.waste_plate_u233, 1, 1), new ItemStack(ModItems.waste_plate_u233)); recipes.put(new ComparableStack(ModItems.waste_plate_u235, 1, 1), new ItemStack(ModItems.waste_plate_u235)); recipes.put(new ComparableStack(ModItems.waste_plate_mox, 1, 1), new ItemStack(ModItems.waste_plate_mox)); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 897408806..5ccb80388 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1030,6 +1030,7 @@ public class ModItems { public static Item rod_zirnox_les_fuel; public static Item rod_zirnox_lithium; public static Item rod_zirnox_tritium; + public static Item rod_zirnox_zfb_mox; public static Item rod_zirnox_natural_uranium_fuel_depleted; public static Item rod_zirnox_uranium_fuel_depleted; @@ -1039,6 +1040,7 @@ public class ModItems { public static Item rod_zirnox_u233_fuel_depleted; public static Item rod_zirnox_u235_fuel_depleted; public static Item rod_zirnox_les_fuel_depleted; + public static Item rod_zirnox_zfb_mox_depleted; public static Item waste_natural_uranium; public static Item waste_uranium; @@ -1048,6 +1050,7 @@ public class ModItems { public static Item waste_u233; public static Item waste_u235; public static Item waste_schrabidium; + public static Item waste_zfb_mox; //TODO: remind me to smite these useless waste items and condense em like the rbmk waste public static Item waste_plate_u233; public static Item waste_plate_u235; @@ -3581,18 +3584,19 @@ public class ModItems { rod_quad = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod_quad").setContainerItem(ModItems.rod_quad_empty).setCreativeTab(MainRegistry.controlTab); rod_zirnox_empty = new Item().setUnlocalizedName("rod_zirnox_empty").setMaxStackSize(64).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_empty"); - rod_zirnox_natural_uranium_fuel = new ItemZirnoxRod(125000, 30).setUnlocalizedName("rod_zirnox_natural_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_natural_uranium_fuel"); - rod_zirnox_uranium_fuel = new ItemZirnoxRod(100000, 50).setUnlocalizedName("rod_zirnox_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel"); + rod_zirnox_natural_uranium_fuel = new ItemZirnoxRod(250000, 30).setUnlocalizedName("rod_zirnox_natural_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_natural_uranium_fuel"); + rod_zirnox_uranium_fuel = new ItemZirnoxRod(200000, 50).setUnlocalizedName("rod_zirnox_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel"); rod_zirnox_th232 = new ItemZirnoxBreedingRod(20000, 0).setUnlocalizedName("rod_zirnox_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_th232"); - rod_zirnox_thorium_fuel = new ItemZirnoxRod(120000, 40).setUnlocalizedName("rod_zirnox_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_thorium_fuel"); - rod_zirnox_mox_fuel = new ItemZirnoxRod(80000, 75).setUnlocalizedName("rod_zirnox_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_mox_fuel"); - rod_zirnox_plutonium_fuel = new ItemZirnoxRod(85000, 65).setUnlocalizedName("rod_zirnox_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_plutonium_fuel"); - rod_zirnox_u233_fuel = new ItemZirnoxRod(87500, 80).setUnlocalizedName("rod_zirnox_u233_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_u233_fuel"); - rod_zirnox_u235_fuel = new ItemZirnoxRod(85000, 85).setUnlocalizedName("rod_zirnox_u235_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_u235_fuel"); + rod_zirnox_thorium_fuel = new ItemZirnoxRod(200000, 40).setUnlocalizedName("rod_zirnox_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_thorium_fuel"); + rod_zirnox_mox_fuel = new ItemZirnoxRod(165000, 75).setUnlocalizedName("rod_zirnox_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_mox_fuel"); + rod_zirnox_plutonium_fuel = new ItemZirnoxRod(175000, 65).setUnlocalizedName("rod_zirnox_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_plutonium_fuel"); + rod_zirnox_u233_fuel = new ItemZirnoxRod(150000, 100).setUnlocalizedName("rod_zirnox_u233_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_u233_fuel"); + rod_zirnox_u235_fuel = new ItemZirnoxRod(165000, 85).setUnlocalizedName("rod_zirnox_u235_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_u235_fuel"); rod_zirnox_les_fuel = new ItemZirnoxRod(150000, 150).setUnlocalizedName("rod_zirnox_les_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_les_fuel"); rod_zirnox_lithium = new ItemZirnoxBreedingRod(20000, 0).setUnlocalizedName("rod_zirnox_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_lithium"); - rod_zirnox_tritium = new Item().setUnlocalizedName("rod_zirnox_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_tritium"); - + rod_zirnox_tritium = new Item().setUnlocalizedName("rod_zirnox_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_tritium"); + rod_zirnox_zfb_mox = new ItemZirnoxRod(50000, 35).setUnlocalizedName("rod_zirnox_zfb_mox").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_zfb_mox"); + rod_zirnox_natural_uranium_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_natural_uranium_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel_depleted"); rod_zirnox_uranium_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_uranium_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel_depleted"); rod_zirnox_thorium_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_thorium_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_thorium_fuel_depleted"); @@ -3601,7 +3605,8 @@ public class ModItems { rod_zirnox_u233_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_u233_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_u233_fuel_depleted"); rod_zirnox_u235_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_u235_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_u235_fuel_depleted"); rod_zirnox_les_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_les_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_les_fuel_depleted"); - + rod_zirnox_zfb_mox_depleted = new Item().setUnlocalizedName("rod_zirnox_zfb_mox_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_zfb_mox_depleted"); + waste_natural_uranium = new ItemDepletedFuel().setUnlocalizedName("waste_natural_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); waste_uranium = new ItemDepletedFuel().setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); waste_thorium = new ItemDepletedFuel().setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); @@ -3610,6 +3615,7 @@ public class ModItems { waste_u233 = new ItemDepletedFuel().setUnlocalizedName("waste_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); waste_u235 = new ItemDepletedFuel().setUnlocalizedName("waste_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); waste_schrabidium = new ItemDepletedFuel().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); + waste_zfb_mox = new ItemDepletedFuel().setUnlocalizedName("waste_zfb_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_zfb_mox"); waste_plate_u233 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_uranium"); waste_plate_u235 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_uranium"); @@ -6774,7 +6780,8 @@ public class ModItems { GameRegistry.registerItem(rod_zirnox_les_fuel, rod_zirnox_les_fuel.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_lithium, rod_zirnox_lithium.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_tritium, rod_zirnox_tritium.getUnlocalizedName()); - + GameRegistry.registerItem(rod_zirnox_zfb_mox, rod_zirnox_zfb_mox.getUnlocalizedName()); + GameRegistry.registerItem(rod_zirnox_natural_uranium_fuel_depleted, rod_zirnox_natural_uranium_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_uranium_fuel_depleted, rod_zirnox_uranium_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_thorium_fuel_depleted, rod_zirnox_thorium_fuel_depleted.getUnlocalizedName()); @@ -6783,6 +6790,7 @@ public class ModItems { GameRegistry.registerItem(rod_zirnox_u233_fuel_depleted, rod_zirnox_u233_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_u235_fuel_depleted, rod_zirnox_u235_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_les_fuel_depleted, rod_zirnox_les_fuel_depleted.getUnlocalizedName()); + GameRegistry.registerItem(rod_zirnox_zfb_mox_depleted, rod_zirnox_zfb_mox_depleted.getUnlocalizedName()); //Depleted Fuel GameRegistry.registerItem(waste_natural_uranium, waste_natural_uranium.getUnlocalizedName()); @@ -6793,6 +6801,7 @@ public class ModItems { GameRegistry.registerItem(waste_u233, waste_u233.getUnlocalizedName()); GameRegistry.registerItem(waste_u235, waste_u235.getUnlocalizedName()); GameRegistry.registerItem(waste_schrabidium, waste_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(waste_zfb_mox, waste_zfb_mox.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_u233, waste_plate_u233.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_u235, waste_plate_u235.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemFuelRod.java b/src/main/java/com/hbm/items/machine/ItemFuelRod.java index 3fa3cd46e..f443fca48 100644 --- a/src/main/java/com/hbm/items/machine/ItemFuelRod.java +++ b/src/main/java/com/hbm/items/machine/ItemFuelRod.java @@ -38,7 +38,7 @@ public class ItemFuelRod extends Item { } public boolean showDurabilityBar(ItemStack stack) { - return true; + return getDurabilityForDisplay(stack) > 0D; } public double getDurabilityForDisplay(ItemStack stack) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index 04191a8f6..2da830617 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -99,14 +99,14 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement if(burnTime > 0) { - if(fuel.getItem() == Items.coal) + if(fuel.getItem() == Items.coal) //1200 (1600) burnTime *= 1.5; - if(fuel.getItem() == ModItems.solid_fuel) + if(fuel.getItem() == ModItems.solid_fuel) //3200 (3200) burnTime *= 2; - if(fuel.getItem() == ModItems.solid_fuel_presto) + if(fuel.getItem() == ModItems.solid_fuel_presto) //16000 (8000) + burnTime *= 4; + if(fuel.getItem() == ModItems.solid_fuel_presto_triplet) //80000 (40000) burnTime *= 4; - if(fuel.getItem() == ModItems.solid_fuel_presto_triplet) - burnTime *= 10; burn[i] = burnTime; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index d48cacb7d..71e680d5d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -32,8 +32,10 @@ import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; @@ -52,6 +54,8 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF public FluidTank steam; public FluidTank carbonDioxide; public FluidTank water; + + private static final int[] slots_io = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 }; public static final HashMap fuelMap = new HashMap(); static { @@ -65,6 +69,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF fuelMap.put(new ComparableStack(ModItems.rod_zirnox_u235_fuel), new ItemStack(ModItems.rod_zirnox_u235_fuel_depleted)); fuelMap.put(new ComparableStack(ModItems.rod_zirnox_les_fuel), new ItemStack(ModItems.rod_zirnox_les_fuel_depleted)); fuelMap.put(new ComparableStack(ModItems.rod_zirnox_lithium), new ItemStack(ModItems.rod_zirnox_tritium)); + fuelMap.put(new ComparableStack(ModItems.rod_zirnox_zfb_mox), new ItemStack(ModItems.rod_zirnox_zfb_mox_depleted)); } public TileEntityReactorZirnox() { @@ -78,6 +83,47 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF public String getName() { return "container.zirnox"; } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + return slots_io; + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack stack) { + return i < 24 && stack.getItem() instanceof ItemZirnoxRod; + } + + @Override + public boolean canExtractItem(int i, ItemStack stack, int j) { + return i < 24 && !(stack.getItem() instanceof ItemZirnoxRod); + } + + //fucking hate having to do this + private void loadFuel() { + TileEntity te = worldObj.getTileEntity(this.xCoord, this.yCoord + 5, this.zCoord); + + if(te instanceof IInventory) { + IInventory inv = (IInventory) te; + + for(int i = 0; i < inv.getSizeInventory(); i++) { + + ItemStack stack = inv.getStackInSlot(i); + if(stack != null && stack.getItem() instanceof ItemZirnoxRod) { + + for(int j = 0; j < 23; j++) { + //ZIRNOX rods cannot stack higher than 1 anyway + if(slots[j] == null) { + slots[j] = stack.copy(); + slots[j].stackSize = 1; + inv.decrStackSize(i, 1); + return; + } + } + } + } + } + } @Override public void readFromNBT(NBTTagCompound nbt) { @@ -169,12 +215,13 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF if(worldObj.getTotalWorldTime() % 20 == 0) { this.updateConnections(); } - + carbonDioxide.loadTank(24, 26, slots); water.loadTank(25, 27, slots); - + + loadFuel(); + if(isOn) { - for(int i = 0; i < 24; i++) { if(slots[i] != null) { @@ -238,9 +285,6 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF } private boolean hasFuelRod(int id) { - if(id > 23) - return false; - if(slots[id] != null) { if(!(slots[id].getItem() instanceof ItemZirnoxBreedingRod)) { return slots[id].getItem() instanceof ItemZirnoxRod; @@ -269,13 +313,10 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF // itemstack in slots[id] has to contain ItemZirnoxRod private void decay(int id) { - if(id > 23) - return; - int decay = getNeighbourCount(id); if(!(slots[id].getItem() instanceof ItemZirnoxBreedingRod)) { - decay = getNeighbourCount(id) + 1; + decay++; } for(int i = 0; i < decay; i++) { @@ -283,7 +324,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF this.heat += rod.heat; ItemZirnoxRod.setLifeTime(slots[id], ItemZirnoxRod.getLifeTime(slots[id]) + 1); - if(ItemZirnoxRod.getLifeTime(slots[id]) > ((ItemZirnoxRod) slots[id].getItem()).lifeTime) { + if(ItemZirnoxRod.getLifeTime(slots[id]) > rod.lifeTime) { slots[id] = fuelMap.get(new ComparableStack(getStackInSlot(id))).copy(); break; } diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 33e0cd4bc..9a29569a2 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2901,25 +2901,27 @@ item.rod_waste.name=Nuclear Waste Rod item.rod_water.name=Water Cell item.rod_weidanium.name=Weidanium Rod item.rod_zirnox_empty.name=Empty ZIRNOX Rod -item.rod_zirnox_natural_uranium_fuel.name= ZIRNOX Natural Uranium Fuel Rod -item.rod_zirnox_uranium_fuel.name= ZIRNOX Uranium Fuel Rod -item.rod_zirnox_th232.name= ZIRNOX Thorium-232 Rod -item.rod_zirnox_thorium_fuel.name= ZIRNOX Thorium Fuel Rod -item.rod_zirnox_mox_fuel.name= ZIRNOX MOX Fuel Rod -item.rod_zirnox_plutonium_fuel.name= ZIRNOX Plutonium Fuel Rod -item.rod_zirnox_u233_fuel.name= ZIRNOX Uranium-233 Fuel Rod -item.rod_zirnox_u235_fuel.name= ZIRNOX Uranium-235 Fuel Rod -item.rod_zirnox_les_fuel.name= ZIRNOX LES Fuel Rod -item.rod_zirnox_lithium.name= ZIRNOX Lithium Rod -item.rod_zirnox_tritium.name= ZIRNOX Tritium Rod -item.rod_zirnox_natural_uranium_fuel_depleted.name= Depleted ZIRNOX Natural Uranium Fuel Rod -item.rod_zirnox_uranium_fuel_depleted.name= Depleted ZIRNOX Uranium Fuel Rod -item.rod_zirnox_thorium_fuel_depleted.name= Depleted ZIRNOX Thorium Fuel Rod -item.rod_zirnox_mox_fuel_depleted.name= Depleted ZIRNOX MOX Fuel Rod -item.rod_zirnox_plutonium_fuel_depleted.name= Depleted ZIRNOX Plutonium Fuel Rod -item.rod_zirnox_u233_fuel_depleted.name= Depleted ZIRNOX Uranium-233 Fuel Rod -item.rod_zirnox_u235_fuel_depleted.name= Depleted ZIRNOX Uranium-235 Fuel Rod -item.rod_zirnox_les_fuel_depleted.name= Depleted ZIRNOX LES Fuel Rod +item.rod_zirnox_natural_uranium_fuel.name=ZIRNOX Natural Uranium Fuel Rod +item.rod_zirnox_uranium_fuel.name=ZIRNOX Uranium Fuel Rod +item.rod_zirnox_th232.name=ZIRNOX Thorium-232 Rod +item.rod_zirnox_thorium_fuel.name=ZIRNOX Thorium Fuel Rod +item.rod_zirnox_mox_fuel.name=ZIRNOX MOX Fuel Rod +item.rod_zirnox_plutonium_fuel.name=ZIRNOX Plutonium Fuel Rod +item.rod_zirnox_u233_fuel.name=ZIRNOX Uranium-233 Fuel Rod +item.rod_zirnox_u235_fuel.name=ZIRNOX Uranium-235 Fuel Rod +item.rod_zirnox_les_fuel.name=ZIRNOX LES Fuel Rod +item.rod_zirnox_lithium.name=ZIRNOX Lithium Rod +item.rod_zirnox_tritium.name=ZIRNOX Tritium Rod +item.rod_zirnox_zfb_mox.name=ZIRNOX ZFB MOX Fuel Rod +item.rod_zirnox_natural_uranium_fuel_depleted.name=Depleted ZIRNOX Natural Uranium Fuel Rod +item.rod_zirnox_uranium_fuel_depleted.name= DepletedZIRNOX Uranium Fuel Rod +item.rod_zirnox_thorium_fuel_depleted.name= DepletedZIRNOX Thorium Fuel Rod +item.rod_zirnox_mox_fuel_depleted.name=Depleted ZIRNOX MOX Fuel Rod +item.rod_zirnox_plutonium_fuel_depleted.name=Depleted ZIRNOX Plutonium Fuel Rod +item.rod_zirnox_u233_fuel_depleted.name=Depleted ZIRNOX Uranium-233 Fuel Rod +item.rod_zirnox_u235_fuel_depleted.name=Depleted ZIRNOX Uranium-235 Fuel Rod +item.rod_zirnox_les_fuel_depleted.name=Depleted ZIRNOX LES Fuel Rod +item.rod_zirnox_zfb_mox_depleted.name=Depleted ZIRNOX ZFB MOX Fuel Rod item.rotor_steel.name=Large Steel Rotor item.rpa_boots.name=Remnants Power Armor Boots item.rpa_helmet.name=Remnants Power Armor Helmet @@ -3222,6 +3224,7 @@ item.waste_thorium.name=Depleted Thorium Fuel item.waste_u235.name=Depleted Uranium-235 Fuel item.waste_u233.name=Depleted Uranium-233 Fuel item.waste_uranium.name=Depleted Uranium Fuel +item.waste_zfb_mox.name=Depleted ZFB MOX Fuel item.watch.name=Broken Pocket Watch item.watch.desc=A small blue pocket watch.$It's glass has a few cracks in it,$and some shards are missing.$It stopped ticking at 2:34. item.weapon_bat.name=Richard's Default diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_zfb_mox.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_zfb_mox.png new file mode 100644 index 0000000000000000000000000000000000000000..55d0c2f82c7fcbd3fb0684fde162fcf0e2a2703f GIT binary patch literal 494 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0fR|IK~y+Tm65Sh z!axv)_mV&uVL-$91o{R(f@7za6c)S#1r5&FSXyXfK}AJF>GS9eWt=fWCJ-+nm-BYR zF(CmNznSEAH@Urk|6}k6lgYEhwbSV_DJk5*ShkhkZ;*YxRb^a}(dbcf&Q-+#&+}j~ zcr6`DJVP_G|>Wij&M;0T&H=I6M6elICc5($k)^^B4N)Bro@yH~5Vcf*k2 zeq{|%!E6?OP*Py;2&S^kRSM7p#!MPPqYtEKT`Msh-Yd_t{y`8xzyGrH-;x6Dv=H*5 k-FDRdJ4*h{p<)SuUp0oQ7%kzz?*IS*07*qoM6N<$g5p}vumAu6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/rod_zirnox_zfb_mox_depleted.png b/src/main/resources/assets/hbm/textures/items/rod_zirnox_zfb_mox_depleted.png new file mode 100644 index 0000000000000000000000000000000000000000..822ca968b9167f2c64a8621dab279beadc7386b0 GIT binary patch literal 477 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 Q{XIkmzGVWc)NzXW4{ez!x&QzG literal 13149 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 diff --git a/src/main/resources/assets/hbm/textures/models/zirnox_destroyed.png b/src/main/resources/assets/hbm/textures/models/zirnox_destroyed.png index d2efd7075c297c825f208da74910e4b2355899bc..ca439722f5c8ebb6b086526a9d3e2b85ceca7b9c 100644 GIT binary patch literal 25106 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�qv^}f4>{qSfJ_o}Li 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 I)pL&iA2i(QM*si- literal 11183 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 From ffce09b080b9a19802c2599ea621cdef19c30981 Mon Sep 17 00:00:00 2001 From: Vaern Date: Sun, 19 Jun 2022 22:34:52 -0700 Subject: [PATCH 2/4] Added l18n to ZIRNOX tooltips --- .../com/hbm/items/machine/ItemZirnoxBreedingRod.java | 9 ++++++--- src/main/java/com/hbm/items/machine/ItemZirnoxRod.java | 9 ++++++--- src/main/resources/assets/hbm/lang/en_US.lang | 2 ++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/items/machine/ItemZirnoxBreedingRod.java b/src/main/java/com/hbm/items/machine/ItemZirnoxBreedingRod.java index 039e5e399..c0623d2d2 100644 --- a/src/main/java/com/hbm/items/machine/ItemZirnoxBreedingRod.java +++ b/src/main/java/com/hbm/items/machine/ItemZirnoxBreedingRod.java @@ -3,6 +3,7 @@ package com.hbm.items.machine; import java.util.List; import com.hbm.util.BobMathUtil; +import com.hbm.util.I18nUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -17,8 +18,10 @@ public class ItemZirnoxBreedingRod extends ItemZirnoxRod { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add(EnumChatFormatting.YELLOW + "[ZIRNOX Breeding Rod]"); - list.add(EnumChatFormatting.DARK_AQUA + " Place next to fuel rods to breed"); - list.add(EnumChatFormatting.DARK_AQUA + " Lasts " + BobMathUtil.getShortNumber(lifeTime) + " ticks"); + String[] descLocs = I18nUtil.resolveKeyArray("desc.item.zirnoxBreedingRod", BobMathUtil.getShortNumber(lifeTime)); + + for(String loc : descLocs) { + list.add(loc); + } } } \ No newline at end of file diff --git a/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java b/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java index cf590c18d..5ef69303a 100644 --- a/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java +++ b/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java @@ -3,6 +3,7 @@ package com.hbm.items.machine; import java.util.List; import com.hbm.util.BobMathUtil; +import com.hbm.util.I18nUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,8 +21,10 @@ public class ItemZirnoxRod extends ItemFuelRod { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add(EnumChatFormatting.YELLOW + "[ZIRNOX Fuel Rod]"); - list.add(EnumChatFormatting.DARK_AQUA + " Generates " + heat + " heat per tick"); - list.add(EnumChatFormatting.DARK_AQUA + " Lasts " + BobMathUtil.getShortNumber(lifeTime) + " ticks"); + String[] descLocs = I18nUtil.resolveKeyArray("desc.item.zirnoxRod", heat, BobMathUtil.getShortNumber(lifeTime)); + + for(String loc : descLocs) { + list.add(loc); + } } } \ No newline at end of file diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 9a29569a2..3d2a2f17f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -567,6 +567,8 @@ desc.item.pileRod=§eUse on drilled graphite to insert$§eUse screwdriver to ext desc.item.rtgDecay=Decays to: %s desc.item.rtgHeat=Power Level: %s desc.item.wasteCooling=Cool in a Spent Fuel Pool Drum +desc.item.zirnoxBreedingRod=§2[ZIRNOX Breeding Rod]$§ePlace next to fuel rods to breed$§eLasts %d ticks +desc.item.zirnoxRod=§a[ZIRNOX Fuel Rod]$§eGenerates %1$d heat per tick$§eLasts %2$d ticks desc.gui.assembler.warning=§cError:§r This machine requires an assembly template! desc.gui.chemplant.warning=§cError:§r This machine requires an chemistry template! desc.gui.gasCent.enrichment=§2Enrichment§r$Uranium enrichment requires cascades.$Two-centrifuge cascades will give$uranium fuel, four-centrifuge cascades$will give total separation. From aa7e20f3e23dab2924f55f66d9c3388c2ff6711c Mon Sep 17 00:00:00 2001 From: Vaern Date: Mon, 20 Jun 2022 13:45:45 -0700 Subject: [PATCH 3/4] localization & input fixes, fuel radiation modifier changed --- .../com/hbm/hazard/modifier/HazardModifierFuelRadiation.java | 2 +- .../com/hbm/tileentity/machine/TileEntityReactorZirnox.java | 2 +- src/main/resources/assets/hbm/lang/en_US.lang | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java index c95a1e213..bc1584e9d 100644 --- a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java +++ b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java @@ -18,7 +18,7 @@ float target; if(stack.getItem() instanceof ItemFuelRod) { ItemFuelRod fuel = (ItemFuelRod) stack.getItem(); - double depletion = fuel.getDurabilityForDisplay(stack); + double depletion = Math.pow(fuel.getDurabilityForDisplay(stack), 0.4D); level = (float) (level + (this.target - level) * depletion); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 71e680d5d..4fc78d35e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -111,7 +111,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF ItemStack stack = inv.getStackInSlot(i); if(stack != null && stack.getItem() instanceof ItemZirnoxRod) { - for(int j = 0; j < 23; j++) { + for(int j = 0; j < 24; j++) { //ZIRNOX rods cannot stack higher than 1 anyway if(slots[j] == null) { slots[j] = stack.copy(); diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 3d2a2f17f..cfbc8aa95 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2916,8 +2916,8 @@ item.rod_zirnox_lithium.name=ZIRNOX Lithium Rod item.rod_zirnox_tritium.name=ZIRNOX Tritium Rod item.rod_zirnox_zfb_mox.name=ZIRNOX ZFB MOX Fuel Rod item.rod_zirnox_natural_uranium_fuel_depleted.name=Depleted ZIRNOX Natural Uranium Fuel Rod -item.rod_zirnox_uranium_fuel_depleted.name= DepletedZIRNOX Uranium Fuel Rod -item.rod_zirnox_thorium_fuel_depleted.name= DepletedZIRNOX Thorium Fuel Rod +item.rod_zirnox_uranium_fuel_depleted.name= Depleted ZIRNOX Uranium Fuel Rod +item.rod_zirnox_thorium_fuel_depleted.name= Depleted ZIRNOX Thorium Fuel Rod item.rod_zirnox_mox_fuel_depleted.name=Depleted ZIRNOX MOX Fuel Rod item.rod_zirnox_plutonium_fuel_depleted.name=Depleted ZIRNOX Plutonium Fuel Rod item.rod_zirnox_u233_fuel_depleted.name=Depleted ZIRNOX Uranium-233 Fuel Rod From 1d9c4fec330706494a4d4ab05bea2b6c7746b119 Mon Sep 17 00:00:00 2001 From: Vaern Date: Thu, 23 Jun 2022 15:15:25 -0700 Subject: [PATCH 4/4] amongusamongusamongusamongusamongusamongusamongusamongusamongusamongusam --- .../com/hbm/blocks/machine/ReactorZirnox.java | 4 ++- .../machine/TileEntityReactorZirnox.java | 28 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java index 4aaaccea7..39c65cc59 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java @@ -29,7 +29,7 @@ public class ReactorZirnox extends BlockDummyable { if(meta >= 12) return new TileEntityReactorZirnox(); if(meta >= 6) - return new TileEntityProxyCombo(false, true, true); + return new TileEntityProxyCombo(true, true, true); return null; } @@ -75,6 +75,8 @@ public class ReactorZirnox extends BlockDummyable { this.makeExtra(world, x + dir.offsetX * o + rot.offsetX * 2, y + 3, z + dir.offsetZ * o + rot.offsetZ * 2); this.makeExtra(world, x + dir.offsetX * o + rot.offsetX * -2, y + 1, z + dir.offsetZ * o + rot.offsetZ * -2); this.makeExtra(world, x + dir.offsetX * o + rot.offsetX * -2, y + 3, z + dir.offsetZ * o + rot.offsetZ * -2); + //i still don't know why the ports were such an issue all those months ago + this.makeExtra(world, x + dir.offsetX * o, y + 4, z + dir.offsetZ * o); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 4fc78d35e..a36cf9736 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -98,32 +98,6 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF public boolean canExtractItem(int i, ItemStack stack, int j) { return i < 24 && !(stack.getItem() instanceof ItemZirnoxRod); } - - //fucking hate having to do this - private void loadFuel() { - TileEntity te = worldObj.getTileEntity(this.xCoord, this.yCoord + 5, this.zCoord); - - if(te instanceof IInventory) { - IInventory inv = (IInventory) te; - - for(int i = 0; i < inv.getSizeInventory(); i++) { - - ItemStack stack = inv.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemZirnoxRod) { - - for(int j = 0; j < 24; j++) { - //ZIRNOX rods cannot stack higher than 1 anyway - if(slots[j] == null) { - slots[j] = stack.copy(); - slots[j].stackSize = 1; - inv.decrStackSize(i, 1); - return; - } - } - } - } - } - } @Override public void readFromNBT(NBTTagCompound nbt) { @@ -219,8 +193,6 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF carbonDioxide.loadTank(24, 26, slots); water.loadTank(25, 27, slots); - loadFuel(); - if(isOn) { for(int i = 0; i < 24; i++) {