From bee5c6d0eac5ae04e4d40ee2c12fe295ad2c02ae Mon Sep 17 00:00:00 2001 From: Vaern Date: Thu, 30 Dec 2021 13:39:27 -0800 Subject: [PATCH] merge attempt --- .../TileEntityMachineReactorSmall.java | 2 +- .../machine/TileEntityWasteDrum.java | 40 +++++-------------- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index d6d816b1b..384304a64 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -36,7 +36,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; //TODO: Fix all unneeded methods; fix reactor control; Add seven digit displays for total flux + heat; revamp gui; revamp breeder to rely on reactor and use total flux calcs; -public class TileEntityMachineReactorSmall extends TileEntityMachineBase implements ISidedInventory { +public class TileEntityMachineReactorSmall extends TileEntityMachineBase { public int heat; public final int maxHeat = 50000; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java index bf0b1a538..671a35436 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java @@ -1,15 +1,12 @@ package com.hbm.tileentity.machine; -import java.util.HashMap; - import com.hbm.inventory.RecipesCommon.ComparableStack; -import com.hbm.items.ModItems; +import com.hbm.inventory.recipes.FuelPoolRecipes; import com.hbm.items.machine.ItemRBMKRod; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -24,24 +21,6 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { private String customName; - private static final HashMap wasteMap = new HashMap(); - static { - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_natural_uranium, 1, 1)), new ItemStack(ModItems.waste_natural_uranium)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_uranium, 1, 1)), new ItemStack(ModItems.waste_uranium)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_thorium, 1, 1)), new ItemStack(ModItems.waste_thorium)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_mox, 1, 1)), new ItemStack(ModItems.waste_mox)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_plutonium, 1, 1)), new ItemStack(ModItems.waste_plutonium)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_u233, 1, 1)), new ItemStack(ModItems.waste_u233)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_u235, 1, 1)), new ItemStack(ModItems.waste_u235)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_schrabidium, 1, 1)), new ItemStack(ModItems.waste_schrabidium)); - - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_plate_u233, 1, 1)), new ItemStack(ModItems.waste_plate_u233)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_plate_u235, 1, 1)), new ItemStack(ModItems.waste_plate_u235)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_plate_mox, 1, 1)), new ItemStack(ModItems.waste_plate_mox)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_plate_pu239, 1, 1)), new ItemStack(ModItems.waste_plate_pu239)); - wasteMap.put(new ComparableStack(new ItemStack(ModItems.waste_plate_sa326, 1, 1)), new ItemStack(ModItems.waste_plate_sa326)); - } - public TileEntityWasteDrum() { slots = new ItemStack[12]; } @@ -114,7 +93,7 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { @Override public boolean isItemValidForSlot(int i, ItemStack itemStack) { - return wasteMap.keySet().contains(new ComparableStack(itemStack)) || itemStack.getItem() instanceof ItemRBMKRod; + return FuelPoolRecipes.recipes.keySet().contains(new ComparableStack(itemStack)) || itemStack.getItem() instanceof ItemRBMKRod; } @Override @@ -177,10 +156,9 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { } @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) - { - return slots_arr; - } + public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + return slots_arr; + } @Override public boolean canInsertItem(int i, ItemStack itemStack, int j) { @@ -192,7 +170,7 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { if(itemStack.getItem() instanceof ItemRBMKRod) { return ItemRBMKRod.getCoreHeat(itemStack) < 50 && ItemRBMKRod.getHullHeat(itemStack) < 50; } else { - return wasteMap.containsValue(getStackInSlot(i)); + return !FuelPoolRecipes.recipes.containsKey(getStackInSlot(i)); } } @@ -226,8 +204,8 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { } else if(worldObj.rand.nextInt(r) == 0) { ComparableStack comp = new ComparableStack(getStackInSlot(i)); - if(wasteMap.keySet().contains(comp)) { - slots[i] = wasteMap.get(comp).copy(); + if(FuelPoolRecipes.recipes.containsKey(comp)) { + slots[i] = FuelPoolRecipes.recipes.get(comp).copy(); } } } @@ -235,4 +213,4 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { } } } -} +} \ No newline at end of file