diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
6 files changed, 63 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 651b8e86d6..28683708ff 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -22,6 +22,7 @@ import java.util.Iterator; public class GT_ItemIterator implements Runnable { public void run() { + System.out.println("##### Started Item Iter"); GT_Log.out.println("GT_Mod: Scanning for certain kinds of compatible Machineblocks."); ItemStack tStack2; ItemStack tStack; @@ -180,7 +181,9 @@ public class GT_ItemIterator GT_OreDictUnificator.registerOre("bookThaumonomicon", new ItemStack(tItem, 1, 32767)); } if (tName.equals("item.ligniteCoal")) { + System.out.println("#### Started Lignite"); GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0)); + System.out.println("#### Ended Lignite"); } if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) { GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java new file mode 100644 index 0000000000..96dab0776c --- /dev/null +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -0,0 +1,21 @@ +package gregtech.loaders.materialprocessing; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; + +public class ProcessingConfig implements gregtech.api.interfaces.IMaterialRegistrator { + public ProcessingConfig() { + Materials.add(this); + } + + @Override + public void onMaterialsInit() { + int i = 0; + for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i < j; i++) { + String aID = (i < 10 ? "0" : "") + i; + new Materials(-1, TextureSet.SET_METALLIC, 1.0F, 0, 0, 0, 255, 255, 255, 0, "CustomMat" + aID, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, "custom", true, aID); + } + } +} diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java new file mode 100644 index 0000000000..afa95f5f1c --- /dev/null +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java @@ -0,0 +1,25 @@ +package gregtech.loaders.materialprocessing; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; + +public class ProcessingTest implements gregtech.api.interfaces.IMaterialRegistrator { + public ProcessingTest() { + Materials.add(this); + } + + /** + * Just a test class to fill the empty spaces in sGeneratedMaterials for performance testing. + * This is disabled in GT_Loader_MaterialProcessing, but can be enabled for testing. + */ + @Override + public void onMaterialsInit() { + for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) { + if (!Materials.USED_IDS.contains(i)) { + new Materials(i, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, 92, 0, 168, 0, "TestMat" + i, 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL, "testmat"); + } + } + } +} diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index b1526664f1..40cc5f1ac1 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -410,7 +410,7 @@ if(Loader.isModLoaded("Railcraft")){ GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lazurite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), ItemList.Circuit_Parts_Advanced.get(2L, new Object[0]), 32, 64); GT_Values.RA.addFormingPressRecipe(ItemList.Food_Dough_Sugar.get(4L, new Object[0]), ItemList.Shape_Mold_Cylinder.get(0L, new Object[0]), ItemList.Food_Raw_Cake.get(1L, new Object[0]), 384, 4); GT_Values.RA.addFormingPressRecipe(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L, new Object[0]), ItemList.Arrow_Head_Glass_Emtpy.get(1L, new Object[0]), 64, 4); - for (Materials tMat : Materials.MATERIALS.values()) { + for (Materials tMat : Materials.values()) { if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) { int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 92b458b43c..503cd729cb 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -462,7 +462,7 @@ public class GT_Loader_Item_Block_And_Fluid GT_Mod.gregtechproxy.addFluid("molten.redstone", "Molten Redstone", Materials.Redstone, 4, 500);
GT_Mod.gregtechproxy.addFluid("molten.blaze", "Molten Blaze", Materials.Blaze, 4, 6400);
GT_Mod.gregtechproxy.addFluid("molten.concrete", "Wet Concrete", Materials.Concrete, 4, 300);
- for (Materials tMaterial : Materials.MATERIALS.values()) {
+ for (Materials tMaterial : Materials.values()) {
if ((tMaterial.mStandardMoltenFluid == null) && (tMaterial.contains(SubTag.SMELTING_TO_FLUID)) && (!tMaterial.contains(SubTag.NO_SMELTING))) {
GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial);
if ((tMaterial.mSmeltInto != tMaterial) && (tMaterial.mSmeltInto.mStandardMoltenFluid == null)) {
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MaterialProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MaterialProcessing.java new file mode 100644 index 0000000000..c7b4c14e6b --- /dev/null +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MaterialProcessing.java @@ -0,0 +1,12 @@ +package gregtech.loaders.preload; + +import gregtech.api.util.GT_Log; +import gregtech.loaders.materialprocessing.ProcessingConfig; + +public class GT_Loader_MaterialProcessing implements Runnable { + public void run() { + GT_Log.out.println("GT_Mod: Register Material processing."); + new ProcessingConfig(); + //new ProcessingTest(); + } +} |