diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-23 15:31:59 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-23 15:31:59 +1000 |
| commit | ed52e8c83916cac101e8dd50cfe179c23a6122b2 (patch) | |
| tree | 53ceb9487dd754f5d809a31a9f9702e4d78aece6 /src/Java/gtPlusPlus/core/material | |
| parent | d2493ffb71f880483a93a2d896097185bee9e63e (diff) | |
| download | GT5-Unofficial-ed52e8c83916cac101e8dd50cfe179c23a6122b2.tar.gz GT5-Unofficial-ed52e8c83916cac101e8dd50cfe179c23a6122b2.tar.bz2 GT5-Unofficial-ed52e8c83916cac101e8dd50cfe179c23a6122b2.zip | |
+ Added proper components for the ENERGYCRYSTAL material.
+ Added proper components for the BLOODSTEEL material.
+ Added a feature to CoreItem.java that allows items to be replaced (easy deprecation of older items).
$ Fancied up the PlaceHolder Texture.
% Tweaked the recipe for the Maceration Stack Controller.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ALLOY.java | 16 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 6 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 56cc6d1343..b161ea0f4c 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -8,11 +8,16 @@ public final class ALLOY { new short[]{228, 255, 0, 0}, //Material Colour 5660, //Melting Point in C 0, //Boiling Point in C - 100, //Protons - 100, //Neutrons + 150, //Protons + 80, //Neutrons true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - null); + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().AER, 5), + new MaterialStack(ELEMENT.getInstance().IGNIS, 5), + new MaterialStack(ELEMENT.getInstance().TERRA, 5), + new MaterialStack(ELEMENT.getInstance().AQUA, 5) + }); public static final Material BLOODSTEEL = new Material( "Blood Steel", //Material Name @@ -23,7 +28,10 @@ public final class ALLOY { 100, //Neutrons false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. - null); + new MaterialStack[]{ + new MaterialStack(ALLOY.STEEL, 5), + new MaterialStack(ELEMENT.getInstance().IGNIS, 5) + }); 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 73d49e2694..b9719b44b0 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -91,4 +91,10 @@ public final class ELEMENT { public final Material URANIUM233 = new Material("Uranium-233", new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material + //Misc + + public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir); + public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire); + public final Material TERRA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth); + public final Material AQUA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater); } |