diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/MaterialGenerator.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/math/MathUtils.java | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java index 12c323d68d..23aa162610 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java @@ -189,7 +189,7 @@ public class MaterialGenerator { } catch (final Throwable t) { - Logger.WARNING(""+matInfo.getLocalizedName()+" failed to generate."); + Logger.MATERIALS(""+matInfo.getLocalizedName()+" failed to generate."); return false; } } @@ -223,7 +223,7 @@ public class MaterialGenerator { new RecipeGen_MaterialProcessing(matInfo); } catch (Throwable t) { - Logger.INFO("Failed to generate some recipes for "+materialName); + Logger.MATERIALS("Failed to generate some recipes for "+materialName); Logger.ERROR("Failed to generate some recipes for "+materialName); t.printStackTrace(); } @@ -269,7 +269,7 @@ public class MaterialGenerator { new RecipeGen_Recycling(matInfo); } catch (final Throwable t){ - Logger.WARNING(""+matInfo.getLocalizedName()+" failed to generate."); + Logger.MATERIALS(""+matInfo.getLocalizedName()+" failed to generate."); } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index decb5b6d30..cf9cc22eb8 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -209,7 +209,7 @@ public class RECIPES_GREGTECH { CORE.RA.addBlastSmelterRecipe( new ItemStack[] { ItemUtils.getGregtechCircuit(19), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSheldonite", 8), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCooperite", 8), ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(8000), diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java index 03146d20d3..48d56b3aa8 100644 --- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java +++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java @@ -389,7 +389,7 @@ public class MathUtils { * Averages */ - public static byte getByteAverage(AutoMap<?> aDataSet) { + public static byte getByteAverage(AutoMap aDataSet) { byte[] aNewSet = new byte[aDataSet.size()]; for (int u=0;u<aDataSet.size();u++) { aNewSet[u] = (byte) aDataSet.get(u); @@ -397,7 +397,7 @@ public class MathUtils { return getByteAverage(aNewSet); } - public static short getShortAverage(AutoMap<?> aDataSet) { + public static short getShortAverage(AutoMap aDataSet) { short[] aNewSet = new short[aDataSet.size()]; for (int u=0;u<aDataSet.size();u++) { aNewSet[u] = (short) aDataSet.get(u); @@ -405,7 +405,7 @@ public class MathUtils { return getShortAverage(aNewSet); } - public static int getIntAverage(AutoMap<?> aDataSet) { + public static int getIntAverage(AutoMap aDataSet) { int[] aNewSet = new int[aDataSet.size()]; for (int u=0;u<aDataSet.size();u++) { aNewSet[u] = (int) aDataSet.get(u); @@ -413,7 +413,7 @@ public class MathUtils { return getIntAverage(aNewSet); } - public static float getFloatAverage(AutoMap<?> aDataSet) { + public static float getFloatAverage(AutoMap aDataSet) { float[] aNewSet = new float[aDataSet.size()]; for (int u=0;u<aDataSet.size();u++) { aNewSet[u] = (float) aDataSet.get(u); @@ -421,7 +421,7 @@ public class MathUtils { return getFloatAverage(aNewSet); } - public static long getLongAverage(AutoMap<?> aDataSet) { + public static long getLongAverage(AutoMap aDataSet) { long[] aNewSet = new long[aDataSet.size()]; for (int u=0;u<aDataSet.size();u++) { aNewSet[u] = (long) aDataSet.get(u); @@ -429,7 +429,7 @@ public class MathUtils { return getLongAverage(aNewSet); } - public static double getDoubleAverage(AutoMap<?> aDataSet) { + public static double getDoubleAverage(AutoMap aDataSet) { double[] aNewSet = new double[aDataSet.size()]; for (int u=0;u<aDataSet.size();u++) { aNewSet[u] = (double) aDataSet.get(u); |