diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index c2636a4d1..05fb9afdf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -91,7 +91,8 @@ public abstract class TileEntityAdvancedElectricMachine sideData = new HashMap(); - public int[] trackers; + public Map trackers = new HashMap(); - public TileComponentEjector(TileEntityContainerBlock tile, SideData data) + public TileComponentEjector(TileEntityContainerBlock tile) { tileEntity = tile; - sideData = data; - trackers = new int[sideData.availableSlots.length]; tile.components.add(this); } + public TileComponentEjector setOutputData(TransmissionType type, SideData data) + { + sideData.put(type, data); + trackers.put(type, new int[data.availableSlots.length]); + + return this; + } + public void readFrom(TileComponentEjector ejector) { strictInput = ejector.strictInput; @@ -56,14 +64,13 @@ public class TileComponentEjector implements ITileComponent, IEjector inputColors = ejector.inputColors; tickDelay = ejector.tickDelay; sideData = ejector.sideData; - trackers = ejector.trackers; } - private List getTrackedOutputs(int index, List dirs) + private List getTrackedOutputs(TransmissionType type, int index, List dirs) { List sides = new ArrayList(); - for(int i = trackers[index]+1; i <= trackers[index]+6; i++) + for(int i = trackers.get(type)[index]+1; i <= trackers.get(type)[index]+6; i++) { for(ForgeDirection side : dirs) { @@ -109,9 +116,9 @@ public class TileComponentEjector implements ITileComponent, IEjector } } - for(int index = 0; index < sideData.availableSlots.length; index++) + for(int index = 0; index < sideData.get(TransmissionType.ITEM).availableSlots.length; index++) { - int slotID = sideData.availableSlots[index]; + int slotID = sideData.get(TransmissionType.ITEM).availableSlots[index]; if(tileEntity.inventory[slotID] == null) { @@ -119,7 +126,7 @@ public class TileComponentEjector implements ITileComponent, IEjector } ItemStack stack = tileEntity.inventory[slotID]; - List outputs = getTrackedOutputs(index, outputSides); + List outputs = getTrackedOutputs(TransmissionType.ITEM, index, outputSides); for(ForgeDirection side : outputs) { @@ -142,7 +149,7 @@ public class TileComponentEjector implements ITileComponent, IEjector if(stack == null || prev.stackSize != stack.stackSize) { - trackers[index] = side.ordinal(); + trackers.get(TransmissionType.ITEM)[index] = side.ordinal(); } if(stack == null) @@ -207,9 +214,12 @@ public class TileComponentEjector implements ITileComponent, IEjector outputColor = TransporterUtils.colors.get(nbtTags.getInteger("ejectColor")); } - for(int i = 0; i < sideData.availableSlots.length; i++) + for(TransmissionType type : sideData.keySet()) { - trackers[i] = nbtTags.getInteger("tracker" + i); + for(int i = 0; i < sideData.get(type).availableSlots.length; i++) + { + trackers.get(type)[i] = nbtTags.getInteger("tracker" + type.getTransmission() + i); + } } for(int i = 0; i < 6; i++) @@ -268,9 +278,12 @@ public class TileComponentEjector implements ITileComponent, IEjector nbtTags.setInteger("ejectColor", TransporterUtils.colors.indexOf(outputColor)); } - for(int i = 0; i < sideData.availableSlots.length; i++) + for(TransmissionType type : sideData.keySet()) { - nbtTags.setInteger("tracker" + i, trackers[i]); + for(int i = 0; i < sideData.get(type).availableSlots.length; i++) + { + nbtTags.setInteger("tracker" + type.getTransmission() + i, trackers.get(type)[i]); + } } for(int i = 0; i < 6; i++) diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index f123b06b1..781cce685 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -8,6 +8,7 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; +import mekanism.api.infuse.InfuseRegistry; import mekanism.common.FuelHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -30,7 +31,6 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -102,7 +102,7 @@ public class MekanismGenerators implements IModule for(ItemStack ore : OreDictionary.getOres("dustGold")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 4), GeneratorsItems.Hohlraum.getEmptyItem()); + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, MekanismUtils.size(ore, 4), GeneratorsItems.Hohlraum.getEmptyItem()); } }