Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Calcinator now accepts automated inputs. Closes #732 #922 #1042

Browse source
This commit is contained in:
Pahimar 2016-05-18 16:33:04 -04:00
parent 12bd8c6538
commit abeccf88b9
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -112,14 +112,14 @@ public class EquivalentExchange3
} }
@EventHandler @EventHandler
public void postInit(FMLPostInitializationEvent event) public void postInit(FMLPostInitializationEvent event) {
{
Abilities.init(); Abilities.init();
} }
@EventHandler @EventHandler
public void onServerStopping(FMLServerStoppingEvent event) public void onServerStopping(FMLServerStoppingEvent event) {
{
WorldEventHandler.hasInitilialized = false; WorldEventHandler.hasInitilialized = false;
EnergyValueRegistry.INSTANCE.save(); EnergyValueRegistry.INSTANCE.save();
TransmutationKnowledgeRegistry.getInstance().clear(); TransmutationKnowledgeRegistry.getInstance().clear();

19
src/main/java/com/pahimar/ee3/tileentity/TileEntityCalcinator.java
View file

@ -52,12 +52,12 @@ public class TileEntityCalcinator extends TileEntityEE implements ISidedInventor
@Override @Override
public int[] getAccessibleSlotsFromSide(int side) 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 @Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) {
{
return isItemValidForSlot(slotIndex, itemStack); return isItemValidForSlot(slotIndex, itemStack);
} }
@ -185,8 +185,17 @@ public class TileEntityCalcinator extends TileEntityEE implements ISidedInventor
} }
@Override @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; return false;
} }