diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 12:58:47 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-03-04 12:58:47 +1000 |
commit | ae21012d216df71f31aed6fbc9d76215fc24ceed (patch) | |
tree | cc89accbe6ce5c04b72ed3c5e46b2a185f88be6a /src/Java/gtPlusPlus/core/material/Material.java | |
parent | ba89972a22a316030f8c3bd99974f915b1d7aefc (diff) | |
download | GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.gz GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.bz2 GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.zip |
+ New texture for the slow builders ring.
+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/Material.java')
-rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 322 |
1 files changed, 165 insertions, 157 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index fe7370e777..581c5f4972 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -1,6 +1,9 @@ package gtPlusPlus.core.material; import static gregtech.api.enums.GT_Values.M; + +import java.util.ArrayList; + import gregtech.api.enums.*; import gtPlusPlus.core.item.base.cell.BaseItemCell; import gtPlusPlus.core.material.state.MaterialState; @@ -9,9 +12,6 @@ import gtPlusPlus.core.util.fluid.FluidUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.materials.MaterialUtils; import gtPlusPlus.core.util.math.MathUtils; - -import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class Material { private final String unlocalizedName; private final String localizedName; - + private final MaterialState materialState; private final Fluid vMoltenFluid; @@ -30,7 +30,7 @@ public class Material { protected Object dataVar = MathUtils.generateSingularRandomHexValue(); - private ArrayList<MaterialStack> vMaterialInput = new ArrayList<MaterialStack>(); + private ArrayList<MaterialStack> vMaterialInput = new ArrayList<>(); public final long[] vSmallestRatio; public final short vComponentCount; @@ -57,23 +57,23 @@ public class Material { public final int vToolQuality; public final int vHarvestLevel; - public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){ + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, inputs); } - public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, MaterialStack... inputs){ + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", radiationLevel, inputs); } - public Material(final String materialName, MaterialState defaultState,final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, MaterialStack... inputs){ + public Material(final String materialName, final MaterialState defaultState,final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs){ this(materialName, defaultState, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", radiationLevel, inputs); } - public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, inputs); } - public Material(final String materialName, MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ + public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this.unlocalizedName = Utils.sanitizeString(materialName); this.localizedName = materialName; @@ -86,30 +86,30 @@ public class Material { else { this.boilingPointC = meltingPoint*4; } - this.meltingPointK = (int) MathUtils.celsiusToKelvin(meltingPointC); - this.boilingPointK = (int) MathUtils.celsiusToKelvin(boilingPointC); + this.meltingPointK = (int) MathUtils.celsiusToKelvin(this.meltingPointC); + this.boilingPointK = (int) MathUtils.celsiusToKelvin(this.boilingPointC); this.vProtons = protons; this.vNeutrons = neutrons; - this.vMass = getMass(); + this.vMass = this.getMass(); //Sets tool Durability - if (durability != 0){ + if (durability != 0){ this.vDurability = durability; } else { if (inputs != null){ long durabilityTemp = 0; int counterTemp = 0; - for (MaterialStack m : inputs){ + for (final MaterialStack m : inputs){ if (m.getStackMaterial() != null){ if (m.getStackMaterial().vDurability != 0){ durabilityTemp = (durabilityTemp+m.getStackMaterial().vDurability); counterTemp++; } - } + } } - if (durabilityTemp != 0 && counterTemp != 0){ + if ((durabilityTemp != 0) && (counterTemp != 0)){ this.vDurability = (durabilityTemp/counterTemp); } else { @@ -121,23 +121,23 @@ public class Material { } } - if (this.vDurability >= 0 && this.vDurability < 64000){ + if ((this.vDurability >= 0) && (this.vDurability < 64000)){ this.vToolQuality = 1; this.vHarvestLevel = 2; } - else if (this.vDurability >= 64000 && this.vDurability < 128000){ + else if ((this.vDurability >= 64000) && (this.vDurability < 128000)){ this.vToolQuality = 2; this.vHarvestLevel = 2; } - else if (this.vDurability >= 128000 && this.vDurability < 256000){ + else if ((this.vDurability >= 128000) && (this.vDurability < 256000)){ this.vToolQuality = 3; this.vHarvestLevel = 2; } - else if (this.vDurability >= 256000 && this.vDurability < 512000){ + else if ((this.vDurability >= 256000) && (this.vDurability < 512000)){ this.vToolQuality = 3; this.vHarvestLevel = 3; } - else if (this.vDurability >= 512000 && this.vDurability <= Integer.MAX_VALUE){ + else if ((this.vDurability >= 512000) && (this.vDurability <= Integer.MAX_VALUE)){ this.vToolQuality = 4; this.vHarvestLevel = 4; } @@ -163,7 +163,7 @@ public class Material { this.vVoltageMultiplier = this.getMeltingPointK() >= 2800 ? 64 : 16; if (inputs == null){ - this.vMaterialInput = null; + this.vMaterialInput = null; } else { if (inputs.length != 0){ @@ -175,25 +175,25 @@ public class Material { } } - this.vComponentCount = getComponentCount(inputs); - this.vSmallestRatio = getSmallestRatio(vMaterialInput); + this.vComponentCount = this.getComponentCount(inputs); + this.vSmallestRatio = this.getSmallestRatio(this.vMaterialInput); int tempSmallestSize = 0; - if (vSmallestRatio != null){ + if (this.vSmallestRatio != null){ for (int v=0;v<this.vSmallestRatio.length;v++){ - tempSmallestSize=(int) (tempSmallestSize+vSmallestRatio[v]); + tempSmallestSize=(int) (tempSmallestSize+this.vSmallestRatio[v]); } this.smallestStackSizeWhenProcessing = tempSmallestSize; //Valid stacksizes } else { - this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes + this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes } //Makes a Fancy Chemical Tooltip this.vChemicalSymbol = chemicalSymbol; - if (vMaterialInput != null){ - this.vChemicalFormula = getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true); + if (this.vMaterialInput != null){ + this.vChemicalFormula = this.getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true); } else if (!this.vChemicalSymbol.equals("")){ Utils.LOG_WARNING("materialInput is null, using a valid chemical symbol."); @@ -204,11 +204,11 @@ public class Material { this.vChemicalFormula = "??"; } - Materials isValid = Materials.get(getLocalizedName()); + final Materials isValid = Materials.get(this.getLocalizedName()); if (isValid == Materials._NULL){ - this.vMoltenFluid = generateFluid(); + this.vMoltenFluid = this.generateFluid(); } - else { + else { if (isValid.mFluid != null){ this.vMoltenFluid = isValid.mFluid; } @@ -216,230 +216,234 @@ public class Material { this.vMoltenFluid = isValid.mGas; } else { - this.vMoltenFluid = generateFluid(); + this.vMoltenFluid = this.generateFluid(); } } - this.vPlasma = generatePlasma(); + this.vPlasma = this.generatePlasma(); //dataVar = MathUtils.generateSingularRandomHexValue(); String ratio = ""; - if (vSmallestRatio != null) { - for (int hu=0;hu<vSmallestRatio.length;hu++){ + if (this.vSmallestRatio != null) { + for (int hu=0;hu<this.vSmallestRatio.length;hu++){ if (ratio.equals("")){ - ratio = String.valueOf(vSmallestRatio[hu]); + ratio = String.valueOf(this.vSmallestRatio[hu]); } else { - ratio = ratio + ":" +vSmallestRatio[hu]; - } + ratio = ratio + ":" +this.vSmallestRatio[hu]; + } } } Utils.LOG_INFO("Creating a Material instance for "+materialName); - Utils.LOG_INFO("Formula: "+vChemicalFormula + " Smallest Stack: "+smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio); - Utils.LOG_INFO("Protons: "+vProtons); - Utils.LOG_INFO("Neutrons: "+vNeutrons); - Utils.LOG_INFO("Mass: "+vMass+"/units"); - Utils.LOG_INFO("Melting Point: "+meltingPointC+"C."); - Utils.LOG_INFO("Boiling Point: "+boilingPointC+"C."); + Utils.LOG_INFO("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio); + Utils.LOG_INFO("Protons: "+this.vProtons); + Utils.LOG_INFO("Neutrons: "+this.vNeutrons); + Utils.LOG_INFO("Mass: "+this.vMass+"/units"); + Utils.LOG_INFO("Melting Point: "+this.meltingPointC+"C."); + Utils.LOG_INFO("Boiling Point: "+this.boilingPointC+"C."); } public final String getLocalizedName(){ - if (this.localizedName != null) + if (this.localizedName != null) { return this.localizedName; + } return "ERROR BAD LOCALIZED NAME"; } public final String getUnlocalizedName(){ - if (this.unlocalizedName != null) + if (this.unlocalizedName != null) { return this.unlocalizedName; + } return "ERROR.BAD.UNLOCALIZED.NAME"; } - + final public MaterialState getState(){ return this.materialState; } final public short[] getRGBA(){ - if (this.RGBA != null) + if (this.RGBA != null) { return this.RGBA; + } return new short[] {255,0,0}; } final public int getRgbAsHex(){ - int returnValue = Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]); + final int returnValue = Utils.rgbtoHexValue(this.RGBA[0], this.RGBA[1], this.RGBA[2]); if (returnValue == 0){ - return (int) dataVar; - } - return Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]); + return (int) this.dataVar; + } + return Utils.rgbtoHexValue(this.RGBA[0], this.RGBA[1], this.RGBA[2]); } final public long getProtons() { - return vProtons; + return this.vProtons; } public final long getNeutrons() { - return vNeutrons; + return this.vNeutrons; } final public long getMass() { - return vProtons + vNeutrons; + return this.vProtons + this.vNeutrons; } public final int getMeltingPointC() { - return meltingPointC; + return this.meltingPointC; } public final int getBoilingPointC() { - return boilingPointC; + return this.boilingPointC; } public final int getMeltingPointK() { - return meltingPointK; + return this.meltingPointK; } public final int getBoilingPointK() { - return boilingPointK; + return this.boilingPointK; } public final boolean requiresBlastFurnace(){ - return usesBlastFurnace; + return this.usesBlastFurnace; } final public Block getBlock(){ - return Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+unlocalizedName, 1).getItem()); + return Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName, 1).getItem()); } - public final ItemStack getBlock(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+unlocalizedName, stacksize); + public final ItemStack getBlock(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName, stacksize); } - public final ItemStack getDust(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, stacksize); + public final ItemStack getDust(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+this.unlocalizedName, stacksize); } - public final ItemStack getSmallDust(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+unlocalizedName, stacksize); + public final ItemStack getSmallDust(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+this.unlocalizedName, stacksize); } - public final ItemStack getTinyDust(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+unlocalizedName, stacksize); + public final ItemStack getTinyDust(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+this.unlocalizedName, stacksize); } public final ItemStack[] getValidInputStacks(){ - return ItemUtils.validItemsForOreDict(unlocalizedName); + return ItemUtils.validItemsForOreDict(this.unlocalizedName); } - public final ItemStack getIngot(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingot"+unlocalizedName, stacksize); + public final ItemStack getIngot(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingot"+this.unlocalizedName, stacksize); } - public final ItemStack getPlate(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plate"+unlocalizedName, stacksize); + public final ItemStack getPlate(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plate"+this.unlocalizedName, stacksize); } - public final ItemStack getPlateDouble(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDouble"+unlocalizedName, stacksize); + public final ItemStack getPlateDouble(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDouble"+this.unlocalizedName, stacksize); } - public final ItemStack getGear(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gear"+unlocalizedName, stacksize); + public final ItemStack getGear(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gear"+this.unlocalizedName, stacksize); } - public final ItemStack getRod(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stick"+unlocalizedName, stacksize); + public final ItemStack getRod(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stick"+this.unlocalizedName, stacksize); } - public final ItemStack getLongRod(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stickLong"+unlocalizedName, stacksize); + public final ItemStack getLongRod(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stickLong"+this.unlocalizedName, stacksize); } - public final ItemStack getBolt(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("bolt"+unlocalizedName, stacksize); + public final ItemStack getBolt(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("bolt"+this.unlocalizedName, stacksize); } - public final ItemStack getScrew(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("screw"+unlocalizedName, stacksize); + public final ItemStack getScrew(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("screw"+this.unlocalizedName, stacksize); } - public final ItemStack getRing(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ring"+unlocalizedName, stacksize); + public final ItemStack getRing(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ring"+this.unlocalizedName, stacksize); } - public final ItemStack getRotor(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("rotor"+unlocalizedName, stacksize); + public final ItemStack getRotor(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("rotor"+this.unlocalizedName, stacksize); } - public final ItemStack getFrameBox(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("frameGt"+unlocalizedName, stacksize); + public final ItemStack getFrameBox(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("frameGt"+this.unlocalizedName, stacksize); } - public final ItemStack getCell(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, stacksize); + public final ItemStack getCell(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.unlocalizedName, stacksize); } - public final ItemStack getPlasmaCell(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+unlocalizedName, stacksize); + public final ItemStack getPlasmaCell(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+this.unlocalizedName, stacksize); } - public final ItemStack getNugget(int stacksize){ - return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+unlocalizedName, stacksize); + public final ItemStack getNugget(final int stacksize){ + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+this.unlocalizedName, stacksize); } final public ItemStack[] getMaterialComposites(){ - if (vMaterialInput != null){ - if (!vMaterialInput.isEmpty()){ - ItemStack[] temp = new ItemStack[vMaterialInput.size()]; - for (int i=0;i<vMaterialInput.size();i++){ + if (this.vMaterialInput != null){ + if (!this.vMaterialInput.isEmpty()){ + final ItemStack[] temp = new ItemStack[this.vMaterialInput.size()]; + for (int i=0;i<this.vMaterialInput.size();i++){ //Utils.LOG_WARNING("i:"+i); ItemStack testNull = null; try { - testNull = vMaterialInput.get(i).getValidStack(); - } catch (Throwable r){ - Utils.LOG_WARNING("Failed gathering material stack for "+localizedName+"."); - Utils.LOG_WARNING("What Failed: Length:"+vMaterialInput.size()+" current:"+i); + testNull = this.vMaterialInput.get(i).getValidStack(); + } catch (final Throwable r){ + Utils.LOG_WARNING("Failed gathering material stack for "+this.localizedName+"."); + Utils.LOG_WARNING("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i); } try { if (testNull != null){ //Utils.LOG_WARNING("not null"); - temp[i] = vMaterialInput.get(i).getValidStack(); + temp[i] = this.vMaterialInput.get(i).getValidStack(); } - } catch (Throwable r){ - Utils.LOG_WARNING("Failed setting slot "+i+", using "+localizedName); + } catch (final Throwable r){ + Utils.LOG_WARNING("Failed setting slot "+i+", using "+this.localizedName); } - } + } return temp; } } return new ItemStack[]{}; } - public final ArrayList<MaterialStack> getComposites(){ + public final ArrayList<MaterialStack> getComposites(){ return this.vMaterialInput; } final public int[] getMaterialCompositeStackSizes(){ - if (!vMaterialInput.isEmpty()){ - int[] temp = new int[vMaterialInput.size()]; - for (int i=0;i<vMaterialInput.size();i++){ - if (vMaterialInput.get(i) != null) - temp[i] = vMaterialInput.get(i).getDustStack().stackSize; - else + if (!this.vMaterialInput.isEmpty()){ + final int[] temp = new int[this.vMaterialInput.size()]; + for (int i=0;i<this.vMaterialInput.size();i++){ + if (this.vMaterialInput.get(i) != null) { + temp[i] = this.vMaterialInput.get(i).getDustStack().stackSize; + } else { temp[i]=0; - } + } + } return temp; } return new int[]{}; } - private final short getComponentCount(MaterialStack[] inputs){ + private final short getComponentCount(final MaterialStack[] inputs){ int counterTemp = 0; - for (MaterialStack m : inputs){ + for (final MaterialStack m : inputs){ if (m.getStackMaterial() != null){ - counterTemp++; - } + counterTemp++; + } } if (counterTemp != 0){ return (short) counterTemp; @@ -451,22 +455,22 @@ public class Material { @SuppressWarnings("static-method") - public final long[] getSmallestRatio(ArrayList<MaterialStack> tempInput){ + public final long[] getSmallestRatio(final ArrayList<MaterialStack> tempInput){ if (tempInput != null){ if (!tempInput.isEmpty()){ Utils.LOG_WARNING("length: "+tempInput.size()); Utils.LOG_WARNING("(inputs != null): "+(tempInput != null)); //Utils.LOG_WARNING("length: "+inputs.length); - long[] tempRatio = new long[tempInput.size()]; + final long[] tempRatio = new long[tempInput.size()]; for (int x=0;x<tempInput.size();x++){ //tempPercentage = tempPercentage+inputs[x].percentageToUse; //this.mMaterialList.add(inputs[x]); if (tempInput.get(x) != null){ - tempRatio[x] = tempInput.get(x).getPartsPerOneHundred(); + tempRatio[x] = tempInput.get(x).getPartsPerOneHundred(); } } - long[] smallestRatio = MathUtils.simplifyNumbersToSmallestForm(tempRatio); + final long[] smallestRatio = MathUtils.simplifyNumbersToSmallestForm(tempRatio); if (smallestRatio.length > 0){ String tempRatioStringThing1 = ""; @@ -485,21 +489,24 @@ public class Material { Utils.LOG_WARNING("Smallest Ratio: "+tempRatioStringThing); return smallestRatio; } - } + } } return null; } - public final String getToolTip(String chemSymbol, long aMultiplier, boolean aShowQuestionMarks) { - if (!aShowQuestionMarks && (vChemicalFormula.equals("?")||vChemicalFormula.equals("??"))) return ""; + public final String getToolTip(final String chemSymbol, final long aMultiplier, final boolean aShowQuestionMarks) { + if (!aShowQuestionMarks && (this.vChemicalFormula.equals("?")||this.vChemicalFormula.equals("??"))) { + return ""; + } Utils.LOG_WARNING("===============| Calculating Atomic Formula for "+this.localizedName+" |==============="); - if (!chemSymbol.equals("")) + if (!chemSymbol.equals("")) { return chemSymbol; - ArrayList<MaterialStack> tempInput = vMaterialInput; + } + final ArrayList<MaterialStack> tempInput = this.vMaterialInput; if (tempInput != null){ if (!tempInput.isEmpty()){ String dummyFormula = ""; - long[] dummyFormulaArray = getSmallestRatio(tempInput); + final long[] dummyFormulaArray = this.getSmallestRatio(tempInput); if (dummyFormulaArray != null){ if (dummyFormulaArray.length >= 1){ for (int e=0;e<tempInput.size();e++){ @@ -509,18 +516,18 @@ public class Material { if (dummyFormulaArray[e] > 1){ if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){ - dummyFormula = dummyFormula + "(" + tempInput.get(e).getStackMaterial().vChemicalFormula + ")" + dummyFormulaArray[e]; + dummyFormula = dummyFormula + "(" + tempInput.get(e).getStackMaterial().vChemicalFormula + ")" + dummyFormulaArray[e]; } else { - dummyFormula = dummyFormula + tempInput.get(e).getStackMaterial().vChemicalFormula + dummyFormulaArray[e]; + dummyFormula = dummyFormula + tempInput.get(e).getStackMaterial().vChemicalFormula + dummyFormulaArray[e]; } } else if (dummyFormulaArray[e] == 1){ if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){ - dummyFormula = dummyFormula + "(" +tempInput.get(e).getStackMaterial().vChemicalFormula + ")"; + dummyFormula = dummyFormula + "(" +tempInput.get(e).getStackMaterial().vChemicalFormula + ")"; } else { - dummyFormula = dummyFormula +tempInput.get(e).getStackMaterial().vChemicalFormula; + dummyFormula = dummyFormula +tempInput.get(e).getStackMaterial().vChemicalFormula; } } } else { @@ -548,69 +555,70 @@ public class Material { public final Fluid generateFluid(){ try { - if (Materials.get(localizedName) == Materials.Clay){ + if (Materials.get(this.localizedName) == Materials.Clay){ return null; } - } catch (Throwable e){} + } catch (final Throwable e){} - if (Materials.get(localizedName).mFluid == null){ + if (Materials.get(this.localizedName).mFluid == null){ Utils.LOG_WARNING("Generating our own fluid."); //Generate a Cell if we need to - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1) == null){ + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ @SuppressWarnings("unused") + final Item temp = new BaseItemCell(this); } - + if (this.materialState == MaterialState.SOLID){ return FluidUtils.addGTFluid( this.getUnlocalizedName(), - "Molten "+this.getLocalizedName(), + "Molten "+this.getLocalizedName(), this.RGBA, this.materialState.ID(), this.getMeltingPointK(), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); } else if (this.materialState == MaterialState.LIQUID){ return FluidUtils.addGTFluid( this.getUnlocalizedName(), - this.getLocalizedName(), + this.getLocalizedName(), this.RGBA, this.materialState.ID(), this.getMeltingPointK(), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); } else if (this.materialState == MaterialState.GAS){ return FluidUtils.addGTFluid( this.getUnlocalizedName(), - this.getLocalizedName()+" Gas", + this.getLocalizedName()+" Gas", this.RGBA, this.materialState.ID(), this.getMeltingPointK(), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); } else { //Plasma - return generatePlasma(); - } + return this.generatePlasma(); + } } Utils.LOG_WARNING("Getting the fluid from a GT material instead."); - return Materials.get(localizedName).mFluid; + return Materials.get(this.localizedName).mFluid; } public final Fluid generatePlasma(){ - Materials isValid = Materials.get(getLocalizedName()); - if (isValid != Materials._NULL && isValid != null && isValid != Materials.Clay){ + final Materials isValid = Materials.get(this.getLocalizedName()); + if ((isValid != Materials._NULL) && (isValid != null) && (isValid != Materials.Clay)){ if (isValid.mPlasma != null){ Utils.LOG_INFO("Using a pre-defined Plasma from GT."); return isValid.mPlasma; } - } + } Utils.LOG_INFO("Generating our own Plasma."); return FluidUtils.addGTPlasma(this); //return null; @@ -618,9 +626,9 @@ public class Material { - final public FluidStack getFluid(int fluidAmount) { + final public FluidStack getFluid(final int fluidAmount) { Utils.LOG_WARNING("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName()); - FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount); + final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount); Utils.LOG_WARNING("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID()); return moltenFluid; } |