diff options
Diffstat (limited to 'src/main')
9 files changed, 32 insertions, 43 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index e7fc2ecf3e..ed5e1634ef 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -70,7 +70,6 @@ public class TecTech { public void PostLoad(FMLPostInitializationEvent PostEvent) { hasCOFH = Loader.isModLoaded(Reference.COFHCORE); - GTCustomLoader = new MainLoader(); GTCustomLoader.run(); } @@ -92,13 +91,13 @@ public class TecTech { for (Materials m : Materials.values()) { FluidStack p = m.getPlasma(1); if (p != null) { - if (TecTechConfig.DEBUG_MODE) TecTech.Logger.info("Found Plasma of " + m.name()); + if (TecTechConfig.DEBUG_MODE) TecTech.Logger.info("Found Plasma of " + m.mName); if (m.mElement != null && (m.mElement.mProtons >= Materials.Iron.mElement.mProtons || -m.mElement.mProtons >= Materials.Iron.mElement.mProtons || m.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons || -m.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons)) { - if (TecTechConfig.DEBUG_MODE) TecTech.Logger.info("Attempting to bind " + m.name()); + if (TecTechConfig.DEBUG_MODE) TecTech.Logger.info("Attempting to bind " + m.mName); if (m.getMolten(1) != null) binds.put(p.getFluid(), m.getMolten(1).getFluid()); else if (m.getGas(1) != null) binds.put(p.getFluid(), m.getGas(1).getFluid()); else if (m.getFluid(1) != null) binds.put(p.getFluid(), m.getFluid(1).getFluid()); diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java index 4d51920939..a9fba3854a 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java @@ -79,6 +79,11 @@ public abstract class cElementalDefinition implements iElementalDefinition { } @Override + public final cElementalDefinitionStack getStackForm(int i) { + return new cElementalDefinitionStack(this,i); + } + + @Override public final boolean equals(Object obj) { if (obj instanceof iElementalDefinition) return compareTo((iElementalDefinition) obj) == 0; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java index 0466d8d747..a2dbb7df9d 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java @@ -20,12 +20,11 @@ public final class cElementalDefinitionStackMap/*IMMUTABLE*/ extends cElementalS @Deprecated public cElementalDefinitionStackMap(iElementalDefinition... in) { - map=cElementalMutableDefinitionStackMap.stackUpMap(in).map; + map=new cElementalMutableDefinitionStackMap(in).map; } - @Deprecated public cElementalDefinitionStackMap(cElementalDefinitionStack... in) { - map=cElementalMutableDefinitionStackMap.stackUpMap(in).map; + map=new cElementalMutableDefinitionStackMap(in).map; } public cElementalDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) { diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java index d1c9c445b5..3671400174 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java @@ -21,12 +21,10 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn map = new TreeMap<>(); } - @Deprecated public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) { this(true, inSafe); } - @Deprecated public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) { map = new TreeMap<>(); if (clone) { @@ -39,6 +37,7 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn } } + @Deprecated private cElementalInstanceStackMap(TreeMap<iElementalDefinition, cElementalInstanceStack> inSafe) { this(true, inSafe); } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java index cb8ae2d57e..3b4870185e 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java @@ -21,19 +21,21 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa @Deprecated public cElementalMutableDefinitionStackMap(iElementalDefinition... in) { - map=stackUpMap(in).map; + map=new TreeMap<>(); + for (iElementalDefinition def : in) { + putUnify(new cElementalDefinitionStack(def, 1)); + } } - @Deprecated public cElementalMutableDefinitionStackMap(cElementalDefinitionStack... in) { - map=stackUpMap(in).map; + map=new TreeMap<>(); + putUnifyAll(in); } public cElementalMutableDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) { this(true, in); } - @Deprecated public cElementalMutableDefinitionStackMap(boolean clone, TreeMap<iElementalDefinition, cElementalDefinitionStack> in) { if (clone) { map = new TreeMap<>(in); @@ -219,20 +221,4 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa } return new cElementalMutableDefinitionStackMap(defStacks); } - - //stackUp - @Deprecated - public static cElementalMutableDefinitionStackMap stackUpMap(iElementalDefinition... in) { - final cElementalMutableDefinitionStackMap inTree = new cElementalMutableDefinitionStackMap(); - for (iElementalDefinition def : in) { - inTree.putUnify(new cElementalDefinitionStack(def, 1)); - } - return inTree; - } - - public static cElementalMutableDefinitionStackMap stackUpMap(cElementalDefinitionStack... in) { - final cElementalMutableDefinitionStackMap inTree = new cElementalMutableDefinitionStackMap(); - inTree.putUnifyAll(in); - return inTree; - } } 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 02f56fa3f3..d73f3730d7 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 @@ -11,7 +11,6 @@ import net.minecraftforge.fluids.FluidStack; import java.util.*; -import static com.github.technus.tectech.elementalMatter.classes.cElementalMutableDefinitionStackMap.stackUpMap; import static com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition.boson_Y__; import static com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition.deadEnd; @@ -57,20 +56,20 @@ public final class dAtomDefinition extends cElementalDefinition {//TODO Optimize @Deprecated public dAtomDefinition(iElementalDefinition... things) throws tElementalException { - this(true, stackUpMap(things).toImmutable()); + this(true, new cElementalDefinitionStackMap(things)); } @Deprecated private dAtomDefinition(boolean check, iElementalDefinition... things) throws tElementalException { - this(check, stackUpMap(things).toImmutable()); + this(check, new cElementalDefinitionStackMap(things)); } public dAtomDefinition(cElementalDefinitionStack... things) throws tElementalException { - this(true, stackUpMap(things).toImmutable()); + this(true, new cElementalDefinitionStackMap(things)); } private dAtomDefinition(boolean check, cElementalDefinitionStack... things) throws tElementalException { - this(check, stackUpMap(things).toImmutable()); + this(check, new cElementalDefinitionStackMap(things)); } public dAtomDefinition(cElementalDefinitionStackMap things) throws tElementalException { 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 92bf81688e..13c589ef6f 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 @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; -import static com.github.technus.tectech.elementalMatter.classes.cElementalMutableDefinitionStackMap.stackUpMap; import static com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition.boson_Y__; /** @@ -44,20 +43,20 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi @Deprecated public dHadronDefinition(eQuarkDefinition... quarks) throws tElementalException { - this(true, stackUpMap(quarks).toImmutable()); + this(true, new cElementalDefinitionStackMap(quarks)); } @Deprecated private dHadronDefinition(boolean check, eQuarkDefinition... quarks) throws tElementalException { - this(check, stackUpMap(quarks).toImmutable()); + this(check, new cElementalDefinitionStackMap(quarks)); } public dHadronDefinition(cElementalDefinitionStack... quarks) throws tElementalException { - this(true, stackUpMap(quarks).toImmutable()); + this(true, new cElementalDefinitionStackMap(quarks)); } private dHadronDefinition(boolean check, cElementalDefinitionStack... quarks) throws tElementalException { - this(check, stackUpMap(quarks).toImmutable()); + this(check, new cElementalDefinitionStackMap(quarks)); } public dHadronDefinition(cElementalDefinitionStackMap quarks) throws tElementalException { @@ -314,15 +313,15 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi public static void run() { try { - hadron_p = new dHadronDefinition(stackUpMap(eQuarkDefinition.quark_u, eQuarkDefinition.quark_u, eQuarkDefinition.quark_d).toImmutable()); + hadron_p = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1))); protonMass = hadron_p.mass; //redefine the proton with proper lifetime (the lifetime is based on mass comparison) - hadron_p = new dHadronDefinition(stackUpMap(eQuarkDefinition.quark_u, eQuarkDefinition.quark_u, eQuarkDefinition.quark_d).toImmutable()); + hadron_p = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1))); hadron_p_ = (dHadronDefinition) (hadron_p.getAnti()); - hadron_n = new dHadronDefinition(stackUpMap(eQuarkDefinition.quark_u, eQuarkDefinition.quark_d, eQuarkDefinition.quark_d).toImmutable()); + hadron_n = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2))); neutronMass = hadron_n.mass; //redefine the neutron with proper lifetime (the lifetime is based on mass comparison) - hadron_n = new dHadronDefinition(stackUpMap(eQuarkDefinition.quark_u, eQuarkDefinition.quark_d, eQuarkDefinition.quark_d).toImmutable()); + hadron_n = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2))); hadron_n_ = (dHadronDefinition) (hadron_n.getAnti()); } catch (tElementalException e) { if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); 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 2974cf9bfd..15c50fe880 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,6 +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 net.minecraft.nbt.NBTTagCompound; @@ -45,4 +46,6 @@ public interface iElementalDefinition extends Comparable<iElementalDefinition> { FluidStack materializesIntoFluid(); NBTTagCompound toNBT(); + + cElementalDefinitionStack getStackForm(int i); } 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 1a5a219960..6ebb415c04 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 @@ -157,7 +157,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock } private static int getID(OrePrefixes prefix, Materials material) { - return OreDictionary.getOreID(prefix.name() + material.name()); + return OreDictionary.getOreID(prefix.name() + material.mName); } public static void run() { |