aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java96
1 files changed, 48 insertions, 48 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index cf8ded80e9..7d251c8682 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -288,11 +288,11 @@ public class Material {
this.vChemicalFormula = this.getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
}
else if (!this.vChemicalSymbol.equals("")){
- Logger.INFO("materialInput is null, using a valid chemical symbol.");
+ Logger.WARNING("materialInput is null, using a valid chemical symbol.");
this.vChemicalFormula = this.vChemicalSymbol;
}
else{
- Logger.INFO("MaterialInput == null && chemicalSymbol probably equals nothing");
+ Logger.WARNING("MaterialInput == null && chemicalSymbol probably equals nothing");
this.vChemicalFormula = "??";
}
@@ -335,13 +335,13 @@ public class Material {
}
}
- Logger.INFO("Creating a Material instance for "+materialName);
- Logger.INFO("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
- Logger.INFO("Protons: "+this.vProtons);
- Logger.INFO("Neutrons: "+this.vNeutrons);
- Logger.INFO("Mass: "+this.vMass+"/units");
- Logger.INFO("Melting Point: "+this.meltingPointC+"C.");
- Logger.INFO("Boiling Point: "+this.boilingPointC+"C.");
+ Logger.WARNING("Creating a Material instance for "+materialName);
+ Logger.WARNING("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
+ Logger.WARNING("Protons: "+this.vProtons);
+ Logger.WARNING("Neutrons: "+this.vNeutrons);
+ Logger.WARNING("Mass: "+this.vMass+"/units");
+ Logger.WARNING("Melting Point: "+this.meltingPointC+"C.");
+ Logger.WARNING("Boiling Point: "+this.boilingPointC+"C.");
}
catch (Throwable t){
t.printStackTrace();
@@ -595,21 +595,21 @@ public class Material {
if (this.vMaterialInput != null && !this.vMaterialInput.isEmpty()){
final ItemStack[] temp = new ItemStack[this.vMaterialInput.size()];
for (int i=0;i<this.vMaterialInput.size();i++){
- //Utils.LOG_INFO("i:"+i);
+ //Utils.LOG_WARNING("i:"+i);
ItemStack testNull = null;
try {
testNull = this.vMaterialInput.get(i).getValidStack();
} catch (final Throwable r){
- Logger.INFO("Failed gathering material stack for "+this.localizedName+".");
- Logger.INFO("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i);
+ Logger.WARNING("Failed gathering material stack for "+this.localizedName+".");
+ Logger.WARNING("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i);
}
try {
if (testNull != null){
- //Utils.LOG_INFO("not null");
+ //Utils.LOG_WARNING("not null");
temp[i] = this.vMaterialInput.get(i).getValidStack();
}
} catch (final Throwable r){
- Logger.INFO("Failed setting slot "+i+", using "+this.localizedName);
+ Logger.WARNING("Failed setting slot "+i+", using "+this.localizedName);
}
}
return temp;
@@ -659,9 +659,9 @@ public class Material {
public final long[] getSmallestRatio(final ArrayList<MaterialStack> tempInput){
if (tempInput != null){
if (!tempInput.isEmpty()){
- Logger.INFO("length: "+tempInput.size());
- Logger.INFO("(inputs != null): "+(tempInput != null));
- //Utils.LOG_INFO("length: "+inputs.length);
+ Logger.WARNING("length: "+tempInput.size());
+ Logger.WARNING("(inputs != null): "+(tempInput != null));
+ //Utils.LOG_WARNING("length: "+inputs.length);
final long[] tempRatio = new long[tempInput.size()];
for (int x=0;x<tempInput.size();x++){
//tempPercentage = tempPercentage+inputs[x].percentageToUse;
@@ -678,7 +678,7 @@ public class Material {
for (int r=0;r<tempRatio.length;r++){
tempRatioStringThing1 = tempRatioStringThing1 + tempRatio[r] +" : ";
}
- Logger.INFO("Default Ratio: "+tempRatioStringThing1);
+ Logger.WARNING("Default Ratio: "+tempRatioStringThing1);
String tempRatioStringThing = "";
int tempSmallestCraftingUseSize = 0;
@@ -687,7 +687,7 @@ public class Material {
tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + smallestRatio[r]);
}
//this.smallestStackSizeWhenProcessing = tempSmallestCraftingUseSize;
- Logger.INFO("Smallest Ratio: "+tempRatioStringThing);
+ Logger.WARNING("Smallest Ratio: "+tempRatioStringThing);
return smallestRatio;
}
}
@@ -699,7 +699,7 @@ public class Material {
if (!aShowQuestionMarks && (this.vChemicalFormula.equals("?")||this.vChemicalFormula.equals("??"))) {
return "";
}
- Logger.INFO("===============| Calculating Atomic Formula for "+this.localizedName+" |===============");
+ Logger.WARNING("===============| Calculating Atomic Formula for "+this.localizedName+" |===============");
if (!chemSymbol.equals("")) {
return chemSymbol;
}
@@ -742,13 +742,13 @@ public class Material {
return StringUtils.subscript(dummyFormula);
//return dummyFormula;
}
- Logger.INFO("dummyFormulaArray <= 0");
+ Logger.WARNING("dummyFormulaArray <= 0");
}
- Logger.INFO("dummyFormulaArray == null");
+ Logger.WARNING("dummyFormulaArray == null");
}
- Logger.INFO("tempInput.length <= 0");
+ Logger.WARNING("tempInput.length <= 0");
}
- Logger.INFO("tempInput == null");
+ Logger.WARNING("tempInput == null");
return "??";
}
@@ -778,33 +778,33 @@ public class Material {
if (isValid != Materials._NULL){
for (Materials m : invalidMaterials.values()){
if (isValid == m){
- Logger.INFO("Trying to generate a fluid for blacklisted material: "+m.mDefaultLocalName);
+ Logger.WARNING("Trying to generate a fluid for blacklisted material: "+m.mDefaultLocalName);
FluidStack a1 = m.getFluid(1);
FluidStack a2 = m.getGas(1);
FluidStack a3 = m.getMolten(1);
FluidStack a4 = m.getSolid(1);
FluidStack a5 = m.getPlasma(1);
if (a1 != null){
- Logger.INFO("Using a pre-defined Fluid from GT. Fluid.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. Fluid.");
return a1.getFluid();
}
if (a2 != null){
- Logger.INFO("Using a pre-defined Fluid from GT. Gas.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. Gas.");
return a2.getFluid();
}
if (a3 != null){
- Logger.INFO("Using a pre-defined Fluid from GT. Molten.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. Molten.");
return a3.getFluid();
}
if (a4 != null){
- Logger.INFO("Using a pre-defined Fluid from GT. Solid.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. Solid.");
return a4.getFluid();
}
if (a5 != null){
- Logger.INFO("Using a pre-defined Fluid from GT. Plasma.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. Plasma.");
return a5.getFluid();
}
- Logger.INFO("Using null.");
+ Logger.WARNING("Using null.");
return null;
}
}
@@ -812,31 +812,31 @@ public class Material {
if (this.materialState == MaterialState.SOLID){
if (isValid.mFluid != null){
- Logger.INFO("Using a pre-defined Fluid from GT. mFluid.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. mFluid.");
return isValid.mFluid;
}
else if (isValid.mStandardMoltenFluid != null){
- Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
return isValid.mStandardMoltenFluid;
}
}
else if (this.materialState == MaterialState.GAS){
if (isValid.mGas != null){
- Logger.INFO("Using a pre-defined Fluid from GT. mGas.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. mGas.");
return isValid.mGas;
}
}
else if (this.materialState == MaterialState.LIQUID || this.materialState == MaterialState.PURE_LIQUID){
if (isValid.mFluid != null){
- Logger.INFO("Using a pre-defined Fluid from GT. mFluid.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. mFluid.");
return isValid.mFluid;
}
else if (isValid.mGas != null){
- Logger.INFO("Using a pre-defined Fluid from GT. mGas.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. mGas.");
return isValid.mGas;
}
else if (isValid.mStandardMoltenFluid != null){
- Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
+ Logger.WARNING("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
return isValid.mStandardMoltenFluid;
}
}
@@ -846,28 +846,28 @@ public class Material {
FluidStack aTest3 = FluidUtils.getFluidStack(Utils.sanitizeString(this.getLocalizedName()), 1);
if (aTest1 != null) {
- Logger.INFO("Found FluidRegistry entry for "+"molten."+Utils.sanitizeString(this.getLocalizedName()));
+ Logger.WARNING("Found FluidRegistry entry for "+"molten."+Utils.sanitizeString(this.getLocalizedName()));
return aTest1.getFluid();
}
if (aTest2 != null) {
- Logger.INFO("Found FluidRegistry entry for "+"fluid."+Utils.sanitizeString(this.getLocalizedName()));
+ Logger.WARNING("Found FluidRegistry entry for "+"fluid."+Utils.sanitizeString(this.getLocalizedName()));
return aTest2.getFluid();
}
if (aTest3 != null) {
- Logger.INFO("Found FluidRegistry entry for "+Utils.sanitizeString(this.getLocalizedName()));
+ Logger.WARNING("Found FluidRegistry entry for "+Utils.sanitizeString(this.getLocalizedName()));
return aTest3.getFluid();
}
- Logger.INFO("Generating our own fluid.");
+ Logger.WARNING("Generating our own fluid.");
//Generate a Cell if we need to
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){
if (this.vGenerateCells){
new BaseItemCell(this);
- Logger.INFO("Generated a cell for "+this.getUnlocalizedName());
+ Logger.WARNING("Generated a cell for "+this.getUnlocalizedName());
}
else {
- Logger.INFO("Did not generate a cell for "+this.getUnlocalizedName());
+ Logger.WARNING("Did not generate a cell for "+this.getUnlocalizedName());
}
}
@@ -924,11 +924,11 @@ public class Material {
}
}
if (isValid.mPlasma != null){
- Logger.INFO("Using a pre-defined Plasma from GT.");
+ Logger.WARNING("Using a pre-defined Plasma from GT.");
return isValid.mPlasma;
}
- Logger.INFO("Generating our own Plasma.");
+ Logger.WARNING("Generating our own Plasma.");
return FluidUtils.addGTPlasma(this);
}
@@ -950,14 +950,14 @@ public class Material {
if (part != null){
int incrementor = part.getStackMaterial().getMeltingPointC();
meltingPoint += incrementor;
- Logger.INFO("Melting Point for "+this.getLocalizedName()+" increased by "+ incrementor);
+ Logger.WARNING("Melting Point for "+this.getLocalizedName()+" increased by "+ incrementor);
}
else {
Logger.MATERIALS(this.getLocalizedName()+" has a really invalid composition.");
}
}
int divisor = (this.vMaterialInput.size()>0 ? this.vMaterialInput.size() : 1);
- Logger.INFO("Dividing "+meltingPoint+" / "+divisor+" to get average melting point.");
+ Logger.WARNING("Dividing "+meltingPoint+" / "+divisor+" to get average melting point.");
meltingPoint = (meltingPoint/divisor);
return meltingPoint;
}
@@ -972,7 +972,7 @@ public class Material {
for (MaterialStack part : this.vMaterialInput){
if (part != null){
boilingPoint += part.getStackMaterial().getBoilingPointC();
- Logger.INFO("Boiling Point for "+this.getLocalizedName()+" increased by "+ part.getStackMaterial().getBoilingPointC());
+ Logger.WARNING("Boiling Point for "+this.getLocalizedName()+" increased by "+ part.getStackMaterial().getBoilingPointC());
}
else {
Logger.MATERIALS(this.getLocalizedName()+" has a really invalid composition.");