diff options
20 files changed, 65 insertions, 75 deletions
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java index 40bf975a17..9fad16c46a 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.elementalMatter.core; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalDefinitionStack; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java index 49823d4088..0873c50e14 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.elementalMatter.core; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalDefinitionStack; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/iElementalInstanceContainer.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/iElementalInstanceContainer.java index 448328cb30..74d371272b 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/iElementalInstanceContainer.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/iElementalInstanceContainer.java @@ -1,6 +1,4 @@ -package com.github.technus.tectech.elementalMatter.core.interfaces; - -import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; +package com.github.technus.tectech.elementalMatter.core; /** * Created by danie_000 on 25.01.2017. diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java index 8a119e356c..3928d940b4 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.elementalMatter.core.stacks; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.templates.cElementalDefinition; import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java index 25782b234d..525843f24c 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java @@ -5,7 +5,6 @@ import com.github.technus.tectech.Util; import com.github.technus.tectech.elementalMatter.core.cElementalDecay; import com.github.technus.tectech.elementalMatter.core.cElementalDefinitionStackMap; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.templates.cElementalDefinition; import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/iHasElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/iHasElementalDefinition.java index 2659898d62..68ca71f33c 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/iHasElementalDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/iHasElementalDefinition.java @@ -1,4 +1,4 @@ -package com.github.technus.tectech.elementalMatter.core.interfaces; +package com.github.technus.tectech.elementalMatter.core.stacks; import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalDefinition.java index 9eb682f4b8..4906bd65f9 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalDefinition.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.templates; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalDefinitionStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidDequantizationInfo.java index 6da5ffe114..6f66830f83 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidDequantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidDequantizationInfo.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.transformations; -import com.github.technus.tectech.elementalMatter.core.interfaces.iExchangeInfo; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidQuantizationInfo.java index 0848c7b9f9..714b991c55 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidQuantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidQuantizationInfo.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.transformations; -import com.github.technus.tectech.elementalMatter.core.interfaces.iExchangeInfo; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemDequantizationInfo.java index c04f180215..d7ab4cc9f7 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemDequantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemDequantizationInfo.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.transformations; -import com.github.technus.tectech.elementalMatter.core.interfaces.iExchangeInfo; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemQuantizationInfo.java index ce652e9d6d..ebb75f8d16 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemQuantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemQuantizationInfo.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.transformations; -import com.github.technus.tectech.elementalMatter.core.interfaces.iExchangeInfo; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictDequantizationInfo.java index e19ac74d63..0d0e75e5af 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictDequantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictDequantizationInfo.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.transformations; -import com.github.technus.tectech.elementalMatter.core.interfaces.iExchangeInfo; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictQuantizationInfo.java index 9edaa93d98..3d9a873520 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictQuantizationInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictQuantizationInfo.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.transformations; -import com.github.technus.tectech.elementalMatter.core.interfaces.iExchangeInfo; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/bTransformationInfo.java index e51142c841..e81809607e 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/bTransformationInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/bTransformationInfo.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.elementalMatter.core.transformations; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/iExchangeInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/iExchangeInfo.java index cfae8a20a1..17c4570ee1 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/iExchangeInfo.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/iExchangeInfo.java @@ -1,4 +1,4 @@ -package com.github.technus.tectech.elementalMatter.core.interfaces; +package com.github.technus.tectech.elementalMatter.core.transformations; /** * Created by Tec on 23.05.2017. diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java index 89362c9469..aab5d7c6b1 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java @@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.Util; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; -import com.github.technus.tectech.elementalMatter.core.interfaces.iElementalInstanceContainer; +import com.github.technus.tectech.elementalMatter.core.iElementalInstanceContainer; import com.github.technus.tectech.elementalMatter.core.tElementalException; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index a469872047..7faa067177 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; -import com.github.technus.tectech.elementalMatter.core.interfaces.iElementalInstanceContainer; +import com.github.technus.tectech.elementalMatter.core.iElementalInstanceContainer; import com.github.technus.tectech.elementalMatter.core.tElementalException; import com.github.technus.tectech.thing.metaTileEntity.pipe.iConnectsToEMpipe; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java index 6b4c6cb3ec..4494316391 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java @@ -36,7 +36,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { private static Textures.BlockIcons.CustomIcon EM_R_ACTIVE; public int heat = 0; private float overClock = 1, overVolt = 1; - private static Map<String, component> componentBinds = new HashMap<>(); + private static Map<String, rackComponent> componentBinds = new HashMap<>(); public GT_MetaTileEntity_Hatch_Rack(int aID, String aName, String aNameRegional, int aTier, String descr) { super(aID, aName, aNameRegional, aTier, 4, descr); @@ -143,7 +143,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { float computation = 0, heat = 0; for (int i = 0; i < mInventory.length; i++) { if (mInventory[i] == null || mInventory[i].stackSize != 1) continue; - component comp = componentBinds.get(getUniqueIdentifier(mInventory[i])); + rackComponent comp = componentBinds.get(getUniqueIdentifier(mInventory[i])); if (comp == null) continue; if (tickingComponents) { if (this.heat > comp.maxHeat) { @@ -185,7 +185,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { float heatC = 0; for (int i = 0; i < mInventory.length; i++) { if (mInventory[i] == null || mInventory[i].stackSize != 1) continue; - component comp = componentBinds.get(getUniqueIdentifier(mInventory[i])); + rackComponent comp = componentBinds.get(getUniqueIdentifier(mInventory[i])); if (comp == null) continue; if (this.heat > comp.maxHeat) { mInventory[i] = null; @@ -243,63 +243,63 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { } public static void run() {//20k heat cap max! - new component(ItemList.Circuit_Primitive.get(1), 1, 4, 0, 500, true); - new component(ItemList.Circuit_Basic.get(1), 4, 8, 0, 1000, true); - new component(ItemList.Circuit_Good.get(1), 6, 9, -.05f, 1500, true); - new component(ItemList.Circuit_Parts_Advanced.get(1), 1, 2, -.05f, 2000, true); - new component(ItemList.Circuit_Advanced.get(1), 8, 10, -.1f, 2500, true); - new component(ItemList.Circuit_Data.get(1), 1, 1, -.1f, 3000, true); - new component(ItemList.Circuit_Master.get(1), 12, 10, -.2F, 5000, true); - new component(ItemList.Circuit_Elite.get(1), 16, 12, -.15F, 3500, true); - - new component("IC2:ic2.reactorVent", 0, -1, 10f, 1000, false); - new component("IC2:ic2.reactorVentCore", 0, -1, 20f, 2500, false); - new component("IC2:ic2.reactorVentGold", 0, -1, 40f, 5000, false); - new component("IC2:ic2.reactorVentDiamond", 0, -1, 80f, 10000, false);//2x oc + new rackComponent(ItemList.Circuit_Primitive.get(1), 1, 4, 0, 500, true); + new rackComponent(ItemList.Circuit_Basic.get(1), 4, 8, 0, 1000, true); + new rackComponent(ItemList.Circuit_Good.get(1), 6, 9, -.05f, 1500, true); + new rackComponent(ItemList.Circuit_Parts_Advanced.get(1), 1, 2, -.05f, 2000, true); + new rackComponent(ItemList.Circuit_Advanced.get(1), 8, 10, -.1f, 2500, true); + new rackComponent(ItemList.Circuit_Data.get(1), 1, 1, -.1f, 3000, true); + new rackComponent(ItemList.Circuit_Master.get(1), 12, 10, -.2F, 5000, true); + new rackComponent(ItemList.Circuit_Elite.get(1), 16, 12, -.15F, 3500, true); + + new rackComponent("IC2:ic2.reactorVent", 0, -1, 10f, 1000, false); + new rackComponent("IC2:ic2.reactorVentCore", 0, -1, 20f, 2500, false); + new rackComponent("IC2:ic2.reactorVentGold", 0, -1, 40f, 5000, false); + new rackComponent("IC2:ic2.reactorVentDiamond", 0, -1, 80f, 10000, false);//2x oc if (Loader.isModLoaded("dreamcraft")) { - new component("dreamcraft:item.HighEnergyCircuitParts", 3, 2, -.1f, 9001, true); - new component("dreamcraft:item.HighEnergyFlowCircuit", 24, 16, -.25f, 10000, true); - new component("dreamcraft:item.NanoCircuit", 32, 20, -.15f, 8000, true); - new component("dreamcraft:item.PikoCircuit", 64, 32, -.2f, 8500, true); - new component("dreamcraft:item.QuantumCircuit", 128, 48, -.3f, 9000, true); + new rackComponent("dreamcraft:item.HighEnergyCircuitParts", 3, 2, -.1f, 9001, true); + new rackComponent("dreamcraft:item.HighEnergyFlowCircuit", 24, 16, -.25f, 10000, true); + new rackComponent("dreamcraft:item.NanoCircuit", 32, 20, -.15f, 8000, true); + new rackComponent("dreamcraft:item.PikoCircuit", 64, 32, -.2f, 8500, true); + new rackComponent("dreamcraft:item.QuantumCircuit", 128, 48, -.3f, 9000, true); } if (Loader.isModLoaded("OpenComputers")) { - new component("OpenComputers:item.23", 0, 1, 0f, 100, true);//Transistor - new component("OpenComputers:item.24", 7, 12, -.05f, 1500, true);//chip t1 - new component("OpenComputers:item.25", 18, 20, -.1f, 3000, true);//chip t2 - new component("OpenComputers:item.26", 25, 22, -.15f, 4500, true);//chip t3 - new component("OpenComputers:item.27", 10, 15, -.05f, 3000, true);//alu - new component("OpenComputers:item.28", 25, 18, -.05f, 1500, true);//cu - - new component("OpenComputers:item.70", 42, 30, -.05f, 1500, true);//bus t1 - new component("OpenComputers:item.71", 70, 50, -.1f, 3000, true);//bus t2 - new component("OpenComputers:item.72", 105, 72, -.15f, 4500, true);//bus t3 - - new component("OpenComputers:item.29", 106, 73, -.1f, 1500, true);//cpu t1 - new component("OpenComputers:item.42", 226, 153, -.15f, 3000, true);//cpu t2 - new component("OpenComputers:item.43", 374, 241, -.2f, 4500, true);//cpu t3 - - new component("OpenComputers:item.8", 20, 27, -.1f, 1500, true);//gpu t1 - new component("OpenComputers:item.9", 62, 67, -.2f, 3000, true);//gpu t2 - new component("OpenComputers:item.10", 130, 111, -.3f, 4500, true);//gpu t3 - - new component("OpenComputers:item.101", 350, 234, -.1f, 1500, true);//apu t1 - new component("OpenComputers:item.102", 606, 398, -.2f, 4500, true);//apu t2 - new component("OpenComputers:item.103", 1590, 1006, -.3f, 9000, true);//apu tC + new rackComponent("OpenComputers:item.23", 0, 1, 0f, 100, true);//Transistor + new rackComponent("OpenComputers:item.24", 7, 12, -.05f, 1500, true);//chip t1 + new rackComponent("OpenComputers:item.25", 18, 20, -.1f, 3000, true);//chip t2 + new rackComponent("OpenComputers:item.26", 25, 22, -.15f, 4500, true);//chip t3 + new rackComponent("OpenComputers:item.27", 10, 15, -.05f, 3000, true);//alu + new rackComponent("OpenComputers:item.28", 25, 18, -.05f, 1500, true);//cu + + new rackComponent("OpenComputers:item.70", 42, 30, -.05f, 1500, true);//bus t1 + new rackComponent("OpenComputers:item.71", 70, 50, -.1f, 3000, true);//bus t2 + new rackComponent("OpenComputers:item.72", 105, 72, -.15f, 4500, true);//bus t3 + + new rackComponent("OpenComputers:item.29", 106, 73, -.1f, 1500, true);//cpu t1 + new rackComponent("OpenComputers:item.42", 226, 153, -.15f, 3000, true);//cpu t2 + new rackComponent("OpenComputers:item.43", 374, 241, -.2f, 4500, true);//cpu t3 + + new rackComponent("OpenComputers:item.8", 20, 27, -.1f, 1500, true);//gpu t1 + new rackComponent("OpenComputers:item.9", 62, 67, -.2f, 3000, true);//gpu t2 + new rackComponent("OpenComputers:item.10", 130, 111, -.3f, 4500, true);//gpu t3 + + new rackComponent("OpenComputers:item.101", 350, 234, -.1f, 1500, true);//apu t1 + new rackComponent("OpenComputers:item.102", 606, 398, -.2f, 4500, true);//apu t2 + new rackComponent("OpenComputers:item.103", 1590, 1006, -.3f, 9000, true);//apu tC } } - public static class component implements Comparable<component> { + public static class rackComponent implements Comparable<rackComponent> { private final String unlocalizedName; private final float heat, coEff, computation, maxHeat; private final boolean subZero; - component(ItemStack is, float computation, float heat, float coEff, float maxHeat, boolean subZero) { + rackComponent(ItemStack is, float computation, float heat, float coEff, float maxHeat, boolean subZero) { this(getUniqueIdentifier(is), computation, heat, coEff, maxHeat, subZero); } - component(String is, float computation, float heat, float coEff, float maxHeat, boolean subZero) { + rackComponent(String is, float computation, float heat, float coEff, float maxHeat, boolean subZero) { unlocalizedName = is; this.heat = heat; this.coEff = coEff; @@ -312,7 +312,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { } @Override - public int compareTo(component o) { + public int compareTo(rackComponent o) { return unlocalizedName.compareTo(o.unlocalizedName); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java index 8afa9b099c..a94f092cf0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java @@ -2,8 +2,8 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; -import com.github.technus.tectech.elementalMatter.core.interfaces.iExchangeInfo; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.transformations.iExchangeInfo; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.core.transformations.aOredictDequantizationInfo; import com.github.technus.tectech.thing.block.QuantumGlassBlock; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index a5fe6d11c3..7357a141f1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; -import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; +import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.core.transformations.aFluidQuantizationInfo; import com.github.technus.tectech.elementalMatter.core.transformations.aItemQuantizationInfo; |