From f825c0508f711e39a60c9d14f311158280cee502 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 21 Sep 2024 10:29:27 +0200 Subject: [PATCH 1/7] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index a968b6a849d..545c924afbe 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -63,7 +63,7 @@ dependencies { compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false } compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false} From 7838937a6df4513ac5829f3b81554f51fae9c64a Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 21 Sep 2024 04:37:04 -0500 Subject: [PATCH 2/7] Rebalance superdense plate compressing (#3243) Co-authored-by: Martin Robertz --- .../java/gregtech/loaders/oreprocessing/ProcessingPlate.java | 2 +- .../gregtech/loaders/postload/recipes/CompressorRecipes.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index beedad1d7ab..d699429a0cc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -422,7 +422,7 @@ private void registerPlateSuperdense(final Materials aMaterial, final ItemStack GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 64)) .itemOutputs(GTUtility.copyAmount(1, aStack)) - .duration(Math.max(aMaterialMass * 16L, 1L)) + .duration(Math.max(aMaterialMass * 32L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) .metadata(COMPRESSION_TIER, compression_tier) .addTo(compressorRecipes); diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index 6d864f56d36..391cf6e5766 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.HOURS; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator.sapling_Rainforest; @@ -306,7 +307,7 @@ public void run() { .get(OrePrefixes.plateSuperdense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1)) // Require stabilized black hole .metadata(CompressionTierKey.INSTANCE, 2) - .duration(15 * MINUTES) + .duration(1 * HOURS + 15 * MINUTES) .eut(TierEU.RECIPE_UXV) .addTo(compressorRecipes); From 7574ba560ea4c2e3b5212a979ef58b7cc48c0b88 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:31:17 +0100 Subject: [PATCH 3/7] Restore nuked lang (#3244) --- .../plugin/gregtech5/PluginGT5VeinStat.java | 10 +- .../assets/gtneioreplugin/lang/en_US.lang | 105 +++++++++++++++++- 2 files changed, 105 insertions(+), 10 deletions(-) diff --git a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java index 785ced4006c..6e02539a874 100644 --- a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java +++ b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack; import codechicken.nei.PositionedStack; -import gregtech.api.enums.Mods; import gtneioreplugin.plugin.item.ItemDimensionDisplay; import gtneioreplugin.util.DimensionHelper; import gtneioreplugin.util.GT5OreLayerHelper; @@ -92,14 +91,7 @@ private OreLayerWrapper getOreLayer(int recipe) { } private static void drawVeinName(OreLayerWrapper oreLayer) { - if (Mods.VisualProspecting.isModLoaded()) { - drawVeinNameLine(I18n.format(oreLayer.veinName) + " "); - } else { - String veinName = getGTOreLocalizedName(oreLayer.Meta[OreVeinLayer.VEIN_PRIMARY]); - if (veinName.contains("Ore")) drawVeinNameLine(veinName.split("Ore")[0]); - else if (veinName.contains("Sand")) drawVeinNameLine(veinName.split("Sand")[0]); - else drawVeinNameLine(veinName + " "); - } + drawVeinNameLine(I18n.format(oreLayer.veinName) + " "); } private static void drawVeinNameLine(String veinName) { diff --git a/src/main/resources/assets/gtneioreplugin/lang/en_US.lang b/src/main/resources/assets/gtneioreplugin/lang/en_US.lang index 0540870c922..a2eaa352236 100644 --- a/src/main/resources/assets/gtneioreplugin/lang/en_US.lang +++ b/src/main/resources/assets/gtneioreplugin/lang/en_US.lang @@ -93,9 +93,112 @@ gtnop.ore.null.name=None # vein types -gtnop.ore.vein.name=Vein +gtnop.ore.vein.name=Vein gtnop.ore.asteroid.name=Asteriod gtnop.ore.custom.name=Custom # items itemGroup.gtneioreplugin=GT NEI Ore Plugin + +# vein names +ore.mix.naquadah=Naquadah +ore.mix.lignite=Lignite +ore.mix.coal=Coal +ore.mix.magnetite=Magnetite +ore.mix.gold=Gold +ore.mix.iron=Iron +ore.mix.cassiterite=Cassiterite +ore.mix.tetrahedrite=Tetrahedrite +ore.mix.netherquartz=Nether Quartz +ore.mix.sulfur=Sulfur +ore.mix.copper=Copper +ore.mix.bauxite=Bauxite +ore.mix.salts=Salts +ore.mix.redstone=Redstone +ore.mix.soapstone=Soapstone +ore.mix.nickel=Nickel +ore.mix.platinum=Platinum +ore.mix.pitchblende=Pitchblende +ore.mix.monazite=Monazite +ore.mix.molybdenum=Molybdenum +ore.mix.tungstate=Tungstate +ore.mix.sapphire=Sapphire +ore.mix.manganese=Manganese +ore.mix.quartz=Quartz +ore.mix.diamond=Diamond +ore.mix.olivine=Olivine +ore.mix.apatite=Apatite +ore.mix.galena=Galena +ore.mix.lapis=Lapis +ore.mix.beryllium=Beryllium +ore.mix.uranium=Uranium +ore.mix.oilsand=Oilsands + +ore.mix.neutronium=Neutronium +ore.mix.aquaignis=Aqua and Ignis +ore.mix.terraaer=Terra and Aer +ore.mix.perditioordo=Perdito and Ordo +ore.mix.coppertin=Vermiculite +ore.mix.titaniumchrome=Ilmenite +ore.mix.mineralsand=Mineral Sands +ore.mix.garnettin=Garnet/Tin +ore.mix.kaolinitezeolite=Kaolinite +ore.mix.mica=Mica +ore.mix.dolomite=Dolomite +ore.mix.platinumchrome=Palladium +ore.mix.iridiummytryl=Iridium +ore.mix.osmium=Osmium +ore.mix.saltpeterelectrotine=Electrotine +ore.mix.desh=Desh +ore.mix.draconium=Draconium +ore.mix.quantium=Quantium +ore.mix.callistoice=Callisto Ice +ore.mix.mytryl=Mytryl +ore.mix.ledox=Ledox +ore.mix.oriharukon=Oriharukon +ore.mix.blackplutonium=Black Plutonium +ore.mix.infusedgold=Infused Gold +ore.mix.niobium=Niobium +ore.mix.tungstenirons=Tungsten +ore.mix.uraniumgtnh=Thorium +ore.mix.vanadiumgold=Vanadium +ore.mix.netherstar=Nether Star +ore.mix.garnet=Garnet +ore.mix.rareearth=Rare Earths +ore.mix.richnuclear=Plutonium +ore.mix.heavypentele=Arsenic +ore.mix.europa=Magnesite +ore.mix.europacore=Chrome +ore.mix.secondlanthanid=Samarium +ore.mix.quartzspace=Quartz +ore.mix.rutile=Rutile +ore.mix.tfgalena=Cryolite +ore.mix.luvtantalite=Pyrolusite + +ore.mix.ross128.Thorianit=Thorianite +ore.mix.ross128.carbon=Graphite +ore.mix.ross128.bismuth=Bismuth +ore.mix.ross128.TurmalinAlkali=Olenite +ore.mix.ross128.Roquesit=Roquesite +ore.mix.ross128.Tungstate=Scheelite +ore.mix.ross128.CopperSulfits=Djurleite +ore.mix.ross128.Forsterit=Forsterite +ore.mix.ross128.Hedenbergit=Hedenbergite +ore.mix.ross128.RedZircon=Red Zircon + +ore.mix.ross128ba.tib=Tiberium +ore.mix.ross128ba.Tungstate=Scheelite +ore.mix.ross128ba.bart=BArTiMaEuSNeK +ore.mix.ross128ba.TurmalinAlkali=Olenite +ore.mix.ross128ba.Amethyst=Amethyst +ore.mix.ross128ba.CopperSulfits=Djurleite +ore.mix.ross128ba.RedZircon=Red Zircon +ore.mix.ross128ba.Fluorspar=Fluorspar + +ore.mix.dilithium=Dilithium +ore.mix.certusquartz=Certus Quartz +ore.mix.infinitycatalyst=Infinity Catalyst +ore.mix.awakeneddraconium=Awakened Draconium +ore.mix.naquadria=Naquadria +ore.mix.cosmicneutronium=Cosmic Neutronium +ore.mix.tengam=Tengam From 30c0cb4a4bb6a6b11370cf1eb7edcba0c3c4fbec Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 21 Sep 2024 14:50:26 +0100 Subject: [PATCH 4/7] Pull in Hodgepodge at runtime to fix random worldgen crashes (#3245) --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 545c924afbe..325c4cbf48f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -80,7 +80,7 @@ dependencies { compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751") compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.68:dev") { transitive = false } + implementation("com.github.GTNewHorizons:Hodgepodge:2.5.69:dev") compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") From a97d808774169d721dcdaadc59a21130042baffa Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:04:49 -0500 Subject: [PATCH 5/7] Cut the singularity shielding casing used in eoh casings (#3247) --- .../tectech/loader/recipe/ResearchStationAssemblyLine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java index e22f934b559..5f7bd76236a 100644 --- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -2421,7 +2421,7 @@ private void addEOHRecipes() { 16_384, // comp/s (int) TierEU.RECIPE_MAX, // eu/t 32, // amperage - new Object[] { CustomItemList.Godforge_SingularityShieldingCasing.get(64), + new Object[] { CustomItemList.Godforge_SingularityShieldingCasing.get(32), // Cosmic neutronium block. getModItem(Avaritia.ID, "Resource_Block", 64, 0), GTOreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64), @@ -2892,7 +2892,7 @@ private void addEOHRecipes() { 16_384, // comp/s (int) TierEU.RECIPE_MAX, // eu/t 32, // amperage - new Object[] { CustomItemList.Godforge_SingularityShieldingCasing.get(64), + new Object[] { CustomItemList.Godforge_SingularityShieldingCasing.get(32), // Cosmic neutronium block. getModItem(Avaritia.ID, "Resource_Block", 64, 0), GTOreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64), From e874e974a4c86b60c07122fafbd1679b1e310f1a Mon Sep 17 00:00:00 2001 From: querns <33518699+querns@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:30:01 -0500 Subject: [PATCH 6/7] Fix MetaBaseItem tooltips crash when holding shift (#3248) --- src/main/java/gregtech/api/interfaces/IItemBehaviour.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java index 1f728025a70..3526fc716bb 100644 --- a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java +++ b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java @@ -13,8 +13,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.collect.ImmutableList; - import gregtech.api.enums.SubTag; import gregtech.api.items.MetaBaseItem; @@ -64,7 +62,7 @@ boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aW List getAdditionalToolTips(E aItem, List aList, ItemStack aStack); default List getAdditionalToolTipsWhileSneaking(E aItem, List aList, ItemStack aStack) { - return ImmutableList.of(); + return aList; } void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand); From 1a7a69c2850cb44a22c5428a27868db13338e292 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Sat, 21 Sep 2024 14:41:18 -0400 Subject: [PATCH 7/7] Fix more collisions (#3246) Co-authored-by: BlueHero233 <87818077+BlueHero233@users.noreply.github.com> --- .../system/material/WerkstoffLoader.java | 3 +- .../werkstoff_loaders/recipe/GemLoader.java | 50 -------------- .../werkstoff_loaders/recipe/OreLoader.java | 65 ------------------- .../recipe/SimpleMetalLoader.java | 10 --- .../gregtech/loaders/load/GTItemIterator.java | 24 ------- .../postload/recipes/ChemicalBathRecipes.java | 2 +- .../recipes/CircuitAssemblerRecipes.java | 57 ---------------- .../recipes/CropProcessingRecipes.java | 18 ++--- .../core/recipe/RecipesMachines.java | 4 +- .../loaders/RecipeGenDustGeneration.java | 39 ----------- .../loaders/RecipeGenMetalRecipe.java | 13 ---- .../xmod/gregtech/loaders/RecipeGenOre.java | 9 --- 12 files changed, 14 insertions(+), 280 deletions(-) delete mode 100644 src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java index c12a3303c99..d99cc2a1974 100644 --- a/src/main/java/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java @@ -110,7 +110,6 @@ import bartworks.system.material.werkstoff_loaders.recipe.MetalLoader; import bartworks.system.material.werkstoff_loaders.recipe.MoltenCellLoader; import bartworks.system.material.werkstoff_loaders.recipe.MultipleMetalLoader; -import bartworks.system.material.werkstoff_loaders.recipe.OreLoader; import bartworks.system.material.werkstoff_loaders.recipe.RawOreLoader; import bartworks.system.material.werkstoff_loaders.recipe.SimpleMetalLoader; import bartworks.system.material.werkstoff_loaders.recipe.ToolLoader; @@ -1657,7 +1656,7 @@ public static void run() { } IWerkstoffRunnable[] werkstoffRunnables = { new ToolLoader(), new DustLoader(), new GemLoader(), - new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), new RawOreLoader(), + new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new RawOreLoader(), new CrushedLoader(), new CraftingMaterialLoader(), new CellLoader(), new MoltenCellLoader(), new MultipleMetalLoader(), new MetalLoader(), new BlockLoader() }; 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 db31c11f0f8..1c313e71725 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 @@ -30,7 +30,6 @@ import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.sifterRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -66,13 +65,6 @@ public void run(Werkstoff werkstoff) { .eut(2) .addTo(compressorRecipes); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(block)) - .itemOutputs(werkstoff.get(gem, 9)) - .duration(5 * SECONDS) - .eut(24) - .addTo(hammerRecipes); - GTValues.RA.stdBuilder() .itemInputs(werkstoff.get(crushedPurified)) .itemOutputs( @@ -89,41 +81,6 @@ public void run(Werkstoff werkstoff) { } - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemExquisite)) - .itemOutputs(werkstoff.get(dust, 4)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemFlawless)) - .itemOutputs(werkstoff.get(dust, 2)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gem)) - .itemOutputs(werkstoff.get(dust)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemFlawed)) - .itemOutputs(werkstoff.get(dustSmall, 2)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemChipped)) - .itemOutputs(werkstoff.get(dustSmall)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - GTModHandler.addCraftingRecipe( werkstoff.get(gemFlawless, 2), 0, @@ -202,13 +159,6 @@ public void run(Werkstoff werkstoff) { texture, new CoverLens(BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mIndex, texture)); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(lens)) - .itemOutputs(werkstoff.get(dustSmall, 3)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - for (ItemStack is : OreDictionary .getOres("craftingLens" + BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""))) { is.stackSize = 0; diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java deleted file mode 100644 index cd5effd0f0a..00000000000 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package bartworks.system.material.werkstoff_loaders.recipe; - -import static gregtech.api.enums.GTValues.RA; -import static gregtech.api.enums.OrePrefixes.crushed; -import static gregtech.api.enums.OrePrefixes.dust; -import static gregtech.api.enums.OrePrefixes.gem; -import static gregtech.api.enums.OrePrefixes.ingot; -import static gregtech.api.enums.OrePrefixes.ore; -import static gregtech.api.recipe.RecipeMaps.hammerRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GTRecipeBuilder.SECONDS; -import static gregtech.api.util.GTRecipeBuilder.TICKS; - -import bartworks.system.material.Werkstoff; -import bartworks.system.material.WerkstoffLoader; -import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GTModHandler; - -public class OreLoader implements IWerkstoffRunnable { - - @Override - public void run(Werkstoff werkstoff) { - if (werkstoff.hasItemType(ore) && werkstoff.hasItemType(ingot) - && !werkstoff.getStats() - .isBlastFurnace()) - GTModHandler - .addSmeltingRecipe(WerkstoffLoader.getCorrespondingItemStack(ore, werkstoff), werkstoff.get(ingot)); - - if (werkstoff.hasItemType(ore)) { - - RA.stdBuilder() - .itemInputs(werkstoff.get(ore)) - .itemOutputs(werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(crushed)) - .duration(16 * TICKS) - .eut(10) - .addTo(hammerRecipes); - - RA.stdBuilder() - .itemInputs(werkstoff.get(ore)) - .itemOutputs( - werkstoff.get(crushed, 2), - werkstoff.contains(SubTag.CRYSTAL) ? werkstoff.get(gem) : werkstoff.getOreByProduct(0, dust), - Materials.Stone.getDust(1)) - .outputChances(100_00, 10_00, 50_00) - .eut(2) - .duration(20 * SECONDS) - .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 d0b501d157e..a9c1143e58f 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 @@ -14,7 +14,6 @@ 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; @@ -26,8 +25,6 @@ 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; @@ -91,13 +88,6 @@ public void run(Werkstoff werkstoff) { false) : TextureFactory.of(texSet.mTextures[block.mTextureIndex], werkstoff.getRGBA(), false); GregTechAPI.registerCover(werkstoff.get(plate), texture, null); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(plate)) - .itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - return; } diff --git a/src/main/java/gregtech/loaders/load/GTItemIterator.java b/src/main/java/gregtech/loaders/load/GTItemIterator.java index 63ac59b7c24..dc0f951ebcc 100644 --- a/src/main/java/gregtech/loaders/load/GTItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GTItemIterator.java @@ -125,36 +125,12 @@ public void run() { GTLog.out.println( "GTMod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Items.rotten_flesh, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L)) - .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .duration(10 * SECONDS) - .eut(1) - .addTo(cannerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L)) - .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .duration(5 * SECONDS) - .eut(1) - .addTo(cannerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L)) - .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .duration(5 * SECONDS) - .eut(1) - .addTo(cannerRecipes); GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L)) .itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L)) .duration(30 * SECONDS) .eut(1) .addTo(cannerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L)) - .itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1)) - .duration(15 * SECONDS) - .eut(1) - .addTo(cannerRecipes); GTLog.out.println("GTMod: Scanning ItemList."); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index ee5e1d83168..5f3bf249545 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -104,7 +104,7 @@ public void run() { // carpet cleaning recipes GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.carpet, 1, 32767)) + .itemInputs(new ItemStack(Blocks.carpet, 1, i)) .itemOutputs(new ItemStack(Blocks.carpet, 1, 0)) .fluidInputs(Materials.Chlorine.getGas(25)) .duration(20 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index b17eecc7487..90e9b15f56a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -137,63 +137,6 @@ public void registerRailcraftRecipes() { .duration(25 * SECONDS) .eut((int) TierEU.RECIPE_LV) .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index 7833b6fc5fa..f998cf2f58d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -32,7 +32,7 @@ public void run() { tCrop = ItemList.Crop_Drop_Tine.get(1); this.addProcess(tCrop, Materials.Tin, 100, true); this.addProcess(tCrop, Materials.Cassiterite, 100, false); - this.addProcess(tCrop, Materials.CassiteriteSand, 100, true); + this.addProcess(tCrop, Materials.CassiteriteSand, 100, false); tCrop = ItemList.Crop_Drop_Plumbilia.get(1); this.addProcess(tCrop, Materials.Lead, 100, true); this.addProcess(tCrop, Materials.Galena, 100, false); // @@ -142,13 +142,15 @@ public void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterial .eut(24) .addTo(UniversalChemical); - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(16, tCrop)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) - .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) - .duration((int) (aMaterial.getMass() * 128)) - .eut(384) - .addTo(autoclaveRecipes); + if (aMainOutput) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, tCrop)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) + .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) + .duration((int) (aMaterial.getMass() * 128)) + .eut(384) + .addTo(autoclaveRecipes); + } } public void addProcess(ItemStack tCrop, Materials aMaterial, int chance) { diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index a0f647198f5..23cc3f223e6 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -3292,9 +3292,9 @@ private static void fakeMachineCasingCovers() { aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7); } // Add recipes for new ones - for (int i = 0; i < aMaxTier; i++) { + for (int i = 0; i < aMaxTier - 1; i++) { GTValues.RA.stdBuilder() - .itemInputs(CI.getTieredMachineCasing(i)) + .itemInputs(CI.getTieredMachineCasing(i), GTUtility.getIntegratedCircuit(i)) .itemOutputs(aTier[i]) .duration(i * 5 * SECONDS) .eut(GTValues.VP[i]) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java index 4b7d94f1f43..2c380e6eba1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java @@ -1,8 +1,6 @@ package gtPlusPlus.xmod.gregtech.loaders; -import static gregtech.api.enums.GTValues.RA; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -116,28 +114,6 @@ private void generateRecipes(final Material material, final boolean disableOptio final ItemStack[] inputStacks = material.getMaterialComposites(); final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); - // Macerate blocks back to dusts. - final ItemStack materialBlock = material.getBlock(1); - final ItemStack materialFrameBox = material.getFrameBox(1); - - if (ItemUtils.checkForInvalidItems(materialBlock)) { - RA.stdBuilder() - .itemInputs(materialBlock) - .itemOutputs(material.getDust(9)) - .eut(2) - .duration(20 * SECONDS) - .addTo(maceratorRecipes); - } - - if (ItemUtils.checkForInvalidItems(materialFrameBox)) { - RA.stdBuilder() - .itemInputs(materialFrameBox) - .itemOutputs(material.getDust(2)) - .eut(2) - .duration(20 * SECONDS) - .addTo(maceratorRecipes); - } - if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(tinyDust)) { generatePackagerRecipes(material); } @@ -145,7 +121,6 @@ private void generateRecipes(final Material material, final boolean disableOptio ItemStack ingot = material.getIngot(1); if (ItemUtils.checkForInvalidItems(normalDust) && ItemUtils.checkForInvalidItems(ingot)) { addFurnaceRecipe(material); - addMacerationRecipe(material); } // Is this a composite? @@ -400,20 +375,6 @@ public static boolean generatePackagerRecipes(Material aMatInfo) { return true; } - private void addMacerationRecipe(Material aMatInfo) { - try { - Logger.MATERIALS("Adding Maceration recipe for " + aMatInfo.getLocalizedName() + " Ingot -> Dusts"); - RA.stdBuilder() - .itemInputs(aMatInfo.getIngot(1)) - .itemOutputs(aMatInfo.getDust(1)) - .eut(2) - .duration(20 * SECONDS) - .addTo(maceratorRecipes); - } catch (Throwable t) { - t.printStackTrace(); - } - } - private void addFurnaceRecipe(Material aMatInfo) { ItemStack aDust = aMatInfo.getDust(1); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java index 634784952ac..2272df0e2af 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java @@ -4,7 +4,6 @@ import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.HashSet; @@ -74,18 +73,6 @@ private void generateRecipes(final Material material) { Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Success"); } - if (ItemUtils.checkForInvalidItems(material.getIngot(1)) - && ItemUtils.checkForInvalidItems(material.getHotIngot(1))) { - - GTValues.RA.stdBuilder() - .itemInputs(material.getHotIngot(1)) - .itemOutputs(material.getIngot(1)) - .duration((int) Math.max(material.getMass() * 3L, 1L)) - .eut(material.vVoltageMultiplier) - .addTo(vacuumFreezerRecipes); - Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Success"); - } - if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getLongRod(1))) { GTValues.RA.stdBuilder() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java index ed8f446baba..c8c1d28547f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java @@ -193,15 +193,6 @@ private void generateRecipes(final Material material, final boolean disableOptio ItemStack matDustA = getDust(bonusA); ItemStack matDustB = getDust(bonusB); - /** - * Package - */ - // Allow ore dusts to be packaged - if (ItemUtils.checkForInvalidItems(material.getSmallDust(1)) - && ItemUtils.checkForInvalidItems(material.getTinyDust(1))) { - RecipeGenDustGeneration.generatePackagerRecipes(material); - } - /** * Macerate */