diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
-rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 5f83d1a732..5a38e5cf08 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -227,11 +227,11 @@ public class Material { 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."); + Utils.LOG_MACHINE_INFO("materialInput is null, using a valid chemical symbol."); this.vChemicalFormula = this.vChemicalSymbol; } else{ - Utils.LOG_WARNING("MaterialInput == null && chemicalSymbol probably equals nothing"); + Utils.LOG_MACHINE_INFO("MaterialInput == null && chemicalSymbol probably equals nothing"); this.vChemicalFormula = "??"; } @@ -267,13 +267,13 @@ public class Material { } } - Utils.LOG_INFO("Creating a Material instance for "+materialName); - 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."); + Utils.LOG_MACHINE_INFO("Creating a Material instance for "+materialName); + Utils.LOG_MACHINE_INFO("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio); + Utils.LOG_MACHINE_INFO("Protons: "+this.vProtons); + Utils.LOG_MACHINE_INFO("Neutrons: "+this.vNeutrons); + Utils.LOG_MACHINE_INFO("Mass: "+this.vMass+"/units"); + Utils.LOG_MACHINE_INFO("Melting Point: "+this.meltingPointC+"C."); + Utils.LOG_MACHINE_INFO("Boiling Point: "+this.boilingPointC+"C."); } public final String getLocalizedName(){ @@ -427,21 +427,21 @@ public class Material { 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); + //Utils.LOG_MACHINE_INFO("i:"+i); ItemStack testNull = null; try { 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); + Utils.LOG_MACHINE_INFO("Failed gathering material stack for "+this.localizedName+"."); + Utils.LOG_MACHINE_INFO("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i); } try { if (testNull != null){ - //Utils.LOG_WARNING("not null"); + //Utils.LOG_MACHINE_INFO("not null"); temp[i] = this.vMaterialInput.get(i).getValidStack(); } } catch (final Throwable r){ - Utils.LOG_WARNING("Failed setting slot "+i+", using "+this.localizedName); + Utils.LOG_MACHINE_INFO("Failed setting slot "+i+", using "+this.localizedName); } } return temp; @@ -489,9 +489,9 @@ public class Material { 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); + Utils.LOG_MACHINE_INFO("length: "+tempInput.size()); + Utils.LOG_MACHINE_INFO("(inputs != null): "+(tempInput != null)); + //Utils.LOG_MACHINE_INFO("length: "+inputs.length); final long[] tempRatio = new long[tempInput.size()]; for (int x=0;x<tempInput.size();x++){ //tempPercentage = tempPercentage+inputs[x].percentageToUse; @@ -508,7 +508,7 @@ public class Material { for (int r=0;r<tempRatio.length;r++){ tempRatioStringThing1 = tempRatioStringThing1 + tempRatio[r] +" : "; } - Utils.LOG_WARNING("Default Ratio: "+tempRatioStringThing1); + Utils.LOG_MACHINE_INFO("Default Ratio: "+tempRatioStringThing1); String tempRatioStringThing = ""; int tempSmallestCraftingUseSize = 0; @@ -517,7 +517,7 @@ public class Material { tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + smallestRatio[r]); } //this.smallestStackSizeWhenProcessing = tempSmallestCraftingUseSize; - Utils.LOG_WARNING("Smallest Ratio: "+tempRatioStringThing); + Utils.LOG_MACHINE_INFO("Smallest Ratio: "+tempRatioStringThing); return smallestRatio; } } @@ -529,7 +529,7 @@ public class Material { if (!aShowQuestionMarks && (this.vChemicalFormula.equals("?")||this.vChemicalFormula.equals("??"))) { return ""; } - Utils.LOG_WARNING("===============| Calculating Atomic Formula for "+this.localizedName+" |==============="); + Utils.LOG_MACHINE_INFO("===============| Calculating Atomic Formula for "+this.localizedName+" |==============="); if (!chemSymbol.equals("")) { return chemSymbol; } @@ -572,13 +572,13 @@ public class Material { return MaterialUtils.subscript(dummyFormula); //return dummyFormula; } - Utils.LOG_WARNING("dummyFormulaArray <= 0"); + Utils.LOG_MACHINE_INFO("dummyFormulaArray <= 0"); } - Utils.LOG_WARNING("dummyFormulaArray == null"); + Utils.LOG_MACHINE_INFO("dummyFormulaArray == null"); } - Utils.LOG_WARNING("tempInput.length <= 0"); + Utils.LOG_MACHINE_INFO("tempInput.length <= 0"); } - Utils.LOG_WARNING("tempInput == null"); + Utils.LOG_MACHINE_INFO("tempInput == null"); return "??"; } @@ -592,7 +592,7 @@ public class Material { } catch (final Throwable e){} if (Materials.get(this.localizedName).mFluid == null){ - Utils.LOG_WARNING("Generating our own fluid."); + Utils.LOG_MACHINE_INFO("Generating our own fluid."); //Generate a Cell if we need to if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ @@ -638,7 +638,7 @@ public class Material { return this.generatePlasma(); } } - Utils.LOG_WARNING("Getting the fluid from a GT material instead."); + Utils.LOG_MACHINE_INFO("Getting the fluid from a GT material instead."); return Materials.get(this.localizedName).mFluid; } @@ -646,11 +646,11 @@ public class Material { 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."); + Utils.LOG_MACHINE_INFO("Using a pre-defined Plasma from GT."); return isValid.mPlasma; } } - Utils.LOG_INFO("Generating our own Plasma."); + Utils.LOG_MACHINE_INFO("Generating our own Plasma."); return FluidUtils.addGTPlasma(this); //return null; } @@ -658,9 +658,9 @@ public class Material { final public FluidStack getFluid(final int fluidAmount) { - Utils.LOG_WARNING("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName()); + Utils.LOG_MACHINE_INFO("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName()); final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount); - Utils.LOG_WARNING("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID()); + Utils.LOG_MACHINE_INFO("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID()); return moltenFluid; } @@ -670,10 +670,10 @@ public class Material { for (MaterialStack part : this.vMaterialInput){ int incrementor = part.getStackMaterial().getMeltingPointC(); meltingPoint += incrementor; - Utils.LOG_INFO("Melting Point for "+this.getLocalizedName()+" increased to "+ incrementor); + Utils.LOG_MACHINE_INFO("Melting Point for "+this.getLocalizedName()+" increased to "+ incrementor); } int divisor = (this.vMaterialInput.size()>0 ? this.vMaterialInput.size() : 1); - Utils.LOG_INFO("Dividing "+meltingPoint+" / "+divisor+" to get average melting point."); + Utils.LOG_MACHINE_INFO("Dividing "+meltingPoint+" / "+divisor+" to get average melting point."); meltingPoint = (meltingPoint/divisor); return meltingPoint; } |