diff options
Diffstat (limited to 'src/main/java/goodgenerator')
| -rw-r--r-- | src/main/java/goodgenerator/items/GGMaterial.java | 21 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/MaterialFix.java | 64 |
2 files changed, 11 insertions, 74 deletions
diff --git a/src/main/java/goodgenerator/items/GGMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java index aeade9eb00..b87b022b2f 100644 --- a/src/main/java/goodgenerator/items/GGMaterial.java +++ b/src/main/java/goodgenerator/items/GGMaterial.java @@ -260,7 +260,7 @@ public class GGMaterial implements Runnable { new Pair<>(WerkstoffLoader.Thorium232, 1), new Pair<>(Fluorine, 4)); - // Atomic Separation Catalyst + // Orundum public static final Werkstoff orundum = new Werkstoff( new short[] { 0xcd, 0x26, 0x26 }, "Orundum", @@ -273,19 +273,20 @@ public class GGMaterial implements Runnable { OffsetID + 22, TextureSet.SET_DIAMOND); + // Atomic Separation Catalyst public static final Werkstoff atomicSeparationCatalyst = new Werkstoff( new short[] { 0xe8, 0x5e, 0x0c }, "Atomic Separation Catalyst", "the melting core...", new Werkstoff.Stats().setMeltingPoint(5000), Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() + new Werkstoff.GenerationFeatures().onlyDust() .addMolten() .addMetalItems() - .addSimpleMetalWorkingItems() .addCraftingMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), + .addSimpleMetalWorkingItems() + .addMultipleIngotMetalWorkingItems() + .addMetaSolidifierRecipes(), OffsetID + 21, TextureSet.SET_SHINY, new Pair<>(GGMaterial.orundum, 2), @@ -306,13 +307,13 @@ public class GGMaterial implements Runnable { .setSpeedOverride(100f) .setQualityOverride((byte) 11), Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() + new Werkstoff.GenerationFeatures().onlyDust() .addMolten() .addMetalItems() - .addSimpleMetalWorkingItems() .addCraftingMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), + .addSimpleMetalWorkingItems() + .addMultipleIngotMetalWorkingItems() + .addMetaSolidifierRecipes(), OffsetID + 23, TextureSet.SET_SHINY); @@ -1461,6 +1462,7 @@ public class GGMaterial implements Runnable { .addMolten() .addMetalItems() .addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems() .addMultipleIngotMetalWorkingItems() .addMetaSolidifierRecipes(), OffsetID + 110, @@ -1483,7 +1485,6 @@ public class GGMaterial implements Runnable { .addCraftingMetalWorkingItems() .addSimpleMetalWorkingItems() .addMultipleIngotMetalWorkingItems() - .addMetalCraftingSolidifierRecipes() .addMetaSolidifierRecipes(), OffsetID + 111, TextureSet.SET_SHINY); diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 8df7b3f4e6..25c945f9fe 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -20,36 +20,6 @@ import gregtech.api.util.GTUtility; public class MaterialFix { public static void MaterialFluidExtractionFix(Werkstoff material) { - if (material.hasItemType(OrePrefixes.ingot)) { - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot)) - .fluidOutputs(material.getMolten(144)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(8) - .addTo(fluidExtractionRecipes); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Ingot.get(0)) - .fluidInputs(material.getMolten(144)) - .itemOutputs(material.get(OrePrefixes.ingot)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(TierEU.RECIPE_MV / 2) - .addTo(fluidSolidifierRecipes); - } - if (material.hasItemType(OrePrefixes.plate)) { - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.plate)) - .fluidOutputs(material.getMolten(144)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(8) - .addTo(fluidExtractionRecipes); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Plate.get(0)) - .fluidInputs(material.getMolten(144)) - .itemOutputs(material.get(OrePrefixes.plate)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(TierEU.RECIPE_MV / 2) - .addTo(fluidSolidifierRecipes); - } if (material.hasItemType(OrePrefixes.gearGtSmall)) { GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.gearGtSmall)) @@ -58,14 +28,6 @@ public class MaterialFix { .eut(8) .addTo(fluidExtractionRecipes); } - if (material.hasItemType(OrePrefixes.stickLong)) { - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stickLong)) - .fluidOutputs(material.getMolten(144)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(8) - .addTo(fluidExtractionRecipes); - } if (material.hasItemType(OrePrefixes.spring)) { GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.spring)) @@ -74,14 +36,6 @@ public class MaterialFix { .eut(8) .addTo(fluidExtractionRecipes); } - if (material.hasItemType(OrePrefixes.stick)) { - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick)) - .fluidOutputs(material.getMolten(72)) - .duration(16 * TICKS) - .eut(8) - .addTo(fluidExtractionRecipes); - } if (material.hasItemType(OrePrefixes.itemCasing)) { GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.itemCasing)) @@ -163,14 +117,6 @@ public class MaterialFix { .eut(8) .addTo(fluidExtractionRecipes); } - if (material.hasItemType(OrePrefixes.nugget)) { - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.nugget)) - .fluidOutputs(material.getMolten(16)) - .duration(4 * TICKS) - .eut(8) - .addTo(fluidExtractionRecipes); - } if (material.hasItemType(OrePrefixes.rotor)) { GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.rotor)) @@ -338,16 +284,6 @@ public class MaterialFix { GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.stickLong, 1), new Object[] { "PhP", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GTValues.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.stick, 2)) - .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) - .duration( - Math.max( - tMaterial.getStats() - .getMass(), - 1L) * TICKS) - .eut(TierEU.RECIPE_LV / 2) - .addTo(hammerRecipes); } } if (tMaterial.hasItemType(OrePrefixes.spring)) { |