xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge attempt

Browse Source
This commit is contained in:
Vaern 2021-12-30 13:39:27 -08:00
parent e40ea77e3b
commit bee5c6d0ea
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
View File

@ -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;

40
src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java
View File

@ -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<ComparableStack, ItemStack> wasteMap = new HashMap<ComparableStack, ItemStack>();
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 {
}
}
}
}
}