diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java index 7e4360d3..3d88edd0 100644 --- a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java +++ b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java @@ -112,14 +112,14 @@ public class EquivalentExchange3 } @EventHandler - public void postInit(FMLPostInitializationEvent event) - { + public void postInit(FMLPostInitializationEvent event) { + Abilities.init(); } @EventHandler - public void onServerStopping(FMLServerStoppingEvent event) - { + public void onServerStopping(FMLServerStoppingEvent event) { + WorldEventHandler.hasInitilialized = false; EnergyValueRegistry.INSTANCE.save(); TransmutationKnowledgeRegistry.getInstance().clear(); diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileEntityCalcinator.java b/src/main/java/com/pahimar/ee3/tileentity/TileEntityCalcinator.java index e5252056..f72d3337 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileEntityCalcinator.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileEntityCalcinator.java @@ -52,12 +52,12 @@ public class TileEntityCalcinator extends TileEntityEE implements ISidedInventor @Override public int[] getAccessibleSlotsFromSide(int side) { - return side == ForgeDirection.DOWN.ordinal() ? new int[]{FUEL_INVENTORY_INDEX, OUTPUT_LEFT_INVENTORY_INDEX, OUTPUT_RIGHT_INVENTORY_INDEX} : new int[]{INPUT_INVENTORY_INDEX, OUTPUT_LEFT_INVENTORY_INDEX, OUTPUT_RIGHT_INVENTORY_INDEX}; + return side == ForgeDirection.DOWN.ordinal() ? new int[]{FUEL_INVENTORY_INDEX, OUTPUT_LEFT_INVENTORY_INDEX, OUTPUT_RIGHT_INVENTORY_INDEX} : new int[]{FUEL_INVENTORY_INDEX, INPUT_INVENTORY_INDEX, OUTPUT_LEFT_INVENTORY_INDEX, OUTPUT_RIGHT_INVENTORY_INDEX}; } @Override - public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) - { + public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { + return isItemValidForSlot(slotIndex, itemStack); } @@ -185,8 +185,17 @@ public class TileEntityCalcinator extends TileEntityEE implements ISidedInventor } @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) - { + public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { + + if (itemStack != null) { + if (slotIndex == FUEL_INVENTORY_INDEX) { + return TileEntityFurnace.isItemFuel(itemStack); + } + else if (slotIndex == INPUT_INVENTORY_INDEX) { + return true; + } + } + return false; }