diff options
Diffstat (limited to 'src/Java')
-rw-r--r-- | src/Java/gtPlusPlus/core/material/ALLOY.java | 12 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 4 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index c0d393ee58..5c368a23da 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -4,7 +4,7 @@ package gtPlusPlus.core.material; public class ALLOY { public static final Material ENERGYCRYSTAL = new Material( - "name", //Material Name + "Energy Crystal", //Material Name new short[]{228, 255, 0, 0}, //Material Colour 5660, //Melting Point in C 0, //Boiling Point in C @@ -12,10 +12,7 @@ public class ALLOY { 100, //Neutrons true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.GOLD, 50), - new MaterialStack(ELEMENT.SILVER, 50) - }); + null); public static final Material BLOODSTEEL = new Material( "Blood Steel", //Material Name @@ -26,10 +23,7 @@ public class ALLOY { 100, //Neutrons false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.GOLD, 50), - new MaterialStack(ELEMENT.SILVER, 50) - }); + null); public static final Material STABALLOY = new Material( "Staballoy", //Material Name diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index 5022e8676b..05d09e64de 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -3,8 +3,8 @@ package gtPlusPlus.core.material; import gregtech.api.enums.Materials; import gtPlusPlus.core.util.materials.MaterialUtils; -public class ELEMENT { - +public final class ELEMENT { + //First 50 Elements public static final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen); diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index ef9f3274ee..0af8d91278 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -10,7 +10,7 @@ public class Material { final String unlocalizedName; final String localizedName; - final MaterialStack[] materialInput = null; + final MaterialStack[] materialInput = new MaterialStack[4]; final short[] RGBA; @@ -94,7 +94,7 @@ public class Material { } public ItemStack[] getMaterialComposites(){ - ItemStack[] temp = {}; + ItemStack[] temp = new ItemStack[materialInput.length]; for (int i=0;i<materialInput.length;i++){ temp[i] = materialInput[i].getDustStack(); } @@ -102,7 +102,7 @@ public class Material { } public int[] getMaterialCompositeStackSizes(){ - int[] temp = {}; + int[] temp = new int[materialInput.length]; for (int i=0;i<materialInput.length;i++){ temp[i] = materialInput[i].getDustStack().stackSize; } |