Cleanup code, refactor dequantization to 3 methods.

9 files changed, 64 insertions, 71 deletions

diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java
index 1d2c2ca362..bd9da066b2 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java
@@ -4,9 +4,6 @@ import com.github.technus.tectech.elementalMatter.interfaces.iExchangeInfo;
 import com.github.technus.tectech.elementalMatter.interfaces.iHasElementalDefinition;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java
index ccad2c9429..d285fddbdc 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java
@@ -4,8 +4,6 @@ import com.github.technus.tectech.elementalMatter.interfaces.iExchangeInfo;
 import com.github.technus.tectech.elementalMatter.interfaces.iHasElementalDefinition;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java
index abc8e4a788..6545a82cbc 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java
@@ -3,16 +3,12 @@ package com.github.technus.tectech.elementalMatter.classes;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition;
-import com.github.technus.tectech.elementalMatter.interfaces.iExchangeInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;
 
 import static com.github.technus.tectech.elementalMatter.definitions.cPrimitiveDefinition.null__;
 
@@ -127,12 +123,17 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
     }
 
     @Override
-    public iExchangeInfo someAmountIntoFluidStack() {
+    public aFluidDequantizationInfo someAmountIntoFluidStack() {
         return null;
     }
 
     @Override
-    public iExchangeInfo someAmountIntoItemsStack() {
+    public aItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public aOredictDequantizationInfo someAmountIntoOredictStack() {
         return null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
index 3c15107516..38c7eefacf 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
@@ -4,14 +4,10 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.elementalMatter.classes.*;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition;
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.*;
@@ -50,8 +46,6 @@ public final class dAtomDefinition extends cElementalDefinition {
     public final byte decayMode;//t neutron to proton+,0,f proton to neutron
     public final boolean stable;
 
-    //private final FluidStack fluidThing;
-    //private final ItemStack itemThing;
     public final int isotope;
     public final int element;
 
@@ -59,9 +53,6 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     //stable is rawLifeTime>=10^9
 
-    //private final FluidStack fluidThing;
-    //private final ItemStack itemThing;
-
     @Deprecated
     public dAtomDefinition(iElementalDefinition... things) throws tElementalException {
         this(true, new cElementalDefinitionStackMap(things));
@@ -449,7 +440,12 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     @Override
-    public aOredictDequantizationInfo someAmountIntoItemsStack() {
+    public aItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public aOredictDequantizationInfo someAmountIntoOredictStack() {
         return transformation.oredictDequantization.get(this);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
index cc9579568c..59119f851d 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
@@ -4,14 +4,9 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.elementalMatter.classes.*;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition;
-import com.github.technus.tectech.elementalMatter.interfaces.iExchangeInfo;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.TreeMap;
 
 import static com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition.boson_Y__;
 
@@ -276,12 +271,17 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     //}
 
     @Override
-    public iExchangeInfo someAmountIntoItemsStack() {
+    public aFluidDequantizationInfo someAmountIntoFluidStack() {
         return null;
     }
 
     @Override
-    public iExchangeInfo someAmountIntoFluidStack() {
+    public aItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public aOredictDequantizationInfo someAmountIntoOredictStack() {
         return null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iElementalDefinition.java
index e90b6d2ae6..9a88e65f0c 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iElementalDefinition.java
@@ -1,11 +1,7 @@
 package com.github.technus.tectech.elementalMatter.interfaces;
 
-import com.github.technus.tectech.elementalMatter.classes.cElementalDecay;
-import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack;
-import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStackMap;
-import net.minecraft.item.ItemStack;
+import com.github.technus.tectech.elementalMatter.classes.*;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
 
 /**
  * Created by danie_000 on 11.11.2016.
@@ -41,9 +37,11 @@ public interface iElementalDefinition extends Comparable<iElementalDefinition>,C
 
     cElementalDefinitionStackMap getSubParticles();//contents... null if none
 
-    iExchangeInfo someAmountIntoItemsStack();
+    aFluidDequantizationInfo someAmountIntoFluidStack();
 
-    iExchangeInfo someAmountIntoFluidStack();
+    aItemDequantizationInfo someAmountIntoItemsStack();
+
+    aOredictDequantizationInfo someAmountIntoOredictStack();
 
     NBTTagCompound toNBT();
 
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
index 5af32b977b..3ca018928a 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
@@ -5,10 +5,7 @@ import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.elementalMatter.classes.*;
 import com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition;
-import com.github.technus.tectech.elementalMatter.interfaces.iExchangeInfo;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
 
 import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay;
 import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectDefinitionCompat;
@@ -167,12 +164,17 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
     }
 
     @Override
-    public iExchangeInfo someAmountIntoFluidStack() {
+    public aFluidDequantizationInfo someAmountIntoFluidStack() {
         return null;
     }
 
     @Override
-    public iExchangeInfo someAmountIntoItemsStack() {
+    public aItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public aOredictDequantizationInfo someAmountIntoOredictStack() {
         return null;
     }
 
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 fe25a100a2..4814ba3cde 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
@@ -1,7 +1,9 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.CommonValues;
-import com.github.technus.tectech.elementalMatter.classes.*;
+import com.github.technus.tectech.elementalMatter.classes.aOredictDequantizationInfo;
+import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack;
+import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap;
 import com.github.technus.tectech.elementalMatter.interfaces.iExchangeInfo;
 import com.github.technus.tectech.elementalMatter.interfaces.iHasElementalDefinition;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -10,7 +12,6 @@ import com.github.technus.tectech.thing.metaTileEntity.iConstructible;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
@@ -64,7 +65,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public void construct(int qty) {
-        StructureBuilder(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity());
+        StructureBuilder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity());
     }
 
     @Override
@@ -73,32 +74,31 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
             cElementalInstanceStackMap map = in.getContainerHandler();
             for (cElementalInstanceStack stack : map.values()) {
                 iExchangeInfo info = stack.getDefinition().someAmountIntoFluidStack();
-                if (info instanceof aFluidDequantizationInfo) {
-                    if(map.removeAllAmounts(false,(iHasElementalDefinition) info.input())){
-                        mOutputFluids=new FluidStack[]{(FluidStack) info.output()};
-                        startRecipe((iHasElementalDefinition)info.input());
+                if (info != null) {
+                    if (map.removeAllAmounts(false, (iHasElementalDefinition) info.input())) {
+                        mOutputFluids = new FluidStack[]{(FluidStack) info.output()};
+                        startRecipe((iHasElementalDefinition) info.input());
                         return true;
                     }
-                } else {
-                    info = stack.getDefinition().someAmountIntoItemsStack();
-                    if (info != null) {
-                        if (info instanceof aItemDequantizationInfo) {
-                            if(map.removeAllAmounts(false,(iHasElementalDefinition) info.input())){
-                                mOutputItems=new ItemStack[]{(ItemStack) info.output()};
-                                startRecipe((iHasElementalDefinition)info.input());
-                                return true;
-                            }
-                        } else if (info instanceof aOredictDequantizationInfo) {
-                            if(map.removeAllAmounts(false,(iHasElementalDefinition) info.input())){
-                                ArrayList<ItemStack> items=OreDictionary.getOres(((aOredictDequantizationInfo) info).out);
-                                if(items!=null && items.size()>0) {
-                                    mOutputItems = new ItemStack[]{
-                                        items.get(0)
-                                    };
-                                    startRecipe((iHasElementalDefinition) info.input());
-                                    return true;
-                                }
-                            }
+                }
+
+                info = stack.getDefinition().someAmountIntoItemsStack();
+                if (info != null) {
+                    if (map.removeAllAmounts(false, (iHasElementalDefinition) info.input())) {
+                        mOutputItems = new ItemStack[]{(ItemStack) info.output()};
+                        startRecipe((iHasElementalDefinition) info.input());
+                        return true;
+                    }
+                }
+
+                info = stack.getDefinition().someAmountIntoOredictStack();
+                if (info != null) {
+                    if (map.removeAllAmounts(false, (iHasElementalDefinition) info.input())) {
+                        ArrayList<ItemStack> items = OreDictionary.getOres(((aOredictDequantizationInfo) info).out);
+                        if (items != null && items.size() > 0) {
+                            mOutputItems = new ItemStack[]{items.get(0)};
+                            startRecipe((iHasElementalDefinition) info.input());
+                            return true;
                         }
                     }
                 }
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         float mass = from.getMass();
         float euMult = mass / refMass;
         eAmpereFlow = (int) Math.ceil(euMult);
-        if (mass > refUnstableMass || from.getDefinition().getRawLifeTime()<1.5e25f) {
+        if (mass > refUnstableMass || from.getDefinition().getRawLifeTime() < 1.5e25f) {
             mEUt = (int) -V[10];
         } else {
             mEUt = (int) -V[8];
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 529064a22f..09ed83fa5e 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
@@ -18,7 +18,8 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import static com.github.technus.tectech.Util.StructureBuilder;
 import static com.github.technus.tectech.Util.isInputEqual;
-import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.*;
+import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refMass;
+import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
 import static gregtech.api.enums.GT_Values.V;
 
@@ -137,7 +138,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         float mass = into.getMass();
         float euMult = mass / refMass;
         eAmpereFlow = (int) Math.ceil(euMult);
-        if (mass > refUnstableMass || into.getDefinition().getRawLifeTime()<1.5e25f) {
+        if (mass > refUnstableMass || into.getDefinition().getRawLifeTime() < 1.5e25f) {
             mEUt = (int) -V[10];
         } else {
             mEUt = (int) -V[8];
@@ -156,6 +157,6 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             return;
         }
         eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]);
-        outputEM=null;
+        outputEM = null;
     }
 }