diff options
13 files changed, 18 insertions, 351 deletions
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java index 3637385328..57f17c37dc 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java @@ -16,8 +16,6 @@ package bartworks.system.material.werkstoff_loaders.recipe; import static gregtech.api.enums.OrePrefixes.block; import static gregtech.api.enums.OrePrefixes.cellMolten; import static gregtech.api.enums.OrePrefixes.ingot; -import static gregtech.api.enums.OrePrefixes.plate; -import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; @@ -26,7 +24,6 @@ import static gregtech.api.util.GTRecipeConstants.UniversalArcFurnace; import bartworks.system.material.Werkstoff; import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; import gregtech.api.enums.GTValues; -import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeCategories; import gregtech.api.util.GTRecipeConstants; @@ -55,19 +52,5 @@ public class BlockLoader implements IWerkstoffRunnable { .addTo(fluidExtractionRecipes); } - if (werkstoff.hasItemType(plate)) { - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(block)) - .itemOutputs(werkstoff.get(plate, 9)) - .duration( - (int) Math.max( - werkstoff.getStats() - .getMass() * 10L, - 1L)) - .eut(TierEU.RECIPE_LV) - .addTo(cutterRecipes); - - } } } diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java index 5512274260..a7e33b23e0 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java @@ -15,9 +15,6 @@ package bartworks.system.material.werkstoff_loaders.recipe; import static gregtech.api.enums.OrePrefixes.bolt; import static gregtech.api.enums.OrePrefixes.cellMolten; -import static gregtech.api.enums.OrePrefixes.dust; -import static gregtech.api.enums.OrePrefixes.dustSmall; -import static gregtech.api.enums.OrePrefixes.dustTiny; import static gregtech.api.enums.OrePrefixes.gearGt; import static gregtech.api.enums.OrePrefixes.gearGtSmall; import static gregtech.api.enums.OrePrefixes.gem; @@ -32,10 +29,8 @@ import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; -import static gregtech.api.util.GTRecipeBuilder.TICKS; import bartworks.system.material.Werkstoff; import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; @@ -80,13 +75,6 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { .eut(4) .addTo(cutterRecipes); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(bolt)) - .itemOutputs(werkstoff.get(dustTiny, 1)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - // screw GTValues.RA.stdBuilder() @@ -105,13 +93,6 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { GTProxy.tBits, new Object[] { "fX", "X ", 'X', werkstoff.get(bolt) }); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(screw)) - .itemOutputs(werkstoff.get(dustTiny, 1)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - if (werkstoff.hasItemType(gem)) return; // ring @@ -252,35 +233,6 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { * WerkstoffLoader.rotorMold.get(0L), werkstoff.getMolten(612), werkstoff.get(rotor), 100, 60); */ } - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gearGt)) - .itemOutputs(werkstoff.get(dust, 4)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gearGtSmall)) - .itemOutputs(werkstoff.get(dust, 1)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(rotor)) - .itemOutputs(werkstoff.get(dust, 4), werkstoff.get(dustSmall)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ring)) - .itemOutputs(werkstoff.get(dustSmall, 1)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - } } } diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java index 53da59aceb..e83af7ad46 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java @@ -13,12 +13,10 @@ package bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.block; import static gregtech.api.enums.OrePrefixes.cell; import static gregtech.api.enums.OrePrefixes.dust; import static gregtech.api.enums.OrePrefixes.dustSmall; import static gregtech.api.enums.OrePrefixes.dustTiny; -import static gregtech.api.enums.OrePrefixes.gem; import static gregtech.api.enums.OrePrefixes.ingot; import static gregtech.api.enums.OrePrefixes.ingotHot; import static gregtech.api.enums.OrePrefixes.nugget; @@ -513,16 +511,6 @@ public class DustLoader implements IWerkstoffRunnable { .addTo(maceratorRecipes); } - if (werkstoff.hasItemType(ingot) || werkstoff.hasItemType(gem)) { - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(block)) - .itemOutputs(werkstoff.get(dust, 9)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - } } } } diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java index cc21110a14..db31c11f0f 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java @@ -28,7 +28,6 @@ import static gregtech.api.enums.OrePrefixes.ore; import static gregtech.api.enums.OrePrefixes.plate; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; -import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; @@ -36,24 +35,20 @@ import static gregtech.api.recipe.RecipeMaps.sifterRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; -import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import bartworks.system.material.Werkstoff; -import bartworks.system.material.WerkstoffLoader; import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; import bartworks.util.BWColorUtil; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; -import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; import gregtech.api.util.GTModHandler; -import gregtech.api.util.GTOreDictUnificator; import gregtech.common.covers.CoverLens; public class GemLoader implements IWerkstoffRunnable { @@ -181,48 +176,6 @@ public class GemLoader implements IWerkstoffRunnable { .eut(16) .addTo(hammerRecipes); - if (!werkstoff.contains(WerkstoffLoader.NO_BLAST)) { - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemFlawless, 3)) - .itemOutputs(werkstoff.get(gemExquisite), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS) - .eut(TierEU.RECIPE_LV) - .metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gem, 3)) - .itemOutputs(werkstoff.get(gemFlawless), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS) - .eut(TierEU.RECIPE_LV) - .metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemFlawed, 3)) - .itemOutputs(werkstoff.get(gem), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS) - .eut(TierEU.RECIPE_LV) - .metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemChipped, 3)) - .itemOutputs(werkstoff.get(gemFlawed), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS) - .eut(TierEU.RECIPE_LV) - .metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(dust, 4)) - .itemOutputs(werkstoff.get(gem, 3), GTOreDictUnificator.get(dustTiny, Materials.DarkAsh, 8)) - .duration(20 * TICKS) - .eut(TierEU.RECIPE_LV) - .metadata(ADDITIVE_AMOUNT, 24) - .addTo(implosionRecipes); - } - if (werkstoff.hasItemType(plate)) { GTValues.RA.stdBuilder() diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java index 53c25b4ab0..c457c36d36 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java @@ -15,9 +15,7 @@ package bartworks.system.material.werkstoff_loaders.recipe; import static gregtech.api.enums.OrePrefixes.block; import static gregtech.api.enums.OrePrefixes.ingot; -import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; -import static gregtech.api.util.GTRecipeBuilder.SECONDS; import bartworks.system.material.Werkstoff; import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; @@ -32,13 +30,6 @@ public class MetalLoader implements IWerkstoffRunnable { public void run(Werkstoff werkstoff) { if (werkstoff.hasItemType(ingot)) { GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot, 9)) - .itemOutputs(werkstoff.get(block)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GTValues.RA.stdBuilder() .itemInputs(werkstoff.get(ingot, 9), ItemList.Shape_Extruder_Block.get(0)) .itemOutputs(werkstoff.get(block)) .duration( diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java index ad10153e0b..60869619a4 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java @@ -14,7 +14,6 @@ package bartworks.system.material.werkstoff_loaders.recipe; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.OrePrefixes.block; import static gregtech.api.enums.OrePrefixes.bolt; import static gregtech.api.enums.OrePrefixes.capsuleMolten; import static gregtech.api.enums.OrePrefixes.cellMolten; @@ -130,18 +129,6 @@ public class MoltenCellLoader implements IWerkstoffRunnable { .getMass() > 128 ? 64 : 30) .addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Block.get(0)) - .itemOutputs(werkstoff.get(block)) - .fluidInputs(werkstoff.getMolten(1296)) - .duration( - (int) werkstoff.getStats() - .getMass() * 9) - .eut( - werkstoff.getStats() - .getMass() > 128 ? 64 : 30) - .addTo(fluidSolidifierRecipes); - if (!werkstoff.hasItemType(plate)) { return; } diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java index 25e49b0666..7d8138ceef 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java @@ -13,19 +13,15 @@ package bartworks.system.material.werkstoff_loaders.recipe; -import static gregtech.api.enums.OrePrefixes.dust; import static gregtech.api.enums.OrePrefixes.ingot; import static gregtech.api.enums.OrePrefixes.plateDense; import static gregtech.api.enums.OrePrefixes.plateDouble; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GTRecipeBuilder.TICKS; import net.minecraft.item.ItemStack; import bartworks.system.material.Werkstoff; import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; import gregtech.api.GregTechAPI; -import gregtech.api.enums.GTValues; import gregtech.api.recipe.RecipeMaps; import gregtech.api.render.TextureFactory; import gregtech.api.util.GTRecipe; @@ -55,14 +51,6 @@ public class MultipleMetalLoader implements IWerkstoffRunnable { werkstoff.get(plateDouble), TextureFactory.of(werkstoff.getTexSet().mTextures[72], werkstoff.getRGBA(), false), null); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(plateDouble)) - .itemOutputs(werkstoff.get(dust, 2)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - } } } diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java index 1fa51359d9..a2c9c243a8 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java @@ -16,21 +16,17 @@ package bartworks.system.material.werkstoff_loaders.recipe; import static gregtech.api.enums.OrePrefixes.block; import static gregtech.api.enums.OrePrefixes.dust; import static gregtech.api.enums.OrePrefixes.dustSmall; -import static gregtech.api.enums.OrePrefixes.foil; import static gregtech.api.enums.OrePrefixes.gem; import static gregtech.api.enums.OrePrefixes.ingot; import static gregtech.api.enums.OrePrefixes.plate; import static gregtech.api.enums.OrePrefixes.stick; import static gregtech.api.enums.OrePrefixes.stickLong; -import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.util.GTRecipeBuilder.TICKS; -import net.minecraft.item.ItemStack; - import bartworks.API.SideReference; import bartworks.client.textures.PrefixTextureLinker; import bartworks.system.material.Werkstoff; @@ -42,8 +38,6 @@ import gregtech.api.enums.TextureSet; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; import gregtech.api.util.GTModHandler; -import gregtech.api.util.GTRecipe; -import gregtech.api.util.GTUtility; import gregtech.common.GTProxy; public class SimpleMetalLoader implements IWerkstoffRunnable { @@ -101,89 +95,12 @@ public class SimpleMetalLoader implements IWerkstoffRunnable { return; } - GTModHandler.addCraftingRecipe( - werkstoff.get(stick, 2), - GTProxy.tBits, - new Object[] { "s", "X", 'X', werkstoff.get(stickLong) }); - GTModHandler.addCraftingRecipe( - werkstoff.get(stick), - GTProxy.tBits, - new Object[] { "f ", " X", 'X', werkstoff.get(ingot) }); - GTModHandler.addCraftingRecipe( - werkstoff.get(plate), - GTProxy.tBits, - new Object[] { "h", "X", "X", 'X', werkstoff.get(ingot) }); - GTModHandler.addCraftingRecipe( - werkstoff.get(foil, 2), - GTProxy.tBits, - new Object[] { "hX", 'X', werkstoff.get(plate) }); - - benderRecipes.add( - new GTRecipe( - true, - new ItemStack[] { werkstoff.get(ingot), GTUtility.getIntegratedCircuit(1) }, - new ItemStack[] { werkstoff.get(plate) }, - null, - null, - null, - null, - (int) Math.max( - werkstoff.getStats() - .getMass(), - 1L), - 24, - 0)); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot, 3)) - .itemOutputs(werkstoff.get(plate, 2)) - .duration( - (int) Math.max( - werkstoff.getStats() - .getMass(), - 1L)) - .eut(16) - .addTo(hammerRecipes); - GregTechAPI.registerCover( werkstoff.get(plate), TextureFactory.of(werkstoff.getTexSet().mTextures[71], werkstoff.getRGBA(), false), null); GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot)) - .itemOutputs(werkstoff.get(stick), werkstoff.get(dustSmall, 2)) - .duration( - (int) Math.max( - werkstoff.getStats() - .getMass() * 5L, - 1L)) - .eut(16) - .addTo(latheRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(plate), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(werkstoff.get(foil, 4)) - .duration( - (int) Math.max( - werkstoff.getStats() - .getMass() * 1L, - 1L)) - .eut(24) - .addTo(benderRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot), GTUtility.getIntegratedCircuit(10)) - .itemOutputs(werkstoff.get(foil, 4)) - .duration( - (int) Math.max( - werkstoff.getStats() - .getMass() * 2L, - 1L)) - .eut(24) - .addTo(benderRecipes); - - GTValues.RA.stdBuilder() .itemInputs(werkstoff.get(stick, 2)) .itemOutputs(werkstoff.get(stickLong)) .duration( @@ -215,35 +132,6 @@ public class SimpleMetalLoader implements IWerkstoffRunnable { 1L)) .eut(45) .addTo(extruderRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot)) - .itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(plate)) - .itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(stickLong)) - .itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(stick)) - .itemOutputs(werkstoff.get(dustSmall, 2)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - } } } 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)) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index b4db15db42..68a237239a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.recipe.RecipeMaps.brewingRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; @@ -55,7 +56,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.tea"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(brewingRecipes); + .addTo(mixerRecipes); } } case "cropGrape" -> { @@ -66,7 +67,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.grapejuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(brewingRecipes); + .addTo(mixerRecipes); } } case "cropChilipepper" -> GTValues.RA.stdBuilder() @@ -103,7 +104,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.potatojuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(brewingRecipes); + .addTo(mixerRecipes); } } case "cropLemon" -> { @@ -121,7 +122,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.lemonjuice"), 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) - .addTo(brewingRecipes); + .addTo(mixerRecipes); } GTValues.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 78a51727af..a8912411ea 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -120,6 +120,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr .addTo(compressorRecipes); } // This is so disgustingly bad. + // It really is. if (((OrePrefixes.block.isIgnored(aMaterial)) || (null == GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) @@ -131,7 +132,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper) && (aMaterial != MaterialsUEVplus.TranscendentMetal) - && (aMaterial != Materials.Clay)) { + && (aMaterial != Materials.Clay && (aMaterial != Materials.Wood))) { // compressor recipe { if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 3fff4d57aa..05e6aaeeb3 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -45,7 +45,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTRecipeConstants; -import gregtech.api.util.GTRecipeRegistrator; import gregtech.api.util.GTUtility; public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -528,7 +527,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .eut(calculateRecipeEU(aMaterial, 16)) .addTo(cutterRecipes); } - GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); } private void registerPlateAlloy(final String aOreDictName, final ItemStack aStack) { |