diff options
30 files changed, 183 insertions, 694 deletions
diff --git a/src/main/java/bartworks/system/material/Werkstoff.java b/src/main/java/bartworks/system/material/Werkstoff.java index 1c29d52a92..d9b6b4503c 100644 --- a/src/main/java/bartworks/system/material/Werkstoff.java +++ b/src/main/java/bartworks/system/material/Werkstoff.java @@ -1089,8 +1089,29 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { private double ebfGasRecipeTimeMultiplier = -1.0; private double ebfGasRecipeConsumedAmountMultiplier = 1.0; + private boolean autoGenerateBlastFurnaceRecipes = true; + private boolean autoGenerateVacuumFreezerRecipes = true; + float durMod = 1f; + public boolean autoGenerateBlastFurnaceRecipes() { + return autoGenerateBlastFurnaceRecipes; + } + + public boolean autoGenerateVacuumFreezerRecipes() { + return autoGenerateVacuumFreezerRecipes; + } + + public Werkstoff.Stats disableAutoGeneratedBlastFurnaceRecipes() { + autoGenerateBlastFurnaceRecipes = false; + return this; + } + + public Werkstoff.Stats disableAutoGeneratedVacuumFreezerRecipes() { + autoGenerateVacuumFreezerRecipes = false; + return this; + } + public float getDurMod() { return this.durMod; } 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 e83af7ad46..ab7a2167aa 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 @@ -61,14 +61,14 @@ public class DustLoader implements IWerkstoffRunnable { List<FluidStack> flOutputs = new ArrayList<>(); List<ItemStack> stOutputs = new ArrayList<>(); HashMap<ISubTagContainer, Pair<Integer, Integer>> tracker = new HashMap<>(); + + Werkstoff.Stats werkstoffStats = werkstoff.getStats(); + int cells = 0; if (werkstoff.getGenerationFeatures() - .hasMixerRecipes() - || werkstoff.getStats() - .isElektrolysis() - || werkstoff.getStats() - .isCentrifuge() + .hasMixerRecipes() || werkstoffStats.isElektrolysis() + || werkstoffStats.isCentrifuge() || werkstoff.getGenerationFeatures() .hasChemicalRecipes()) { for (Pair<ISubTagContainer, Integer> container : werkstoff.getContents() @@ -182,8 +182,7 @@ public class DustLoader implements IWerkstoffRunnable { ItemStack input = werkstoff.get(dust); input.stackSize = werkstoff.getContents() .getKey(); - if (werkstoff.getStats() - .isElektrolysis()) { + if (werkstoffStats.isElektrolysis()) { GTRecipe tRecipe = new GTRecipe( true, new ItemStack[] { input, cells > 0 ? Materials.Empty.getCells(cells) : null }, @@ -195,11 +194,9 @@ public class DustLoader implements IWerkstoffRunnable { (int) Math.max( 1L, Math.abs( - werkstoff.getStats() - .getProtons() - / werkstoff.getContents() - .getValue() - .size())), + werkstoffStats.getProtons() / werkstoff.getContents() + .getValue() + .size())), Math.min( 4, werkstoff.getContents() @@ -210,8 +207,7 @@ public class DustLoader implements IWerkstoffRunnable { RecipeMaps.electrolyzerRecipes.add(tRecipe); RecipeMaps.electrolyzerNonCellRecipes.add(tRecipe); } - if (werkstoff.getStats() - .isCentrifuge()) { + if (werkstoffStats.isCentrifuge()) { RecipeMaps.centrifugeRecipes.add( new GTRecipe( true, @@ -224,11 +220,9 @@ public class DustLoader implements IWerkstoffRunnable { (int) Math.max( 1L, Math.abs( - werkstoff.getStats() - .getMass() - / werkstoff.getContents() - .getValue() - .size())), + werkstoffStats.getMass() / werkstoff.getContents() + .getValue() + .size())), Math.min( 4, werkstoff.getContents() @@ -247,11 +241,9 @@ public class DustLoader implements IWerkstoffRunnable { (int) Math.max( 1L, Math.abs( - werkstoff.getStats() - .getProtons() - / werkstoff.getContents() - .getValue() - .size())), + werkstoffStats.getProtons() / werkstoff.getContents() + .getValue() + .size())), Math.min( 4, werkstoff.getContents() @@ -272,11 +264,9 @@ public class DustLoader implements IWerkstoffRunnable { (int) Math.max( 1L, Math.abs( - werkstoff.getStats() - .getProtons() - / werkstoff.getContents() - .getValue() - .size()))) + werkstoffStats.getProtons() / werkstoff.getContents() + .getValue() + .size()))) .eut( Math.min( 4, @@ -304,11 +294,9 @@ public class DustLoader implements IWerkstoffRunnable { (int) Math.max( 1L, Math.abs( - werkstoff.getStats() - .getMass() - / werkstoff.getContents() - .getValue() - .size())), + werkstoffStats.getMass() / werkstoff.getContents() + .getValue() + .size())), Math.min( 4, werkstoff.getContents() @@ -327,11 +315,9 @@ public class DustLoader implements IWerkstoffRunnable { (int) Math.max( 1L, Math.abs( - werkstoff.getStats() - .getProtons() - / werkstoff.getContents() - .getValue() - .size())), + werkstoffStats.getProtons() / werkstoff.getContents() + .getValue() + .size())), Math.min( 4, werkstoff.getContents() @@ -384,112 +370,67 @@ public class DustLoader implements IWerkstoffRunnable { .eut(4) .addTo(packagerRecipes); - if (werkstoff.hasItemType(ingot) && !werkstoff.getStats() - .isBlastFurnace()) { + if (werkstoff.hasItemType(ingot) && !werkstoffStats.isBlastFurnace()) { GTModHandler.addSmeltingRecipe(werkstoff.get(dust), werkstoff.get(ingot)); GTModHandler.addSmeltingRecipe(werkstoff.get(dustTiny), werkstoff.get(nugget)); - } else if (werkstoff.hasItemType(ingot) && werkstoff.getStats() - .isBlastFurnace() - && werkstoff.getStats() - .getMeltingPoint() != 0) { - if (werkstoff.contains(WerkstoffLoader.ANAEROBE_SMELTING)) { - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11)) - .itemOutputs( - werkstoff.getStats() - .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot)) - .fluidInputs(Materials.Nitrogen.getGas(1000)) - .duration( - Math.max( - werkstoff.getStats() - .getMass() / 40L, - 1L) - * werkstoff.getStats() - .getMeltingPoint()) - .eut( - werkstoff.getStats() - .getMeltingVoltage()) - .metadata( - COIL_HEAT, - werkstoff.getStats() - .getMeltingPoint()) - .addTo(blastFurnaceRecipes); + } else if (werkstoff.hasItemType(ingot) && werkstoffStats.isBlastFurnace() + && werkstoffStats.getMeltingPoint() != 0 + && werkstoffStats.autoGenerateBlastFurnaceRecipes()) { + if (werkstoff.contains(WerkstoffLoader.ANAEROBE_SMELTING)) { + GTValues.RA.stdBuilder() + .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11)) + .itemOutputs( + werkstoffStats.getMeltingPoint() < 1750 ? werkstoff.get(ingot) + : werkstoff.get(ingotHot)) + .fluidInputs(Materials.Nitrogen.getGas(1000)) + .duration(Math.max(werkstoffStats.getMass() / 40L, 1L) * werkstoffStats.getMeltingPoint()) + .eut(werkstoffStats.getMeltingVoltage()) + .metadata(COIL_HEAT, werkstoffStats.getMeltingPoint()) + .addTo(blastFurnaceRecipes); - } else if (werkstoff.contains(WerkstoffLoader.NOBLE_GAS_SMELTING)) { - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11)) - .itemOutputs( - werkstoff.getStats() - .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot)) - .fluidInputs(Materials.Argon.getGas(1000)) - .duration( - Math.max( - werkstoff.getStats() - .getMass() / 40L, - 1L) - * werkstoff.getStats() - .getMeltingPoint()) - .eut( - werkstoff.getStats() - .getMeltingVoltage()) - .metadata( - COIL_HEAT, - werkstoff.getStats() - .getMeltingPoint()) - .addTo(blastFurnaceRecipes); + } else if (werkstoff.contains(WerkstoffLoader.NOBLE_GAS_SMELTING)) { + GTValues.RA.stdBuilder() + .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11)) + .itemOutputs( + werkstoffStats.getMeltingPoint() < 1750 ? werkstoff.get(ingot) + : werkstoff.get(ingotHot)) + .fluidInputs(Materials.Argon.getGas(1000)) + .duration(Math.max(werkstoffStats.getMass() / 40L, 1L) * werkstoffStats.getMeltingPoint()) + .eut(werkstoffStats.getMeltingVoltage()) + .metadata(COIL_HEAT, werkstoffStats.getMeltingPoint()) + .addTo(blastFurnaceRecipes); - } else { + } else { + GTValues.RA.stdBuilder() + .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(1)) + .itemOutputs( + werkstoffStats.getMeltingPoint() < 1750 ? werkstoff.get(ingot) + : werkstoff.get(ingotHot)) + .duration(Math.max(werkstoffStats.getMass() / 40L, 1L) * werkstoffStats.getMeltingPoint()) + .eut(werkstoffStats.getMeltingVoltage()) + .metadata(COIL_HEAT, werkstoffStats.getMeltingPoint()) + .addTo(blastFurnaceRecipes); + + if (werkstoffStats.getMeltingPoint() <= 1000) { GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(1)) - .itemOutputs( - werkstoff.getStats() - .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot)) + .itemInputs(werkstoff.get(dust)) + .itemOutputs(werkstoff.get(ingot)) .duration( - Math.max( - werkstoff.getStats() - .getMass() / 40L, - 1L) - * werkstoff.getStats() - .getMeltingPoint()) - .eut( - werkstoff.getStats() - .getMeltingVoltage()) - .metadata( - COIL_HEAT, - werkstoff.getStats() - .getMeltingPoint()) - .addTo(blastFurnaceRecipes); - - if (werkstoff.getStats() - .getMeltingPoint() <= 1000) { - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(dust)) - .itemOutputs(werkstoff.get(ingot)) - .duration( - (int) Math.max( - werkstoff.getStats() - .getMass() / 40L, - 1L) * werkstoff.getStats() - .getMeltingPoint()) - .eut(0) - .metadata(ADDITIVE_AMOUNT, 9) - .addTo(primitiveBlastRecipes); - } + (int) Math.max(werkstoffStats.getMass() / 40L, 1L) + * werkstoffStats.getMeltingPoint()) + .eut(0) + .metadata(ADDITIVE_AMOUNT, 9) + .addTo(primitiveBlastRecipes); } } + } - if (werkstoff.getStats() - .isBlastFurnace() - && werkstoff.getStats() - .getMeltingPoint() > 1750) { + if (werkstoffStats.isBlastFurnace() && werkstoffStats.getMeltingPoint() > 1750 + && werkstoffStats.autoGenerateVacuumFreezerRecipes()) { GTValues.RA.stdBuilder() .itemInputs(werkstoff.get(ingotHot)) .itemOutputs(werkstoff.get(ingot)) - .duration( - (int) Math.max( - werkstoff.getStats() - .getMass() * 3L, - 1L)) + .duration((int) Math.max(werkstoffStats.getMass() * 3L, 1L)) .eut(TierEU.RECIPE_MV) .addTo(vacuumFreezerRecipes); } diff --git a/src/main/java/goodgenerator/items/GGMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java index f61aad5876..ca26cfe986 100644 --- a/src/main/java/goodgenerator/items/GGMaterial.java +++ b/src/main/java/goodgenerator/items/GGMaterial.java @@ -305,7 +305,9 @@ public class GGMaterial implements Runnable { .setRadioactive(true) .setDurOverride(180224) .setSpeedOverride(100f) - .setQualityOverride((byte) 11), + .setQualityOverride((byte) 11) + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedVacuumFreezerRecipes(), Werkstoff.Types.ELEMENT, new Werkstoff.GenerationFeatures().onlyDust() .addMolten() diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index c43ffb58c6..2b4d79c3f0 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1272,16 +1272,6 @@ public class RecipeLoader { .addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder() - .itemInputs( - GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .metadata(COIL_HEAT, 7000) - .addTo(blastFurnaceRecipes); - - GTValues.RA.stdBuilder() .itemInputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1)) .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1)) .duration(20 * SECONDS) diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java index 707c6fc11a..1301ac97f5 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader2.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java @@ -104,14 +104,12 @@ public class RecipeLoader2 { .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.extremelyUnstableNaquadah, 8000, 122880, 7000, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 500, 480, 2800, true); - CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 513, 480, 2800, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 500, 480, 2800, true); - CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 513, 480, 2800, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.incoloy903, 1200, 1920, 3700, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.adamantiumAlloy, 2500, 1920, 5500, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 200, 7680, 5000, true); - CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 220, 7680, 5000, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.signalium, 1600, 30720, 4000, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.lumiium, 1600, 30720, 4000, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.artheriumSn, 500, 122880, 6500, true); @@ -1334,6 +1332,7 @@ public class RecipeLoader2 { GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2), GGMaterial.marM200.get(OrePrefixes.plateDouble, 2), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), + MaterialsElements.getInstance().RUTHENIUM.getBolt(32), GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8)) .fluidInputs(GGMaterial.zircaloy4.getMolten(576)) diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 25c945f9fe..065a01b223 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -3,7 +3,6 @@ package goodgenerator.util; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; -import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; @@ -317,12 +316,5 @@ public class MaterialFix { .addTo(benderRecipes); } } - Materials tUHV = Materials.Longasssuperconductornameforuhvwire; - GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) - .duration(Math.max(tUHV.getMass(), 1L) * TICKS) - .eut(TierEU.RECIPE_LV / 2) - .addTo(hammerRecipes); } } diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 9b60b6846a..95463122f1 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -382,8 +382,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Nano = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Nano" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 11))); public static Materials Piko = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Piko" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 12))); - public static Materials Quantum = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Quantum" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 13))); - /** * Aliases for the old style of tiered circuits diff --git a/src/main/java/gregtech/api/enums/MaterialsGTNH.java b/src/main/java/gregtech/api/enums/MaterialsGTNH.java index 12a53f6b86..8a3b7f9660 100644 --- a/src/main/java/gregtech/api/enums/MaterialsGTNH.java +++ b/src/main/java/gregtech/api/enums/MaterialsGTNH.java @@ -199,29 +199,6 @@ public class MaterialsGTNH implements IMaterialHandler { 1, 1, Dyes.dyeYellow); - public static Materials Quantum = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "Quantum", - "Quantum", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeWhite); public static Materials Turquoise = new Materials( -1, TextureSet.SET_NONE, diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index 77e49e37c7..197c15875d 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -676,10 +676,6 @@ public final class RecipeMaps { .setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount)) .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount)) .setDuration(aDuration * 10); - coll.derive() - .setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount)) - .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount)) - .setDuration(aDuration * 10); } if (Railcraft.isModLoaded()) { coll.derive() @@ -794,7 +790,6 @@ public final class RecipeMaps { public static final RecipeMap<RecipeMapBackend> chemicalReactorRecipes = RecipeMapBuilder .of("gt.recipe.chemicalreactor") .maxIO(2, 2, 1, 1) - .minInputs(1, 0) .slotOverlays((index, isFluid, isOutput, isSpecial) -> { if (isFluid) { if (isOutput) { diff --git a/src/main/java/gregtech/api/util/GTForestryCompat.java b/src/main/java/gregtech/api/util/GTForestryCompat.java index 379604205a..ca61c955c7 100644 --- a/src/main/java/gregtech/api/util/GTForestryCompat.java +++ b/src/main/java/gregtech/api/util/GTForestryCompat.java @@ -1,6 +1,5 @@ package gregtech.api.util; -import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -16,6 +15,7 @@ import forestry.api.recipes.RecipeManagers; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.recipe.RecipeMaps; public class GTForestryCompat { @@ -132,8 +132,16 @@ public class GTForestryCompat { } public static void transferCentrifugeRecipes() { + ItemStack irradiatedComb = GTModHandler.getModItem(Mods.Forestry.ID, "beeCombs", 1, 9); + try { for (ICentrifugeRecipe tRecipe : RecipeManagers.centrifugeManager.recipes()) { + ItemStack input = tRecipe.getInput(); + + // Don't transfer GT recipes to centrifuge, those recipes are made already by ItemComb + if (input.getUnlocalizedName() + .contains("gt.comb")) continue; + if (irradiatedComb != null && input.isItemEqual(irradiatedComb)) continue; Map<ItemStack, Float> outputs = tRecipe.getAllProducts(); ItemStack[] tOutputs = new ItemStack[outputs.size()]; int[] tChances = new int[outputs.size()]; @@ -151,14 +159,6 @@ public class GTForestryCompat { .duration(6 * SECONDS + 8 * TICKS) .eut(5) .addTo(centrifugeRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(tRecipe.getInput()) - .itemOutputs(tOutputs) - .outputChances(tChances) - .duration(6 * SECONDS + 8 * TICKS) - .eut(5) - .addTo(centrifugeNonCellRecipes); } } catch (Throwable e) { if (GTValues.D1) { diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java index 6fb747d432..7ab2655b0c 100644 --- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java +++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java @@ -243,7 +243,7 @@ public class MaterialsInit1 { Materials.Thulium = new Materials( 76, TextureSet.SET_SHINY , 1.0F, 0, 2, 1|2 |8 |32 , 89, 107, 194, 0, "Thulium" , "Thulium" , 0, 0, 1818, 1818, true, false, 4, 1, 1, Dyes._NULL , Element.Tm , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1))); Materials.Tin = new Materials( 57, TextureSet.SET_DULL , 1.0F, 0, 3, 1|2 |8 |32 |128 , 220, 220, 220, 0, "Tin" , "Tin" , 0, 0, 505, 505, false, false, 3, 1, 1, Dyes.dyeWhite , Element.Sn , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1))); Materials.Titanium = new Materials( 28, TextureSet.SET_METALLIC , 7.0F, 1600, 3, 1|2 |8 |32|64|128 , 220, 160, 240, 0, "Titanium" , "Titanium" , 0, 0, 1941, 1940, true, false, 5, 1, 1, Dyes.dyePurple , Element.Ti , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Tritanium = new Materials( 329, TextureSet.SET_METALLIC , 20.0F,1435392, 6, 1|2 |8 |32|64 , 96, 0, 0, 0, "Tritanium" , "Tritanium" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeWhite , Element.Tn ,Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 2))).disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Tritanium = new Materials( 329, TextureSet.SET_METALLIC , 20.0F,1435392, 6, 1|2 |8 |32|64 , 96, 0, 0, 0, "Tritanium" , "Tritanium" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeWhite , Element.Tn ,Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 2))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.Tritium = new Materials( 3, TextureSet.SET_METALLIC , 1.0F, 0, 2, 16|32 , 255, 0, 0, 240, "Tritium" , "Tritium" , 0, 0, 14, 0, false, true, 10, 1, 1, Dyes.dyeRed , Element.T , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.AQUA, 4))); Materials.Tungsten = new Materials( 81, TextureSet.SET_METALLIC , 7.0F, 2560, 3, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "Tungsten" , "Tungsten" , 0, 0, 3695, 3000, true, false, 4, 1, 1, Dyes.dyeBlack , Element.W , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.Uranium = new Materials( 98, TextureSet.SET_METALLIC , 6.0F, 512, 3, 1|2 |8 |32|64 , 50, 240, 50, 0, "Uranium" , "Uranium 238" , 0, 0, 1405, 0, false, false, 4, 1, 1, Dyes.dyeGreen , Element.U , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1))); @@ -530,7 +530,7 @@ public class MaterialsInit1 { Materials.Cooperite = new Materials( 828, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1 |8 , 255, 255, 200, 0, "Cooperite" , "Sheldonite" , 0, 0, -1, 0, false, false, 5, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Platinum, 3), new MaterialStack(Nickel, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Palladium, 1))); Materials.Cupronickel = new Materials( 310, TextureSet.SET_METALLIC , 6.0F, 64, 1, 1|2 |64 , 227, 150, 128, 0, "Cupronickel" , "Cupronickel" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Nickel, 1))); Materials.DarkAsh = new Materials( 816, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 50, 50, 50, 0, "DarkAsh" , "Dark Ashes" , 0, 0, -1, 0, false, false, 1, 2, 1, Dyes.dyeGray , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1), new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1))); - Materials.DeepIron = new Materials( 829, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 150, 140, 140, 0, "DeepIron" , "Deep Iron" , 0, 0, 7500, 7500, true, false, 3, 1, 1, Dyes.dyePink , 2, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))).disableAutoGeneratedVacuumFreezerRecipe(); + Materials.DeepIron = new Materials( 829, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 150, 140, 140, 0, "DeepIron" , "Deep Iron" , 0, 0, 7500, 7500, true, false, 3, 1, 1, Dyes.dyePink , 2, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.Diamond = new Materials( 500, TextureSet.SET_DIAMOND , 8.0F, 1280, 4, 1 |4|8 |64|128 , 200, 255, 255, 127, "Diamond" , "Diamond" , 0, 0, -1, 0, false, true, 5, 64, 1, Dyes.dyeWhite , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 4))); Materials.Electrum = new Materials( 303, TextureSet.SET_SHINY , 12.0F, 64, 2, 1|2 |8 |64|128 , 255, 255, 100, 0, "Electrum" , "Electrum" , 0, 0, -1, 0, false, false, 4, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Gold, 1))); Materials.Emerald = new Materials( 501, TextureSet.SET_EMERALD , 7.0F, 256, 4, 1 |4|8 |64 , 80, 255, 80, 127, "Emerald" , "Emerald" , 0, 0, -1, 0, false, true, 5, 1, 1, Dyes.dyeGreen , 0, Arrays.asList(new MaterialStack(Beryllium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 6), new MaterialStack(Oxygen, 18)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5))); @@ -711,7 +711,7 @@ public class MaterialsInit1 { Materials.IndiumGalliumPhosphide = new Materials( 981, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 140, 190, 0, "IndiumGalliumPhosphide" , "Indium Gallium Phosphide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 2, Arrays.asList(new MaterialStack(Indium, 1), new MaterialStack(Gallium, 1), new MaterialStack(Phosphorus, 1))); Materials.Spessartine = new Materials( 838, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 255, 100, 100, 0, "Spessartine" , "Spessartine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Manganese, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12))); Materials.Sphalerite = new Materials( 839, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Sphalerite" , "Sphalerite" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1))); - Materials.StainlessSteel = new Materials( 306, TextureSet.SET_SHINY , 7.0F, 480, 4, 1|2 |64|128 , 200, 200, 220, 0, "StainlessSteel" , "Stainless Steel" , 0, 0, -1, 1700, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1))); + Materials.StainlessSteel = new Materials( 306, TextureSet.SET_SHINY , 7.0F, 480, 4, 1|2 |64|128 , 200, 200, 220, 0, "StainlessSteel" , "Stainless Steel" , 0, 0, -1, 1700, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1))).disableAutoGeneratedBlastFurnaceRecipes(); Materials.Steel = new Materials( 305, TextureSet.SET_METALLIC , 6.0F, 512, 3, 1|2 |64|128 , 128, 128, 128, 0, "Steel" , "Steel" , 0, 0, 1811, 1000, true, false, 4, 51, 50, Dyes.dyeGray , 1, Arrays.asList(new MaterialStack(Iron, 50), new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1))); Materials.Stibnite = new Materials( 945, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |8 , 70, 70, 70, 0, "Stibnite" , "Stibnite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Antimony, 2), new MaterialStack(Sulfur, 3))); Materials.SulfuricAcid = new Materials( 720, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 255, 128, 0, 0, "SulfuricAcid" , "Sulfuric Acid" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 1, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Sulfur, 1), new MaterialStack(Oxygen, 4))); @@ -763,8 +763,8 @@ public class MaterialsInit1 { Materials.BlackBronze = new Materials( 352, TextureSet.SET_DULL , 12.0F, 256, 2, 1|2 |64|128 , 100, 50, 125, 0, "BlackBronze" , "Black Bronze" , 0, 0, -1, 2000, true, false, 4, 1, 1, Dyes.dyePurple , 2, Arrays.asList(new MaterialStack(Gold, 1), new MaterialStack(Silver, 1), new MaterialStack(Copper, 3))); Materials.BismuthBronze = new Materials( 353, TextureSet.SET_DULL , 8.0F, 256, 2, 1|2 |64|128 , 100, 125, 125, 0, "BismuthBronze" , "Bismuth Bronze" , 0, 0, -1, 1100, true, false, 4, 1, 1, Dyes.dyeCyan , 2, Arrays.asList(new MaterialStack(Bismuth, 1), new MaterialStack(Zinc, 1), new MaterialStack(Copper, 3))); Materials.BlackSteel = new Materials( 334, TextureSet.SET_METALLIC , 6.5F, 768, 3, 1|2 |64|128 , 100, 100, 100, 0, "BlackSteel" , "Black Steel" , 0, 0, -1, 1200, true, false, 4, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Nickel, 1), new MaterialStack(BlackBronze, 1), new MaterialStack(Steel, 3))).disableAutoGeneratedBlastFurnaceRecipes(); - Materials.RedSteel = new Materials( 348, TextureSet.SET_METALLIC , 7.0F, 896, 4, 1|2 |64|128 , 140, 100, 100, 0, "RedSteel" , "Red Steel" , 0, 0, -1, 1300, true, false, 4, 1, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(SterlingSilver, 1), new MaterialStack(BismuthBronze, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4))); - Materials.BlueSteel = new Materials( 349, TextureSet.SET_METALLIC , 7.5F, 1024, 4, 1|2 |64|128 , 100, 100, 140, 0, "BlueSteel" , "Blue Steel" , 0, 0, -1, 1400, true, false, 4, 1, 1, Dyes.dyeBlue , 2, Arrays.asList(new MaterialStack(RoseGold, 1), new MaterialStack(Brass, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4))); + Materials.RedSteel = new Materials( 348, TextureSet.SET_METALLIC , 7.0F, 896, 4, 1|2 |64|128 , 140, 100, 100, 0, "RedSteel" , "Red Steel" , 0, 0, -1, 1300, true, false, 4, 1, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(SterlingSilver, 1), new MaterialStack(BismuthBronze, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4))).disableAutoGeneratedBlastFurnaceRecipes(); + Materials.BlueSteel = new Materials( 349, TextureSet.SET_METALLIC , 7.5F, 1024, 4, 1|2 |64|128 , 100, 100, 140, 0, "BlueSteel" , "Blue Steel" , 0, 0, -1, 1400, true, false, 4, 1, 1, Dyes.dyeBlue , 2, Arrays.asList(new MaterialStack(RoseGold, 1), new MaterialStack(Brass, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4))).disableAutoGeneratedBlastFurnaceRecipes(); Materials.DamascusSteel = new Materials( 335, TextureSet.SET_METALLIC , 8.0F, 1280, 3, 1|2 |64|128 , 110, 110, 110, 0, "DamascusSteel" , "Damascus Steel" , 0, 0, 2000, 1500, true, false, 4, 1, 1, Dyes.dyeGray , 2, Collections.singletonList(new MaterialStack(Steel, 1))).disableAutoGeneratedBlastFurnaceRecipes(); Materials.TungstenSteel = new Materials( 316, TextureSet.SET_METALLIC , 8.0F, 2560, 4, 1|2 |64|128 , 100, 100, 160, 0, "TungstenSteel" , "Tungstensteel" , 0, 0, 4000, 4000, true, false, 4, 1, 1, Dyes.dyeBlue , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Tungsten, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.NitroCoalFuel = new Materials( -1, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 50, 70, 50, 0, "NitroCoalFuel" , "Nitro-Coalfuel" , 0, 48, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 0, Arrays.asList(new MaterialStack(Glyceryl, 1), new MaterialStack(CoalFuel, 4))); @@ -824,7 +824,7 @@ public class MaterialsInit1 { Materials.SteelMagnetic = new Materials( 355, TextureSet.SET_MAGNETIC , 6.0F, 512, 3, 1|2 |64|128 , 128, 128, 128, 0, "SteelMagnetic" , "Magnetic Steel" , 0, 0, 1000, 1000, true, false, 4, 51, 50, Dyes.dyeGray , 1, Collections.singletonList(new MaterialStack(Steel, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))); Materials.NeodymiumMagnetic = new Materials( 356, TextureSet.SET_MAGNETIC , 7.0F, 512, 2, 1|2 |64|128 , 100, 100, 100, 0, "NeodymiumMagnetic" , "Magnetic Neodymium" , 0, 0, 1297, 1297, true, false, 4, 51, 50, Dyes.dyeGray , 1, Collections.singletonList(new MaterialStack(Neodymium, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 1), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 3))); Materials.SamariumMagnetic = new Materials( 399, TextureSet.SET_MAGNETIC , 1.0F, 0, 2, 1|2 |64|128 , 255, 255, 204, 0, "SamariumMagnetic" , "Magnetic Samarium" , 0, 0, 1345, 1345, true, false, 4, 1, 1, Dyes.dyeWhite , 1, Collections.singletonList(new MaterialStack(Samarium, 1)),Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1), new TCAspects.TC_AspectStack(TCAspects.MAGNETO,10))); - Materials.TungstenCarbide = new Materials( 370, TextureSet.SET_METALLIC , 14.0F, 1280, 4, 1|2 |64|128 , 51, 0, 102, 0, "TungstenCarbide" , "Tungstencarbide" , 0, 0, 2460, 2460, true, false, 4, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Carbon, 1))).disableAutoGeneratedVacuumFreezerRecipe(); + Materials.TungstenCarbide = new Materials( 370, TextureSet.SET_METALLIC , 14.0F, 1280, 4, 1|2 |64|128 , 51, 0, 102, 0, "TungstenCarbide" , "Tungstencarbide" , 0, 0, 2460, 2460, true, false, 4, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Carbon, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.VanadiumSteel = new Materials( 371, TextureSet.SET_METALLIC , 3.0F, 1920, 3, 1|2 |64|128 , 192, 192, 192, 0, "VanadiumSteel" , "Vanadiumsteel" , 0, 0, 1453, 1453, true, false, 4, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Vanadium, 1), new MaterialStack(Chrome, 1), new MaterialStack(Steel, 7))).disableAutoGeneratedBlastFurnaceRecipes(); Materials.HSSG = new Materials( 372, TextureSet.SET_METALLIC , 10.0F, 4000, 3, 1|2 |64|128 , 153, 153, 0, 0, "HSSG" , "HSS-G" , 0, 0, 4500, 4500, true, false, 4, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.HSSE = new Materials( 373, TextureSet.SET_METALLIC , 32.0F, 10240, 7, 1|2 |64|128 , 51, 102, 0, 0, "HSSE" , "HSS-E" , 0, 0, 5400, 5400, true, false, 4, 1, 1, Dyes.dyeGreen , 2, Arrays.asList(new MaterialStack(HSSG, 6), new MaterialStack(Cobalt, 1),new MaterialStack(Manganese, 1), new MaterialStack(Silicon, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); @@ -869,7 +869,7 @@ public class MaterialsInit1 { Materials.Shadow = new Materials( 368, TextureSet.SET_METALLIC , 32.0F, 8192, 4, 1|2 |8 |64|128 , 16, 3, 66, 0, "Shadow" , "Shadow Metal" , 0, 0, 1800, 1800, true, false, 3, 4, 3, Dyes.dyeBlue ); Materials.Ledox = new Materials( 390, TextureSet.SET_SHINY , 15.0F, 1024, 4, 1|2 |8 |64|128 , 0, 116, 255, 0, "Ledox" , "Ledox" , 0, 0, -1, 0, false, false, 4, 1, 1, Dyes.dyeBlue ); - Materials.Quantium = new Materials( 391, TextureSet.SET_SHINY , 18.0F, 2048, 4, 1|2 |8 |64|128 , 0, 209, 11, 0, "Quantium" , "Quantium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeLime ).disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Quantium = new Materials( 391, TextureSet.SET_SHINY , 18.0F, 2048, 4, 1|2 |8 |64|128 , 0, 209, 11, 0, "Quantium" , "Quantium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeLime ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.Mytryl = new Materials( 387, TextureSet.SET_SHINY , 8.0F, 512, 4, 1|2 |8 |64|128 , 242, 100, 4, 0, "Mytryl" , "Mytryl" , 0, 0, 3600, 3600, true, false, 4, 1, 1, Dyes.dyeOrange ); Materials.BlackPlutonium = new Materials( 388, TextureSet.SET_DULL , 36.0F, 8192, 8, 1|2 |8 |64|128 , 50, 50, 50, 0, "BlackPlutonium" , "Black Plutonium" , 0, 0, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeBlack ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.CallistoIce = new Materials( 389, TextureSet.SET_SHINY , 9.0F, 1024, 4, 1|2 |8 |64|128 , 30, 177, 255, 0, "CallistoIce" , "Callisto Ice" , 0, 0, -1, 0, false, false, 4, 1, 1, Dyes.dyeLightBlue ); @@ -900,24 +900,24 @@ public class MaterialsInit1 { Materials.ShadowSteel = new Materials( 337, TextureSet.SET_METALLIC , 6.0F, 768, 4, 1|2 |64 , 90, 90, 90, 0, "ShadowSteel" , "Shadow Steel" , 0, 0, -1, 1700, true, false, 4, 4, 3, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Thaumium, 3))); Materials.AstralSilver = new Materials( 333, TextureSet.SET_SHINY , 10.0F, 64, 2, 1|2 |64 , 230, 230, 255, 0, "AstralSilver" , "Astral Silver" , 0, 0, -1, 0, false, false, 4, 3, 2, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Silver, 2), new MaterialStack(Thaumium, 1))); - Materials.InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 10, 1|2 |8 |64|128 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 10800, 10800, true, false, 20, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2|32|64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); - Materials.Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addPlasma().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); + Materials.InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 10, 1|2 |8 |64|128 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 10800, 10800, true, false, 20, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2|32|64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); + Materials.Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addPlasma().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); Materials.Trinium = new Materials( 868, TextureSet.SET_SHINY , 128.0F, 51200, 8, 1|2 |8 |64|128 , 200, 200, 210, 0, "Trinium" , "Trinium" , 0, 0, 7200, 7200, true, false, 4, 1, 1, Dyes.dyeLightGray ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.Ichorium = new Materials( 978, TextureSet.SET_SHINY , 32.0F, 850000, 12, 1|2 |8 |32|64|128 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeOrange ).setTurbineMultipliers(6, 6, 3).setHasCorrespondingPlasma(true); - Materials.CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 96.0F, 163840, 12, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeBlack ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); + Materials.CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 96.0F, 163840, 12, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeBlack ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); - Materials.Pentacadmiummagnesiumhexaoxid = new Materials( 987, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 85, 85, 85, 0, "Pentacadmiummagnesiumhexaoxid" , "Superconductor Base MV" , 0, 0, 2500, 2500, true, false, 1, 1, 1, Dyes.dyeGray , 1, Arrays.asList(new MaterialStack(Cadmium, 5), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 6)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 3))).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Titaniumonabariumdecacoppereikosaoxid = new Materials( 988, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 51, 25, 0, 0, "Titaniumonabariumdecacoppereikosaoxid" , "Superconductor Base HV" , 0, 0, 3300, 3300, true, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Barium, 9), new MaterialStack(Copper, 10), new MaterialStack(Oxygen, 20)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6))).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Uraniumtriplatinid = new Materials( 989, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 0,135, 0, 0, "Uraniumtriplatinid" , "Superconductor Base EV" , 0, 0, 4400, 4400, true, false, 1, 1, 1, Dyes.dyeLime , 1, Arrays.asList(new MaterialStack(Uranium, 1), new MaterialStack(Platinum, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 9))).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Vanadiumtriindinid = new Materials( 990, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 51, 0, 51, 0, "Vanadiumtriindinid" , "Superconductor Base IV" , 0, 0, 5200, 5200, true, false, 1, 1, 1, Dyes.dyeMagenta , 1, Arrays.asList(new MaterialStack(Vanadium , 1), new MaterialStack(Indium, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 12))).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid = new Materials( 991, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 153, 76, 0, 0, "Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid" , "Superconductor Base LuV" , 0, 0, 6000, 6000, true, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Indium, 4), new MaterialStack(Tin, 2), new MaterialStack(Barium, 2), new MaterialStack(Titanium, 1), new MaterialStack(Copper, 7), new MaterialStack(Oxygen, 14)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 15))).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Tetranaquadahdiindiumhexaplatiumosminid = new Materials( 992, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 10, 10, 10, 0, "Tetranaquadahdiindiumhexaplatiumosminid" , "Superconductor Base ZPM" , 0, 0, 9000, 9000, true, false, 1, 1, 1, Dyes.dyeBlack , 1, Arrays.asList(new MaterialStack(Naquadah, 4), new MaterialStack(Indium, 2), new MaterialStack(Palladium, 6), new MaterialStack(Osmium, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 18))).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Longasssuperconductornameforuvwire = new Materials( 986, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 224,210, 7, 0, "Longasssuperconductornameforuvwire" , "Superconductor Base UV" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Naquadria, 4), new MaterialStack(Osmiridium, 3), new MaterialStack(Europium, 1), new MaterialStack(Samarium, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 21))).setProcessingMaterialTierEU(TierEU.RECIPE_LuV).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Longasssuperconductornameforuhvwire = new Materials( 985, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 38,129, 189, 0, "Longasssuperconductornameforuhvwire" , "Superconductor Base UHV" , 0, 0, 10800, 10800, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Draconium, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(Tritanium, 5), new MaterialStack(Americium, 6)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 24))).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.SuperconductorUEVBase = new Materials( 974, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 174, 8, 8, 0, "SuperconductorUEVBase" , "Superconductor Base UEV" , 0, 0, 11700, 11800, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 27))).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.SuperconductorUIVBase = new Materials( 131, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 229, 88, 177, 0, "SuperconductorUIVBase" , "Superconductor Base UIV" , 0, 0, 12700, 12700, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 34))).setProcessingMaterialTierEU(TierEU.RECIPE_UHV).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.SuperconductorUMVBase = new Materials( 134, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 181, 38, 205, 0, "SuperconductorUMVBase" , "Superconductor Base UMV" , 0, 0, 13600, 13600, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 40))).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Pentacadmiummagnesiumhexaoxid = new Materials( 987, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 85, 85, 85, 0, "Pentacadmiummagnesiumhexaoxid" , "Superconductor Base MV" , 0, 0, 2500, 2500, true, false, 1, 1, 1, Dyes.dyeGray , 1, Arrays.asList(new MaterialStack(Cadmium, 5), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 6)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Titaniumonabariumdecacoppereikosaoxid = new Materials( 988, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 51, 25, 0, 0, "Titaniumonabariumdecacoppereikosaoxid" , "Superconductor Base HV" , 0, 0, 3300, 3300, true, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Barium, 9), new MaterialStack(Copper, 10), new MaterialStack(Oxygen, 20)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Uraniumtriplatinid = new Materials( 989, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 0,135, 0, 0, "Uraniumtriplatinid" , "Superconductor Base EV" , 0, 0, 4400, 4400, true, false, 1, 1, 1, Dyes.dyeLime , 1, Arrays.asList(new MaterialStack(Uranium, 1), new MaterialStack(Platinum, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 9))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Vanadiumtriindinid = new Materials( 990, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 51, 0, 51, 0, "Vanadiumtriindinid" , "Superconductor Base IV" , 0, 0, 5200, 5200, true, false, 1, 1, 1, Dyes.dyeMagenta , 1, Arrays.asList(new MaterialStack(Vanadium , 1), new MaterialStack(Indium, 3)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 12))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid = new Materials( 991, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 153, 76, 0, 0, "Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid" , "Superconductor Base LuV" , 0, 0, 6000, 6000, true, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Indium, 4), new MaterialStack(Tin, 2), new MaterialStack(Barium, 2), new MaterialStack(Titanium, 1), new MaterialStack(Copper, 7), new MaterialStack(Oxygen, 14)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 15))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Tetranaquadahdiindiumhexaplatiumosminid = new Materials( 992, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 10, 10, 10, 0, "Tetranaquadahdiindiumhexaplatiumosminid" , "Superconductor Base ZPM" , 0, 0, 9000, 9000, true, false, 1, 1, 1, Dyes.dyeBlack , 1, Arrays.asList(new MaterialStack(Naquadah, 4), new MaterialStack(Indium, 2), new MaterialStack(Palladium, 6), new MaterialStack(Osmium, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 18))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Longasssuperconductornameforuvwire = new Materials( 986, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 224,210, 7, 0, "Longasssuperconductornameforuvwire" , "Superconductor Base UV" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Naquadria, 4), new MaterialStack(Osmiridium, 3), new MaterialStack(Europium, 1), new MaterialStack(Samarium, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 21))).setProcessingMaterialTierEU(TierEU.RECIPE_LuV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Longasssuperconductornameforuhvwire = new Materials( 985, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 38,129, 189, 0, "Longasssuperconductornameforuhvwire" , "Superconductor Base UHV" , 0, 0, 10800, 10800, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Draconium, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(Tritanium, 5), new MaterialStack(Americium, 6)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 24))).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.SuperconductorUEVBase = new Materials( 974, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 174, 8, 8, 0, "SuperconductorUEVBase" , "Superconductor Base UEV" , 0, 0, 11700, 11800, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 27))).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.SuperconductorUIVBase = new Materials( 131, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 229, 88, 177, 0, "SuperconductorUIVBase" , "Superconductor Base UIV" , 0, 0, 12700, 12700, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 34))).setProcessingMaterialTierEU(TierEU.RECIPE_UHV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.SuperconductorUMVBase = new Materials( 134, TextureSet.SET_SHINY , 1.0F, 0, 3, 1|2 , 181, 38, 205, 0, "SuperconductorUMVBase" , "Superconductor Base UMV" , 0, 0, 13600, 13600, true, false, 1, 1, 1, Dyes.dyeWhite, Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 40))).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.SuperconductorMV = new Materials( -1, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 85, 85, 85, 0, "SuperconductorMV" , "Superconductor MV" , 0, 0, -1, -1, false, false, 1, 1, 1, Dyes.dyeGray , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6))); Materials.SuperconductorHV = new Materials( -1, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 51, 25, 0, 0, "SuperconductorHV" , "Superconductor HV" , 0, 0, -1, -1, false, false, 1, 1, 1, Dyes.dyeBrown , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 12))); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 9964ea541e..c37d3c614d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -132,7 +132,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper) && (aMaterial != MaterialsUEVplus.TranscendentMetal) - && (aMaterial != Materials.Clay && (aMaterial != Materials.Wood))) { + && (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/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index f60987ec9e..5bf1212faa 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -125,14 +125,12 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } for (int i = 0; i < 32767; i++) { if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } ItemStack tStack = GTModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); @@ -205,7 +203,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } ItemStack tStack = GTModHandler.getRecipeOutput(GTUtility.copyAmount(1, aStack)); @@ -271,7 +268,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index 3d33df9711..6cac506abf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -120,14 +120,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); GTValues.RA.stdBuilder() - .itemInputs(aMaterial.getDust(2), Materials.Quartzite.getDust(4)) - .itemOutputs( - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDustSmall(outputAmount)) - .duration(2 * MINUTES) - .metadata(ADDITIVE_AMOUNT, 2) - .addTo(primitiveBlastRecipes); - GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.NetherQuartz.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 396cce0c8c..6c45761da0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -458,22 +458,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } } case "Iron", "WroughtIron" -> { GTValues.RA.stdBuilder() @@ -482,22 +466,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } if (tAmount * 31 <= 64) { GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(31, aStack), ItemList.Shape_Mold_Anvil.get(0L)) @@ -514,94 +482,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Lead" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Copper", "AnnealedCopper" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Bronze" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Gold" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } } case "Polytetrafluoroethylene" -> { GTValues.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 81b8985d05..d3e6750f33 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -258,33 +258,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .eut(8) .addTo(packagerRecipes); } - // alloy smelter recipes - { - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), - GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L)) - .duration(5 * SECONDS) - .eut(8) - .addTo(alloySmelterRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), - GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L)) - .duration(10 * SECONDS) - .eut(16) - .addTo(alloySmelterRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), - GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L)) - .duration(15 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(alloySmelterRecipes); - } // Assembler recipes { if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) { @@ -334,6 +307,35 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } } } + // Alloy Smelter recipes + if (correspondingCable == OrePrefixes.cableGt01) { + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), + GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L)) + .duration(5 * SECONDS) + .eut(8) + .addTo(alloySmelterRecipes); + } else if (correspondingCable == OrePrefixes.cableGt02) { + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), + GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L)) + .duration(10 * SECONDS) + .eut(16) + .addTo(alloySmelterRecipes); + } else if (correspondingCable == OrePrefixes.cableGt04) { + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(alloySmelterRecipes); + } } case "RedstoneAlloy", "Iron", "Nickel", "Cupronickel", "Copper", "AnnealedCopper", "ElectricalSteel", "Kanthal", "Gold", "Electrum", "Silver", "BlueAlloy", "EnergeticAlloy", "Nichrome", "Steel", "BlackSteel", "Titanium", "Aluminium", "TPVAlloy", "VibrantAlloy" -> { diff --git a/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java index f047bdcab2..e4bb4681fc 100644 --- a/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java @@ -7,6 +7,7 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeConstants.AssemblyLine; import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; +import static gtPlusPlus.core.material.MaterialsAlloy.QUANTUM; import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN; import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CHRONOMATIC_GLASS; import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.HYPOGEN; @@ -77,10 +78,7 @@ public class PCBFactoryRecipes { .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - CELESTIAL_TUNGSTEN.getFrameBox(1), - Materials.get("Quantum") - .getPlates(6)) + .itemInputs(CELESTIAL_TUNGSTEN.getFrameBox(1), QUANTUM.getPlate(6)) .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UIV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index f4563a60ce..940f32e604 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -635,16 +635,6 @@ public class AssemblerRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) - .itemOutputs(ItemList.Block_Plascrete.get(1)) - .fluidInputs(Materials.Concrete.getMolten(144)) - .duration(10 * SECONDS) - .eut(48) - .addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 16), GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 4), ItemList.Electric_Motor_IV.get(16), diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index c311ecd532..09400b8ba7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -1146,17 +1146,6 @@ public class MixerRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - new ItemStack(Items.wheat, 4, 32767), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), getModItem(BiomesOPlenty.ID, "plants", 4, 6), GTUtility.getIntegratedCircuit(2)) @@ -1168,17 +1157,6 @@ public class MixerRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(BiomesOPlenty.ID, "plants", 4, 6), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), getModItem(PamsHarvestCraft.ID, "oatsItem", 4), GTUtility.getIntegratedCircuit(2)) @@ -1190,17 +1168,6 @@ public class MixerRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.ID, "oatsItem", 4), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), getModItem(PamsHarvestCraft.ID, "ryeItem", 4), GTUtility.getIntegratedCircuit(2)) @@ -1212,17 +1179,6 @@ public class MixerRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.ID, "ryeItem", 4), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), getModItem(PamsHarvestCraft.ID, "barleyItem", 4), GTUtility.getIntegratedCircuit(2)) @@ -1234,17 +1190,6 @@ public class MixerRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.ID, "barleyItem", 4, 6), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), getModItem(Natura.ID, "barleyFood", 4), GTUtility.getIntegratedCircuit(2)) @@ -1256,17 +1201,6 @@ public class MixerRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(Natura.ID, "barleyFood", 4), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), GTUtility.getIntegratedCircuit(3)) @@ -1276,17 +1210,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), - GTUtility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - // radiation manufacturing GTValues.RA.stdBuilder() @@ -1538,18 +1461,6 @@ public class MixerRecipes implements Runnable { .addTo(mixerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - EnumCube.COKE_BLOCK.getItem(4), - ItemList.SFMixture.get(8), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(4)) - .fluidInputs(Materials.NitroFuel.getFluid(1200)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(mixerRecipes); - - GTValues.RA.stdBuilder() .itemInputs(EnumCube.COKE_BLOCK.getItem(), ItemList.SFMixture.get(2), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_SSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(120)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java index a86266029b..74f70aac41 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java @@ -24,13 +24,6 @@ public class PackagerRecipes implements Runnable { .addTo(packagerRecipes); GTValues.RA.stdBuilder() - .itemInputs(ItemList.Tool_MatchBox_Full.get(1L)) - .itemOutputs(ItemList.Tool_Matches.get(16L)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(16) - .addTo(packagerRecipes); - - GTValues.RA.stdBuilder() .itemInputs(ItemList.IC2_Scrap.get(9), ItemList.Schematic_3by3.get(0)) .itemOutputs(ItemList.IC2_Scrapbox.get(1)) .duration(16 * TICKS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index 70881690aa..89f1fc6156 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -228,34 +228,6 @@ public class VacuumFreezerRecipes implements Runnable { .duration(1 * SECONDS + 8 * TICKS) .eut(TierEU.RECIPE_HV) .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)) - .duration(1 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)) - .duration(3 * MINUTES) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)) - .duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)) - .duration(9 * MINUTES) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); } // Freeze superconductors. diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java index ee207bbaeb..051eee691a 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -2036,20 +2036,6 @@ public class LoaderGTBlockFluid implements Runnable { .eut(2) .addTo(maceratorRecipes); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.furnace, 1, WILDCARD)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.lit_furnace, 1, WILDCARD)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - GTOreDictUnificator.set( OrePrefixes.ingot, Materials.FierySteel, diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java index 0d2bd3ad55..05a3712979 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java @@ -301,43 +301,6 @@ public class LoaderGTOreDictionary implements Runnable { Materials.Lead, GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Osmium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Aluminium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.StainlessSteel, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Tungsten, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Neutronium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.TungstenSteel, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Iridium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Titanium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Chrome, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0)); - // Fake Circuits GTOreDictUnificator.registerOre( OrePrefixes.circuit, diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 0929b0b0ce..a7fe8ced30 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -874,17 +874,13 @@ public final class ModItems { // Small Springs MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.MARAGING250); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.NICHROME); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STABALLOY); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STEEL_BLACK); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.BLACK_TITANIUM); // Fine Wire MaterialUtils .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.WHITE_METAL); MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().PALLADIUM); - MaterialUtils .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().ZIRCONIUM); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.LEAGRISIUM); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.BABBIT_ALLOY); diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java index a78d2be2cb..bf587a137f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java @@ -1427,14 +1427,6 @@ public class RecipesGregTech { .eut(TierEU.RECIPE_HV / 2) .addTo(fluidExtractionRecipes); - // Ender Fluid - RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(Items.ender_pearl)) - .fluidOutputs(FluidUtils.getFluidStack("ender", 250)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(fluidExtractionRecipes); - // Blazing Pyrotheum RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) @@ -1575,13 +1567,6 @@ public class RecipesGregTech { private static void macerationRecipes() { - RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)) - .duration(44 * SECONDS) - .eut(4) - .addTo(maceratorRecipes); - if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) { RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1)) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index 23cc3f223e..b66249a3ec 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -980,6 +980,13 @@ public class RecipesMachines { // RTG GTValues.RA.stdBuilder() + .itemInputs( + ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1), + MaterialsAlloy.NITINOL_60.getPlate(8), + MaterialsAlloy.MARAGING350.getGear(4), + ItemList.Field_Generator_EV.get(8), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 32), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4)) .itemOutputs(GregtechItemList.RTG.get(1)) .fluidInputs(MaterialsAlloy.NIOBIUM_CARBIDE.getFluidStack(144 * 16)) .duration(10 * MINUTES) @@ -1779,6 +1786,10 @@ public class RecipesMachines { "plateNiobiumCarbide", RECIPE_IndustrialMatterFabFrame); GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.NIOBIUM_CARBIDE.getPlate(4), + MaterialsAlloy.INCONEL_792.getRod(4), + MaterialsAlloy.INCONEL_690.getFrameBox(1)) .itemOutputs(RECIPE_IndustrialMatterFabFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java index 5f5160b6a4..63812e2e6e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java @@ -57,7 +57,7 @@ public class RecipeGenRecycling implements Runnable { OrePrefixes.plate, OrePrefixes.plateDense, OrePrefixes.plateDouble, OrePrefixes.plateTriple, OrePrefixes.plateQuadruple, OrePrefixes.plateQuintuple, OrePrefixes.stick, OrePrefixes.stickLong, OrePrefixes.bolt, OrePrefixes.screw, OrePrefixes.ring, OrePrefixes.rotor, OrePrefixes.gearGt, - OrePrefixes.gearGtSmall, OrePrefixes.gear, OrePrefixes.block, OrePrefixes.cableGt01, OrePrefixes.cableGt02, + OrePrefixes.gearGtSmall, OrePrefixes.block, OrePrefixes.cableGt01, OrePrefixes.cableGt02, OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12, OrePrefixes.wireFine, OrePrefixes.wireGt01, OrePrefixes.wireGt02, OrePrefixes.wireGt04, OrePrefixes.wireGt08, OrePrefixes.wireGt12, OrePrefixes.wireGt16, OrePrefixes.foil, OrePrefixes.frameGt, OrePrefixes.pipeHuge, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index 3171cd0057..5a03fdcd26 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -139,7 +139,9 @@ public class GregtechSimpleWasher { } if (v == Materials.Platinum || v == Materials.Osmium || v == Materials.Iridium - || v == Materials.Palladium) { + || v == Materials.Palladium + || v == Materials.AnyCopper + || v == Materials.AnyIron) { continue; } diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java index 44ac77769e..3bc69c2675 100644 --- a/src/main/java/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java @@ -15,7 +15,6 @@ import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerNonCellRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; -import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; @@ -982,15 +981,6 @@ public class RecipeLoader { .duration(30 * SECONDS) .eut(240) .addTo(mixerRecipes); - // SeaweedConcentrate * 4 - GTValues.RA.stdBuilder() - .itemInputs(WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 4)) - .itemOutputs(Materials.Calcite.getDust(2)) - .fluidInputs(Materials.DilutedSulfuricAcid.getFluid(2400)) - .fluidOutputs(WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2400)) - .duration(60 * SECONDS) - .eut(240) - .addTo(mixerRecipes); // Iodine GTValues.RA.stdBuilder() @@ -1159,16 +1149,6 @@ public class RecipeLoader { .eut(450) .addTo(UniversalChemical); - // Cerium - // Ce2O3 = 2Ce + 3O - GTValues.RA.stdBuilder() - .itemInputs(WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 2)) - .fluidOutputs(Materials.Oxygen.getGas(3000)) - .duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV) - .addTo(electrolyzerRecipes); - // CHAIN BEGIN // MONAZITE GTValues.RA.stdBuilder() @@ -1645,7 +1625,9 @@ public class RecipeLoader { // Sm RE GTValues.RA.stdBuilder() - .itemInputs(WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1)) + .itemInputs( + WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 1)) .fluidInputs(Materials.HydrofluoricAcid.getFluid(2000)) .duration(15 * SECONDS) @@ -1843,38 +1825,6 @@ public class RecipeLoader { .duration(1 * SECONDS) .addTo(multiblockChemicalReactorRecipes); - // Neodymium Part - // Digester to produce Neodymium Chloride Concentrate - GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Neodymium, 1)) - .itemOutputs(Materials.SiliconDioxide.getDust(3)) - .fluidInputs(Materials.Chlorine.getGas(36000)) - .fluidOutputs(NeodymiumChlorideConcentrate.getFluidOrGas(3000)) - .metadata(COIL_HEAT, 800) - .eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS) - .addTo(digesterRecipes); - GTValues.RA.stdBuilder() - .itemInputs(NeodymiumOreConcentrate.get(OrePrefixes.dust, 1)) - .itemOutputs(Materials.SiliconDioxide.getDust(1)) - .fluidInputs(Materials.Chlorine.getGas(12000)) - .fluidOutputs(NeodymiumChlorideConcentrate.getFluidOrGas(1000)) - .metadata(COIL_HEAT, 800) - .eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS) - .addTo(digesterRecipes); - // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GTValues.RA.stdBuilder() - .fluidInputs( - NeodymiumExtractingNanoResin.getFluidOrGas(1000), - NeodymiumChlorideConcentrate.getFluidOrGas(1000)) - .fluidOutputs( - FilledNeodymiumExtractingNanoResin.getFluidOrGas(1000), - ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV) - .duration(1 * SECONDS) - .addTo(multiblockChemicalReactorRecipes); - // Promethium Part // Digester to produce Neodymium Chloride Concentrate GTValues.RA.stdBuilder() @@ -1895,38 +1845,7 @@ public class RecipeLoader { .eut(TierEU.RECIPE_ZPM) .duration(2 * SECONDS) .addTo(digesterRecipes); - // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GTValues.RA.stdBuilder() - .fluidInputs( - PromethiumExtractingNanoResin.getFluidOrGas(1000), - PromethiumChlorideConcentrate.getFluidOrGas(1000)) - .fluidOutputs( - FilledPromethiumExtractingNanoResin.getFluidOrGas(1000), - ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV) - .duration(1 * SECONDS) - .addTo(multiblockChemicalReactorRecipes); - // Promethium Part - // Digester to produce Promethium Chloride Concentrate - GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Promethium, 1)) - .itemOutputs(Materials.SiliconDioxide.getDust(3)) - .fluidInputs(Materials.Chlorine.getGas(36000)) - .fluidOutputs(PromethiumChlorideConcentrate.getFluidOrGas(3000)) - .metadata(COIL_HEAT, 800) - .eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS) - .addTo(digesterRecipes); - GTValues.RA.stdBuilder() - .itemInputs(PromethiumOreConcentrate.get(OrePrefixes.dust, 1)) - .itemOutputs(Materials.SiliconDioxide.getDust(1)) - .fluidInputs(Materials.Chlorine.getGas(12000)) - .fluidOutputs(PromethiumChlorideConcentrate.getFluidOrGas(1000)) - .metadata(COIL_HEAT, 800) - .eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS) - .addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal GTValues.RA.stdBuilder() .fluidInputs( @@ -3280,16 +3199,6 @@ public class RecipeLoader { .duration(2 * SECONDS) .addTo(electrolyzerRecipes); - // ZPM molten distilling method - - // melt ImpureSamariumChloride - GTValues.RA.stdBuilder() - .itemInputs(SamariumChloride.get(OrePrefixes.dust, 1)) - .fluidOutputs(SamariumChloride.getMolten(144)) - .eut(TierEU.RECIPE_EV) - .duration(24) - .addTo(fluidExtractionRecipes); - // distill with LanthanumDust 36*144L moltenSmCl3 = 16*144L moltenSm + 27B Cl GTValues.RA.stdBuilder() .itemInputs(Materials.Lanthanum.getDust(9)) @@ -3474,13 +3383,6 @@ public class RecipeLoader { // PTMEG Manipulation GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) - .itemOutputs(WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.ingot, 1)) - .fluidInputs(WerkstoffMaterialPool.PTMEGElastomer.getMolten(144)) - .duration(2 * SECONDS) - .eut(64) - .addTo(fluidSolidifierRecipes); - GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) .itemOutputs(WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.plate, 1)) .fluidInputs(WerkstoffMaterialPool.PTMEGElastomer.getMolten(144)) @@ -3627,12 +3529,6 @@ public class RecipeLoader { .eut(TierEU.RECIPE_UHV) .duration(5 * SECONDS) .addTo(vacuumFurnaceRecipes); - GTValues.RA.stdBuilder() - .itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) - .fluidOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(144)) - .eut(TierEU.RECIPE_LuV) - .duration(1 * SECONDS) - .addTo(fluidExtractionRecipes); // 16 Adv Crystal SoC for (ItemStack itemStack : OreDictionary.getOres("craftingLensBlue")) { diff --git a/src/main/java/tectech/loader/recipe/Assembler.java b/src/main/java/tectech/loader/recipe/Assembler.java index 7965931f5b..cbb6691a6a 100644 --- a/src/main/java/tectech/loader/recipe/Assembler.java +++ b/src/main/java/tectech/loader/recipe/Assembler.java @@ -2691,7 +2691,7 @@ public class Assembler implements Runnable { .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs(ItemList.Battery_Buffer_3by3_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)) + .itemInputs(ItemList.Battery_Buffer_3by3_MV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)) .itemOutputs(CustomItemList.Machine_TeslaCoil_3by3_MV.get(1)) .fluidInputs(Materials.Tin.getMolten(288)) .duration(20 * SECONDS) |