diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
3 files changed, 20 insertions, 17 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 84cbbb0d1b..89c7c18eee 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -21,20 +21,23 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle @Override public void onComponentRegistration(Materials aMaterial) { - /** This is just left here as an example of how to add components. - switch (aMaterial.mName) { - case "Cobalt": - OrePrefixes.spring.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotDouble.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotTriple.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotQuadruple.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotQuintuple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateDouble.mDisabledItems.remove(aMaterial); - OrePrefixes.plateTriple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateQuintuple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateDense.mDisabledItems.remove(aMaterial); - break; - }**/ + /** This is just left here as an example of how to add components. **/ + + /*Enabling/Disabling components depending on the current Materials values: + if ((aMaterial.mTypes & 0x40) != 0) { //This material can be made into tool heads + OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); + } */ + + /* Enabling specific components: + OrePrefixes.spring.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotDouble.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotTriple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotQuadruple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotQuintuple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateDouble.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateTriple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateQuadruple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateQuintuple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateDense.mDisabledItems.remove(Materials.Cobalt); */ } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index 653f1b920f..40d69c8015 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -52,7 +52,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } if (!aNoSmashing) { - GT_Values.RA.addWiremillRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_Utility.copy(new Object[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 8L)}), 100, 4); + GT_Values.RA.addWiremillRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), 100, 4); GT_Values.RA.addForgeHammerRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), (int) Math.max(aMaterialMass, 1L), 16); GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), (int) Math.max(aMaterialMass * 1L, 1L), 24); GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L), (int) Math.max(aMaterialMass * 2L, 1L), 96); 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 5ff61c8683..a7933bb0d6 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 @@ -465,7 +465,7 @@ public class GT_Loader_Item_Block_And_Fluid 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.values()) {
- if ((tMaterial.mStandardMoltenFluid == null) && (tMaterial.contains(SubTag.SMELTING_TO_FLUID)) && (!tMaterial.contains(SubTag.NO_SMELTING))) {
+ if ((tMaterial.mMetaItemSubID > 0) && (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)) {
GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial.mSmeltInto);
|