From 045beffe67d1d63f9c7f03c763899f62b53d3ce4 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Mon, 21 Aug 2017 10:36:36 +1000 Subject: % Did some things for GT style Oregen. --- .../core/material/gregtech/CustomGTMaterials.java | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java (limited to 'src/Java/gtPlusPlus/core/material/gregtech') diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java new file mode 100644 index 0000000000..ca7eb8fb61 --- /dev/null +++ b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java @@ -0,0 +1,58 @@ +package gtPlusPlus.core.material.gregtech; + +import static gregtech.api.enums.Materials.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Element; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TC_Aspects; +import gregtech.api.enums.TextureSet; +import gregtech.api.objects.MaterialStack; + +public class CustomGTMaterials { + + //public static Materials Fireclay = new MaterialBuilder(626, TextureSet.SET_ROUGH, "Fireclay").addDustItems().setRGB(173, 160, 155).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick, 1)).constructMaterial(); + + /**int aMetaItemSubID, + * TextureSet aIconSet, + * float aToolSpeed, + * int aDurability, + * int aToolQuality, + * boolean aUnificatable, + * String aName, String aDefaultLocalName, + * String aConfigSection, + * boolean aCustomOre, + * String aCustomID) { + + **/ + + public static Materials Zirconium = new Materials(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0, "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))); + + + public static Materials Geikielite = materialBuilder(1234, TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3))); + public static Materials Zirconolite = materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new MaterialStack(Oxygen, 7))); + + + public final static Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour, List composition){ + return new Materials( + ID, + texture, + 1.0F, + 0, + 2, + 1 |8 , + rgb[0], rgb[1], rgb[2], 0, + materialName, materialName, + 0, 0, -1, 0, false, false, 3, 1, 1, + dyeColour, + 1, + composition + ); + } + + +} -- cgit From 4a73cba607d396ec7bd81bbbc65e3acc48e6100f Mon Sep 17 00:00:00 2001 From: Alkalus Date: Wed, 23 Aug 2017 07:42:13 +1000 Subject: % More work on Internal GT Material Adder. --- .../core/material/gregtech/CustomGTMaterials.java | 41 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'src/Java/gtPlusPlus/core/material/gregtech') diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java index ca7eb8fb61..2e1882ae57 100644 --- a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java +++ b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java @@ -10,7 +10,9 @@ import gregtech.api.enums.Dyes; import gregtech.api.enums.Element; import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; +import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.enums.TextureSet; +import gregtech.api.interfaces.IMaterialHandler; import gregtech.api.objects.MaterialStack; public class CustomGTMaterials { @@ -30,15 +32,19 @@ public class CustomGTMaterials { **/ - public static Materials Zirconium = new Materials(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0, "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))); - + public static List Custom_GT_Materials = new ArrayList(); + public static Materials Zirconium = materialBuilder_Element(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0, "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))); public static Materials Geikielite = materialBuilder(1234, TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3))); public static Materials Zirconolite = materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new MaterialStack(Oxygen, 7))); + private final static boolean registerMaterial(Materials r){ + Custom_GT_Materials.add(r); + return true; + } - public final static Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour, List composition){ - return new Materials( + public final static Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour, List composition){ + Materials newMat = new Materials( ID, texture, 1.0F, @@ -51,7 +57,32 @@ public class CustomGTMaterials { dyeColour, 1, composition - ); + ); + registerMaterial(newMat); + return newMat; + } + + public final static Materials materialBuilder_Element( + int ID, TextureSet texture, + float a, int b, int c, + int d, int r2, int g2, int b2, int a2, + String materialName, String e, + int f, int g, int h, int i, + boolean j, boolean k, + int l, int m, int n, + Dyes dyeColour, Element o, + List aspects){ + Materials newMat = new Materials( + ID, texture, + a, b, c, + d, r2, g2, b2, a2, + materialName, e, + f, g, h, i, j, k, l, m, n, + dyeColour, o, + aspects + ); + registerMaterial(newMat); + return newMat; } -- cgit From e870a5924f1715a7ccac4242b10eb415dde4b483 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Wed, 23 Aug 2017 08:00:23 +1000 Subject: % Time to start working on the Thorium Reactor again. + Added material logging. --- src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Java/gtPlusPlus/core/material/gregtech') diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java index 2e1882ae57..1d8927e87a 100644 --- a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java +++ b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java @@ -14,6 +14,7 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.enums.TextureSet; import gregtech.api.interfaces.IMaterialHandler; import gregtech.api.objects.MaterialStack; +import gtPlusPlus.core.util.Utils; public class CustomGTMaterials { @@ -40,6 +41,7 @@ public class CustomGTMaterials { private final static boolean registerMaterial(Materials r){ Custom_GT_Materials.add(r); + Utils.LOG_INFO("Registered new Gregtech material - "+r.mName); return true; } -- cgit From a39d264c0d3014fea0f73d20618093268420faaa Mon Sep 17 00:00:00 2001 From: Alkalus Date: Wed, 23 Aug 2017 15:24:35 +1000 Subject: + Added LFTR block recipes. + Added LFTR Control Circuit. $ Changed Material logging. Fixes #126. --- src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/material/gregtech') diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java index 1d8927e87a..2b9cec5ff1 100644 --- a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java +++ b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java @@ -39,9 +39,13 @@ public class CustomGTMaterials { public static Materials Geikielite = materialBuilder(1234, TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3))); public static Materials Zirconolite = materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new MaterialStack(Oxygen, 7))); + public static final void run(){ + Utils.LOG_INFO("Trying to initialise custom materials."); + } + private final static boolean registerMaterial(Materials r){ Custom_GT_Materials.add(r); - Utils.LOG_INFO("Registered new Gregtech material - "+r.mName); + Utils.LOG_INFO("[Custom] Registered new Gregtech material - "+r.mName); return true; } -- cgit From f38f753e2f20dc0748313a9f5b287b15951d6106 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Wed, 23 Aug 2017 15:45:10 +1000 Subject: + Added recipes for Pollution Cleaners/Detector. % Tweaked LFTR related recipes. --- src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/material/gregtech') diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java index 2b9cec5ff1..96a4b34d98 100644 --- a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java +++ b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java @@ -40,7 +40,7 @@ public class CustomGTMaterials { public static Materials Zirconolite = materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new MaterialStack(Oxygen, 7))); public static final void run(){ - Utils.LOG_INFO("Trying to initialise custom materials."); + Utils.LOG_INFO("[Custom] Trying to initialise custom materials."); } private final static boolean registerMaterial(Materials r){ -- cgit