From 750ccb57f20181e1220eb2f6f2915857a983219f Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:48:38 -0400 Subject: [PATCH 1/6] Fix block recipes (#3272) --- .../gregtech/loaders/oreprocessing/ProcessingBlock.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 056feb0b33c..bedbb2d41ea 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -81,7 +81,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Water.getFluid( @@ -93,7 +93,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { .addTo(cutterRecipes); GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( GTModHandler.getDistilledWater( @@ -105,7 +105,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { .addTo(cutterRecipes); GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L)) .fluidInputs( Materials.Lubricant.getFluid( @@ -154,7 +154,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { if (tStack2 != null) { GTValues.RA.stdBuilder() - .itemInputs(aStack) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1)) .itemOutputs(tStack2) .duration(5 * SECONDS) .eut(24) From c3c57801e1440cba7872108121c28fc689e8968b Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Tue, 24 Sep 2024 13:58:48 -0400 Subject: [PATCH 2/6] Cactus/Sugar Charcoal/Coke Blocks (#3269) Co-authored-by: Martin Robertz --- .../java/gregtech/api/recipe/RecipeMaps.java | 18 ++++++ .../java/gtPlusPlus/core/block/ModBlocks.java | 14 ++++ .../core/block/fuel/BlockCactusCharcoal.java | 55 ++++++++++++++++ .../core/block/fuel/BlockCactusCoke.java | 55 ++++++++++++++++ .../core/block/fuel/BlockSugarCharcoal.java | 55 ++++++++++++++++ .../core/block/fuel/BlockSugarCoke.java | 55 ++++++++++++++++ .../core/recipe/RecipesGeneral.java | 61 ++++++++++++++++++ .../assets/miscutils/lang/en_US.lang | 26 ++++++++ .../blocks/fuel/blockCactusCharcoal0.png | Bin 0 -> 4479 bytes .../blocks/fuel/blockCactusCharcoal1.png | Bin 0 -> 4807 bytes .../blocks/fuel/blockCactusCharcoal2.png | Bin 0 -> 4773 bytes .../blocks/fuel/blockCactusCharcoal3.png | Bin 0 -> 4742 bytes .../blocks/fuel/blockCactusCharcoal4.png | Bin 0 -> 4678 bytes .../blocks/fuel/blockCactusCharcoal5.png | Bin 0 -> 4637 bytes .../textures/blocks/fuel/blockCactusCoke0.png | Bin 0 -> 4587 bytes .../textures/blocks/fuel/blockCactusCoke1.png | Bin 0 -> 4797 bytes .../textures/blocks/fuel/blockCactusCoke2.png | Bin 0 -> 4773 bytes .../textures/blocks/fuel/blockCactusCoke3.png | Bin 0 -> 4740 bytes .../textures/blocks/fuel/blockCactusCoke4.png | Bin 0 -> 4679 bytes .../textures/blocks/fuel/blockCactusCoke5.png | Bin 0 -> 4640 bytes .../blocks/fuel/blockSugarCharcoal0.png | Bin 0 -> 4564 bytes .../blocks/fuel/blockSugarCharcoal1.png | Bin 0 -> 4781 bytes .../blocks/fuel/blockSugarCharcoal2.png | Bin 0 -> 4748 bytes .../blocks/fuel/blockSugarCharcoal3.png | Bin 0 -> 4711 bytes .../blocks/fuel/blockSugarCharcoal4.png | Bin 0 -> 4658 bytes .../blocks/fuel/blockSugarCharcoal5.png | Bin 0 -> 4620 bytes .../textures/blocks/fuel/blockSugarCoke0.png | Bin 0 -> 4544 bytes .../textures/blocks/fuel/blockSugarCoke1.png | Bin 0 -> 4773 bytes .../textures/blocks/fuel/blockSugarCoke2.png | Bin 0 -> 4741 bytes .../textures/blocks/fuel/blockSugarCoke3.png | Bin 0 -> 4708 bytes .../textures/blocks/fuel/blockSugarCoke4.png | Bin 0 -> 4655 bytes .../textures/blocks/fuel/blockSugarCoke5.png | Bin 0 -> 4621 bytes 32 files changed, 339 insertions(+) create mode 100644 src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java create mode 100644 src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java create mode 100644 src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java create mode 100644 src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal0.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal1.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal2.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal3.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal4.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal5.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke0.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke1.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke2.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke3.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke4.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke5.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal0.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal1.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal2.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal3.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal4.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal5.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke0.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke1.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke2.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke3.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke4.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke5.png diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index 47060d088b9..77e49e37c71 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -26,6 +26,7 @@ import java.util.Optional; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -85,6 +86,7 @@ import gregtech.nei.formatter.FusionSpecialValueFormatter; import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter; import gregtech.nei.formatter.SimpleSpecialValueFormatter; +import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; import mods.railcraft.common.items.RailcraftToolItems; @@ -685,6 +687,22 @@ else if (Materials.PhasedIron.getMolten(1) .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount / 2)) .setDuration(aDuration * 20 / 3); } + ItemStack cactusCokeBlock = new ItemStack( + Item.getItemFromBlock(ModBlocks.blockCactusCoke), + aCoalAmount * 2, + 0); + ItemStack sugarCokeBlock = new ItemStack( + Item.getItemFromBlock(ModBlocks.blockSugarCoke), + aCoalAmount * 2, + 0); + coll.derive() + .setInputs(aInput1, aInput2, cactusCokeBlock) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount * 2)) + .setDuration(aDuration * 20 / 3); + coll.derive() + .setInputs(aInput1, aInput2, sugarCokeBlock) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount * 2)) + .setDuration(aDuration * 20 / 3); } return coll.getAll(); }) diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 6169581257e..b812a4739e9 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -4,6 +4,10 @@ import net.minecraftforge.fluids.Fluid; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.block.fuel.BlockCactusCharcoal; +import gtPlusPlus.core.block.fuel.BlockCactusCoke; +import gtPlusPlus.core.block.fuel.BlockSugarCharcoal; +import gtPlusPlus.core.block.fuel.BlockSugarCoke; import gtPlusPlus.core.block.general.BlockCompressedObsidian; import gtPlusPlus.core.block.general.BlockFluidTankInfinite; import gtPlusPlus.core.block.general.BlockHellFire; @@ -53,6 +57,11 @@ public final class ModBlocks { public static Block blockWitherGuard; public static Block blockCompressedObsidian; + public static Block blockCactusCharcoal; + public static Block blockCactusCoke; + public static Block blockSugarCharcoal; + public static Block blockSugarCoke; + public static Block blockCustomJukebox; public static Block blockPooCollector; @@ -82,6 +91,11 @@ public static void registerBlocks() { blockWitherGuard = new BlockWitherProof(); blockCompressedObsidian = new BlockCompressedObsidian(); + blockCactusCharcoal = new BlockCactusCharcoal(); + blockCactusCoke = new BlockCactusCoke(); + blockSugarCharcoal = new BlockSugarCharcoal(); + blockSugarCoke = new BlockSugarCoke(); + blockCircuitProgrammer = new BlockCircuitProgrammer(); blockDecayablesChest = new BlockDecayablesChest(); diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java new file mode 100644 index 00000000000..193ca79c5d6 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCharcoal.java @@ -0,0 +1,55 @@ +package gtPlusPlus.core.block.fuel; + +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class BlockCactusCharcoal extends Block { + + private final IIcon[] textureArray = new IIcon[6]; + + public BlockCactusCharcoal() { + super(Material.rock); + this.setBlockName("blockCactusCharcoal"); + this.setStepSound(soundTypeStone); + GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCactusCharcoal"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + for (int i = 0; i < textureArray.length; i++) { + this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockCactusCharcoal" + i); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return this.textureArray[meta]; + } + + @Override + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + for (int i = 0; i < textureArray.length; i++) { + ItemStack is = new ItemStack(item, 1, i); + ItemUtils.registerFuel(is, 4000 * (int) Math.pow(9, i)); + list.add(is); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java new file mode 100644 index 00000000000..5c01fb20c8c --- /dev/null +++ b/src/main/java/gtPlusPlus/core/block/fuel/BlockCactusCoke.java @@ -0,0 +1,55 @@ +package gtPlusPlus.core.block.fuel; + +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class BlockCactusCoke extends Block { + + private final IIcon[] textureArray = new IIcon[6]; + + public BlockCactusCoke() { + super(Material.rock); + this.setBlockName("blockCactusCoke"); + this.setStepSound(soundTypeStone); + GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCactusCoke"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + for (int i = 0; i < textureArray.length; i++) { + this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockCactusCoke" + i); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return this.textureArray[meta]; + } + + @Override + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + for (int i = 0; i < textureArray.length; i++) { + ItemStack is = new ItemStack(item, 1, i); + ItemUtils.registerFuel(is, 8000 * (int) Math.pow(9, i)); + list.add(is); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java new file mode 100644 index 00000000000..2fa755ea9c7 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCharcoal.java @@ -0,0 +1,55 @@ +package gtPlusPlus.core.block.fuel; + +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class BlockSugarCharcoal extends Block { + + private final IIcon[] textureArray = new IIcon[6]; + + public BlockSugarCharcoal() { + super(Material.rock); + this.setBlockName("blockSugarCharcoal"); + this.setStepSound(soundTypeStone); + GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockSugarCharcoal"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + for (int i = 0; i < textureArray.length; i++) { + this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockSugarCharcoal" + i); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return this.textureArray[meta]; + } + + @Override + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + for (int i = 0; i < textureArray.length; i++) { + ItemStack is = new ItemStack(item, 1, i); + ItemUtils.registerFuel(is, 4000 * (int) Math.pow(9, i)); + list.add(is); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java b/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java new file mode 100644 index 00000000000..1ef9c3167ea --- /dev/null +++ b/src/main/java/gtPlusPlus/core/block/fuel/BlockSugarCoke.java @@ -0,0 +1,55 @@ +package gtPlusPlus.core.block.fuel; + +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class BlockSugarCoke extends Block { + + private final IIcon[] textureArray = new IIcon[6]; + + public BlockSugarCoke() { + super(Material.rock); + this.setBlockName("blockSugarCoke"); + this.setStepSound(soundTypeStone); + GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockSugarCoke"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + for (int i = 0; i < textureArray.length; i++) { + this.textureArray[i] = iconRegister.registerIcon(GTPlusPlus.ID + ":fuel/blockSugarCoke" + i); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return this.textureArray[meta]; + } + + @Override + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + for (int i = 0; i < textureArray.length; i++) { + ItemStack is = new ItemStack(item, 1, i); + ItemUtils.registerFuel(is, 8000 * (int) Math.pow(9, i)); + list.add(is); + } + } + +} diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java index 476e49248f1..45329aac169 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java @@ -3,6 +3,7 @@ import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.core.recipe.common.CI.bitsd; @@ -58,6 +59,7 @@ public static void loadRecipes() { OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2); run(); addCompressedObsidian(); + addFuelBlocks(); migratedRecipes(); } @@ -273,6 +275,65 @@ private static void run() { .addTo(assemblerRecipes); } + private static void addFuelBlocks() { + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemCactusCharcoal, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCharcoal, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemCactusCoke, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCoke, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemSugarCharcoal, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCharcoal, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(ModItems.itemSugarCoke, 9, 0)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCoke, 0, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCharcoal, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCharcoal, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCoke, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockCactusCoke, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCharcoal, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCharcoal, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + for (int i = 1; i < 6; i++) { + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCoke, i - 1, 9)) + .itemOutputs(ItemUtils.simpleMetaStack(ModBlocks.blockSugarCoke, i, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + } + private static boolean addCompressedObsidian() { // Invert Obsidian ItemStack aInvertedObsidian = ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1); diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index 047d3340793..db483cc68a2 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -202,6 +202,32 @@ tile.blockCompressedObsidian.9.name=Quadruple Compressed Glowstone (6561) tile.blockCompressedObsidian.10.name=Quintuple Compressed Glowstone (59049) tile.blockNet.name=Net +# Fuel Blocks +tile.blockCactusCharcoal.0.name=Cactus Charcoal +tile.blockCactusCharcoal.1.name=Compressed Cactus Charcoal +tile.blockCactusCharcoal.2.name=Double Compressed Cactus Charcoal +tile.blockCactusCharcoal.3.name=Triple Compressed Cactus Charcoal +tile.blockCactusCharcoal.4.name=Quadruple Compressed Cactus Charcoal +tile.blockCactusCharcoal.5.name=Quintuple Compressed Cactus Charcoal +tile.blockCactusCoke.0.name=Cactus Coke +tile.blockCactusCoke.1.name=Compressed Cactus Coke +tile.blockCactusCoke.2.name=Double Compressed Cactus Coke +tile.blockCactusCoke.3.name=Triple Compressed Cactus Coke +tile.blockCactusCoke.4.name=Quadruple Compressed Cactus Coke +tile.blockCactusCoke.5.name=Quintuple Compressed Cactus Coke +tile.blockSugarCharcoal.0.name=Sugar Charcoal +tile.blockSugarCharcoal.1.name=Compressed Sugar Charcoal +tile.blockSugarCharcoal.2.name=Double Compressed Sugar Charcoal +tile.blockSugarCharcoal.3.name=Triple Compressed Sugar Charcoal +tile.blockSugarCharcoal.4.name=Quadruple Compressed Sugar Charcoal +tile.blockSugarCharcoal.5.name=Quintuple Compressed Sugar Charcoal +tile.blockSugarCoke.0.name=Sugar Coke +tile.blockSugarCoke.1.name=Compressed Sugar Coke +tile.blockSugarCoke.2.name=Double Compressed Sugar Coke +tile.blockSugarCoke.3.name=Triple Compressed Sugar Coke +tile.blockSugarCoke.4.name=Quadruple Compressed Sugar Coke +tile.blockSugarCoke.5.name=Quintuple Compressed Sugar Coke + # GT++ Items diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal0.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal0.png new file mode 100644 index 0000000000000000000000000000000000000000..ff7e412f64b5c402639f79dc510afe098e7367d0 GIT binary patch literal 4479 zcmeHKeNa@_6@LrmLli_sV}!mON7-jESPeM#JyoyCVz?S5S$?X|XKB zV&MTiWk11Wq7R5{f*v7@#3I4A3uG?nqK_zxWKq(%5A@`){v7D3VIMI@C5yn~VLS{% zfu028D}7EalK$4zMt^8F zr&P_~ThMkj?zePH=|7{ai<*-j%DwPHvi+1TNTyM-QHzBlbzAY-#$FtxbruuX+5`k=0$I4`sTow9q)J#&rFz^ zp{{7R-R;SCymsZHKe_X0+uXJDcF!+*aqE(SjyLO{>0E!J;|t@rGb0Udbm&V>&K`Eo z>b#W=`fDk8l5V!n;p3msRnfE^XbOeCm{kzw?OibmXke z+s#W1%}0(kU5*?ozh_;y>8k~U8va9O{G5|6G(8c9fG4A(LJ)j3LDbdNDeKfq zufLp784L!3qzH<_!2=J}djuwkdjd;Eh!BPe1z11t6L_yjE@CncZ;fD7C}3VbnxETe zwT{7i0$~<_4wSnQL;-J&pGD?cJuM1IywX71H7ctwDp6PBlfT zSdvqbXabbQ6A%~=i$o{@SMq?PX0#5ZW1P5y)pEFo)3LZAJzayV4M=TZ8B&u@sV6|J z_481bjB8?6A`}NuIs-$hS*;UCPMsFls3`!|=ykZ>!0MbV>(C(;BSCR2{e;)=X5ct^ zH&c!XpQl`!5DBNV3oJ$jr6k8K1ujN#LV!_`&wFZu;}dq?jcfuVvZ(?hRHT7S*HaWo zC}#=pN#qYeC5o6*@07yDW1(R)KrAEHDF8@z*bANGM~vY0+r3_wQ8Cta$EK}toj68d zOpJg4bgU2CNBb~NLT3)8FTz>99Ph0EU*6*7k!OHE9C;oefc5JoQ|Lz7P<7}j^yuQH zt0b38mx5;4&=vwrE#jm+0V_1cRxqA&1l=QCuA_GT2TFlLPOU+!rf`OIGPs6ys^R=N z9aM%&ZP05ehX&~;qX)cBp^ovR>~i1{xPtPO{zA!9rGrYF>|IxZ#8UvmaMFNN>i;B+ z2yd7Wd&cOFGl>7O>BNVI-8Q6Hm7#?zL8IkF9<01Y#e-Mi*|_Jas21%7xO>=zNl;YSKWWC ztbBfcR^+8a7aDa>A3fO?{nkMB`R`uZ-&~evKAq6}9KqzdmEnD*ntk{IvFB#VS|YrR;mDCzqU!QJws@{XNXQbKAy@6UDtB z-wdYwuJrBh))|jg-W+(hW$pSy*RPdF|8h|~@kNm}zy0C|^`^$G*Yxp!YPr=oSkJc% xum?-}AACI|Pgr-Pspo~y&kq0Me#4E+o~X{qoyFIF)dkdH7V{d@iItmn{2LN&9@+o^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal1.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal1.png new file mode 100644 index 0000000000000000000000000000000000000000..910f192f6c4300cf4d4ea1ac7dde0fe2aca9d00f GIT binary patch literal 4807 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 Y*a*sZZ)$zF2hxeq8M&4t&z5ZY4-&~@VE_OC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal4.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal4.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ce2bad02862f4a1d83cba3780619d4201d3c86 GIT binary patch literal 4678 zcmeHKeQ*=U6+hV+VN(-_P|_hbTtr9!bJBfCvhHlfHj=@@$QZ1Efi~fE+LJG~bV54Y zvg??S7zmgqP7EmpCt+X`;y{@~KNxTcCO}MsLufJ#lcW>eGAWdHY6z6H1v`CrlD{UI z>3CZH^J#YW?c2A%eebt#-|04&6wgmhnUaEGSgNbgxdi$&wT&B#VY>3$AAJpj3#iN` zx?HodaWDW&-55+4x6=)g6Lg7KBIq|ln+URMqqZr!B(2{H@*{D18^|-`HtHHmmw=^0 z-wKTec@p&RK$AAb_Iej&^%!Ix_31MqOif%g<1kYstin&P(?C z`r}Ps9XNlrFa1%ApXzvGV&@M2v(t~9W_JDNWbGTat}TZb)EDRQA17^|cJyHM-up+p z4|g!9M9#7({qf1;0|$OZW$v7E)4bYwQTgCudg}hxBese!XIFgDa)R9P$+B0E7Dpx} z&+#Ttbk2NxPa|FFlrFjsHSg(->c4s6uRlHeX7m0r^IlBy?9Q+5?Ot=EePw2@V+bfEi(sjL`cbuszD!sGzT*j(@ z{;t{m>Gpf(4fRu_xqIag5}rSjcX{Wfm62)t9?08yY{3_pep5$u-Qi2wzir=l{K%S* z%y;kVvR@B3>jQ1$F>Jz0$y273xfgPR95C`e*^7+PKuA3>EGIV_;)M#N;9lgHf_6hs z`w0Us`Rs;e7B}e*IZ(M&SQkd6b;TZ`u0mjahTJDpa-tjn1dzhx(LiM|!bR-{4VMF1 zRhtaBW};Ns4P}r=4mpf)v(aoMiGrw9O&gv}!E?eskz3-N7l(k6-B7M5AD2(*#%$k=mfbM~Pr$x(X4)aH5D1mO_do2XPgX_sUg@-C%%uyx+e- z$n7404@TlF03W6(A2Lx!(i8}ohOUSx1=Ro&cj!A;L_D=2WLknEa#dJB1=T31Odks2 z69(3Ys=}38I6lFIDp3GTBd{wqY)kdV4XjWp@JoS^whG7|W~oTxAX&qFQ)jerhB^Yv z2XKd3_s6aogO%IOIc1?rb+Pl$GU4MzDwk60H`(%+Mm?HQTI&jTNk-Ab72a;x#Crz|E7x0UnN1 z3h;hp3I+Yzgi1JkA;I^fLLD5QvlHP5DVuBBVLii9$Bum8wRTGz_c5#laE(; zC$As?9jL>e{yI#MP?=-yt8i}FCyBNH&04)Ycn;XZkrzr4*uPd&#cot7S{)n3hLw_b zm2h0U6dW(aLWuCy$fx-USg|RgoDcdDRF8PN_UonZNCg^+7S_Vh1W$@QVHQLN&d+Bh zyaL6rHVf@FBkOSVh%72Kd>G~Xfk)s9(o=gw;WM>^nl;?IrW~oK0E7`FOVEsmqB(}* zC|jH`)BO*Tw3=DbOY;N^nF%Rs5eP_HxHTxtj7XNw;@Mc{3=sIgh8TM{!+p|nA|7In zNiB>0hni#h*0IM7hSX7@CZ>b>4CUT5Q19cMfxq|jiKpBB+yci(HyIJXqjZhZH6jK^ zWIUQ(qjZgkfe{&xX4n6Xu9U$qMihiUdNuGp*cmwOfp5t%{(N^nh8=oo{5?Ji#$&xj z^PQLji(`F~l_L2)GOaQ9D?HEO`Tk>R546oK3|&9Iudlu@LEn)0#ClR(=Rgm2)?Q$jUwJK~ z=Ro$Y%Qq8otT0!vq>Fcd*+6Z4q3dKv+b>ou`nc$!qIuXem(Trs>UQFLb<*4&jo6$l z=JKSxZ5O6(&uQv0?!B3c<+ps6{PPLbTmJZ%<95d4_hu|>P%gC`Jc3;lsbhQ2uIO4? zdewU(+oOMK>!*LdV0|{@PW!2IC(GW=ye-arx?#@7YqwI@k`vON)8o0XAMe^bTR(mB zj915B*asjJraxAG7> O<|-(59-O;s{eJ-Cr9dVC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal5.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCharcoal5.png new file mode 100644 index 0000000000000000000000000000000000000000..d7ebebb6fc74108c990375ad8cf9d439d1c40e9e GIT binary patch literal 4637 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 Ze#?0J_k}&bsRvPjOvWt3;U$IZ{tZ&`ezE`n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke2.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockCactusCoke2.png new file mode 100644 index 0000000000000000000000000000000000000000..f59550f3adbec83f5555305648db26f37a9c49ff GIT binary patch literal 4773 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal1.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal1.png new file mode 100644 index 0000000000000000000000000000000000000000..4b350b60de7569b1fbd6d70f897f0c0530950a88 GIT binary patch literal 4781 zcmeHLe^3)w9^Zfn204LRy|HLxyn6oVCcB$#NLIp+5`+Mu6!1s2y>qks0t+M?k_7^C ziWQ3pr%+m}6kA5C74W>1-f0yrI4#nm*0UYQT3caiJ6yF_y(=f@C~|K%5MbJw8)xc& zB=hpV@B6;*^SLqcHR z2pa+AnXqqxjjQzT^*)rvSCI5hfs!9=qkW>;lCB_BIHuC*;d+eFQka1vGzwfpkva;~ z!u@4UV;+e}OYr^x=wAgFAD?cHk5@Qdyp78T2;yn{L!B|{gV>0!-)HV$f+}atEchsW z&-Z(k+y5p{I2f9{W#!yd)zC`|L(JQ%_w}uD-e!*6===Im>*iKP(1vpTGX3HcNmaus za@1C<0gX4{6(+lU=Rb8D+OYsU>MPL1HaL$|&KDYa_v8?P= z^}i2&(*Gc0KADYo{x-aO7yZSDPkg9(wI!FOMbV!IR6Tk8u;>1n<9%(N znh$Ig`E10(S;6*0f5n$J%=wqLz;sFInN7@VZ9JyW`*um*wfYWh*JrDC9#3=6oc6SJ zTDWP^!MznkzKOeJK2p1P$P+lc_2%mz?XPW}vV40$R#RNjP~XPe?Q56Dkl#HOa6NXg z`g&Q7Y}1QP&$%0KG2L7v@*uk}nZLWVaNV8yfi)@B5wfAHon3_~nRm+1&RzH4k83Sg zUc0Z|QZ~;Mvybob+k7mxx8d?y_ml6;h;2BLd<_Y#?DTAEyS(gV`#YzOZM>kpcTcwL zO;>H8y*U^`ezlg%S}m-$q*4rTSJ5nQ1uBo-DFzIQit#vUCJzV-E6C;?M&+&c4yA%) zjmlM|1+zHgK@OKx>H?XiX<1BZ9%EpYG12lU4+R12K%f;Kd%nX>d5lU4mx8jWRx1^f ziI8Vhu7-IO&%1y^tJ114G{M6a5z1(}BFe?us0`Ec5ePUkDsu$ENvYMv#l@;(jf!_= zt8s(DpvDL_L7>nAb(c5<+JidW3q%Mnh6%VC7v~f>-k}gNX)9kS7?nymuNd{u?zC8Z z@DBF~3y=@BhjyxQ6{fb^)#F#Vg@hsqGUCwBu5f3SIDt9?xcNdC0}_gWLs&2#f@OT` zorSJ^={PK-2Km4aP2F%;e8QIEjq|M#DahvRPH7b+dxE9F*~ZA4;F~xj9cR2FaJdh6 zg7xUxC1Yr1u}~(SDHPo^n~X|ve~RT9j-@1#CV);0$Vil72^`gGNGocfwKy6{>IjU* zBO@`bZXA@^;TC8I14JkYuHqn$h9NPGByFe-*jQA{TJ@+wLz1Z0VAV4~ueTB;I}YMm z7YDPF&L8iU2*pAu9K%W6MiQvaW&;okGoS`7z)_6RGBj=_BWWB+P%J|&=UsLhhLf|? z*+A`dWJ?nw;Z$6@*{CE`*qA0gpB8Lzfl-;tISM^v6Iq-cWD2y%CLT#d;# ztE5m!mx7`h?-AT|5%2~JVtJ>S9NLi$VD%VD*HJz9GpRt(It__y7}Q_`22^V!8PuxR zvnZ>ft$@|(NdUa@^P#(Wn@~)Pse zB1}VRh!MinkN$`T4A)_dhDKS;W<#|YsYCS!9H3CG)zCUCYl!q_j?d{|;E3?MnVfjU zD79D?M}r!r{z=%q2IJ}|q{gd*^%<6XwXfcfa0dN-l&_I=dz4!!6qB1g6u*;nP15yH z3_O(aWOhx`^-v5vl<{PC{bF><$DSC01OCt}hR=iB_Wt?=e3qP&9cPI{kRv;S@6+&a z0A#8)CDDYC;`^IA{vy;&b0$6Sh7Y6%#3rl!vYCgi#i*& z*4EaRp~6$Y8%Ffy@87!H6S<;y@Zb&CXGc+d`N_dx-I<`+L~v`7tBF z8U0qtpNBRKf7%(-GUw$@Tm$y*ACto9i0*{=4N>!Ubj97dMXac)D|s_4?Bw9CE3<0r zdun!cU;p-*6;-&aqqpFb*HYyWb*ob!(bLe@CvUoWf=9PsfA1S?x_?LW)qfsMMRpyi zD*Vlb{>S=Xc)oh~TQ;1T VaV$A@Gh`hxC#0DUKeO(o{{gAheO~|o literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal2.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal2.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8a9a4425ebe04b2953884e0346a1d081355d8a GIT binary patch literal 4748 zcmeHLeNaWe239lr1G4BBZ zSwxGAfP=QEwU%~W9ZOZ}u8ztewc=PxS6$k%bscqAnOYZD+of7tOYvjxdkJ5=o!Mcg z{zo!*-nsXl^SkH#&bcQ%s_j{e;$o-AA_x*^O|xXf=OlSVk3$eu{_Rihz{#f|&+4*T z=OEE=0yR}*5mi`EHAIe3jX}o1_20u04`o?L9@ABk%5y!G9}UZ!pgcRQBirDr2qX?Z z8{ik@-1gXYJT5q5U z9GuBK#*X=?_M>hotQtP{kJ*0=AfFXQ&xOz zf9tCqnz}==sqapDdF_&!nc916X2n@+YIk}c(+rq1sBGk&di<84pHcWh-YeE8^xN7Sym!*CbIhRmVLpyAGLHH zXd_R!X#L_Dv!;&sHXX$0Zkv9ST46aWot#EIwzr|#Sa5Yt!KM0R*w)W-x3px5Q(~TR z#>87@zq_N7@L2e>*8LlI+zUoMSa;*~k9Td{J9c4Rq+@$>(Y>x!-?T2Bo238OlaW{E z->JP)wqCV*+4kRv4LxiJ-+(9H}Cz{#-q)vKB4;h zRP){rY>e{m9*-asm-3E0DbJQkvw~O4aDo$PgI>R!FeEW4=x5jhAgP_e&HK!np4MX; zHP4wfxq2IB^QVA(KCLtWa!RutY-s^&;xtLm#wG@72;c=0qYipKK9LTZH3}{bWqDbr zQ7bA^fmxFW>nKGC05zqhv>2Ki57YswZ)`X z2)K2)$z;-DgpMFksDX+lK8XpUKJf_|B7|W9A{*fS5-<4FGA82`3MI2f1NYVa{(1d2 z+W@>z46^|F&;=R44%cEjuU9wJLX=XAAV}DupR^DiC4QjG2BJ_HU_ojT@JUY$h2Yo$ zdw*fTqlCk;I^Y3bs4Bu!@nJ{GH*UZ}rohd6{fZSNdzhxgy9UV`=9|2ugfr9;Xg+{D zOuIjJMHy<@Y_vsS3uX7L7PCe^pXLOX=V(P_2wj9jM>Kv{>e&?y1HNJ79N2p+R$pz987+u(KL7>Thk z5`drseb~|8hfxf6=8*d`oK4_(SIPg=mM@Pw5$eN~r|}{@zeHII-KZR}A~Xw4J-l+2 z)N18Y&hHS+xELi_ZK+Y$Vx~@c3% z{MzxF2z-*|@+{YcamkxjtBxma-TC0b)PEUFtcyn`m*5RzUV&;0 z`Oj;8K4V>fcL^46mC805JpEA6e<`^xe1=8NyGM6jOEYug*UCRUBnEa-fL z`PIwymsVz{uS+|>U6W~5ec4d3X3rN#yUUM_`INGKecV*F?$4KdGHj3h(R*=i-(hbx zUT120@5dPYqugA4VP`jKayvG6e_M^e^Z9F{_Eg*n`-StTpQ?%OG%bh*8(OeR`>yBO zf9PA%czf3VLx(pV%)hm4+NG6_Ll$9uZ&|Ep?6#jJJgxsYL)m(J7e_T;{Q9!3>FsZ) amm{kywp=~qJu(53ida*#Ec+HLU-KV@Zg3$0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal3.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal3.png new file mode 100644 index 0000000000000000000000000000000000000000..8aea97b487cc42b8cc33e4b40b09bd88b4f5ce0c GIT binary patch literal 4711 zcmeHLdr(tX8ov>dhwG}y)~@xD4XhREO>$r1=1K&XLMs!bz5tpTkCA=w5;q?cGlYM`lwp=+?(*4?aU4{ z^*@q1bG~!VcYfdZ{mys3o0}a)g)3(y&PzlPWQIM@S`7PHN{gR{Ae!>8KfDPCyAmQeXdn|c9+4Il*qU4pOsP2K} z_2-IS{O1wfvnLX5ug`jF>k|uB>F;e`Jj1@T;pP6d{x7-XSNpHD9^GLZDA(+QS6RI9mm3V z-|gsc>n3^xhI(}V;s>UCTi?Xeo9107*IO^j@6E**9&K)?EB>;y;`4o{jL-jJ^?{DU zU~lZPJ*Hech;ip|Kk?*4q~c6zAn#=fuD7BtM)-21HiOsJsbM&0`h z%5MFBx8sld?~+?<7lyN5mfoAPr9JzLrc3LBi(Z?V-Sk%e=SbYP?(n9zOUvHwe66ef znGeZ3cQnfm1$M`ITc#t(57&v#HS!wADu$E1dX|@5Kp*z{l>B;~ zqPy04N~aZhi*7aLFgpCXpj^zW34oHCLMK;K!I^no*7C&6FarU+KxVaJug4c;!WNy1 z%RpI~Ht4jfid7rAh=$HIJk+*z|4R^Sra9oBuSf4mNwBSAy7OpxdfMs z0%IT^4Tvx+S#Sp8_lSh1Q=@MNRGu^R0fMhpm>g1AqBiF zJWkQex`Dy(bE`HK!kL^RyG4iVjiWO~9#$6M28(W$=nI8M7o4IOl*p{YCYFI`U>J#+ zX`_iUVZ^A?6Ce%_A%Yh`5sK}YJabGQzpMp&66?kjK(i5G?H|EH~79&IMnhew_#2BH0Gbt-bBO2GQa zC^Gbj>Q&Ne)l0#!TqJ}bTM2m8Ply#+;>uZ{8^G!jP1oUh@w-xiH4zj>aHv@TW|R~t z4t3EqkMacT0=$W)0EnF52zpQw$d$Q4Xa^$De2q8?P*cwef@fpQ9vFchW+ zPN;+t41q@pGu;0WIgX|Yz`0NgcabQ`2{`JaC>qUhnQ+`B@B&9fF3k5CB78Q}<3r3e zC}nZ@P%{nxbLPZL`0q>%~nJ4x3hT@zwp zLduibHA&Zm7?_aqWOjXTbR~|yF#;d_p;rap2j`^59E9(ZQ{6d^90WPOYx-R_7LKR6 z3RYSXO8NeIkJJZe68w3kLHI)Ys?s#uF1JWG${V{b1)7WAfHh^M3UkU#e}^+>J5MogB)&^@AV16Vle~dBKKVoE@q;V839=>S%ve zd>YZ!wLQ{-KD@s4K(g)n^6Jcm4|2c#Bq_%E_?gY!rL$sM)A|AfT|;lvFCJg<l56(pTe!L;2FSMZg&_I{_ko%jHUo?^L z_BZ!z*j0Qr<$8NsUG<@xGaIqSf%v*lY6dmkYa32fzI3Jauf08wf1L8B_s(PGpWR5m zqVL(vKG?gKaLhsSTYB>kfXmlz4mM6NwN5EbJJIq@@22hbpW0HLi)?+@m$vRnP0%HM t{1IuZ=(>HmM>CZ6)qiR>wqIC%D^^CltJ?RLl|jA`yRFcA>}O@0{|oy-RQCV? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal4.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCharcoal4.png new file mode 100644 index 0000000000000000000000000000000000000000..39cc7f6a070ded9bec88599821f0855b297e05df GIT binary patch literal 4658 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 K$A7nC-G2bhm^|13 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke1.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke1.png new file mode 100644 index 0000000000000000000000000000000000000000..239c72076f56e5f96c893eece79667b27aedd027 GIT binary patch literal 4773 zcmeHLeNaR7)LAMOWs$)%aasX0unID0<9G7uJ0@1ElFNX9uO#1 ztM~~ht+uv^mfBhiI=Zl{uF_hZR#MdJZog=2$1-(Y+_qcYs#sgmz3&mex}Di!rv67V zcka3Op7Xos{O-BuMc}>zDg=rKeIsZX zkf(sY1vFv9z+NYSEPo=DZ#IxZKpX5AT5Y)+Oot*moCNj=Mo@@}!f*|WQw9@-qF{ej z)38S}(iK{q1pKQO($aFRX=xgdSF{UG9)kRhPd#JKd^;uf)F1Nq#>3jFQ&zm2yX%`h z+AW9G>90@z?uQ`c==D2llVsuZdW>np{A}9nai!FIx>W zX7bxW`;%MS%U9>>@%O&ktZH!YY_=>r%Pl$8kx+?NtEzjpy~v-n=EY18bepTH-mLlV zz`5SLv9k;gwBzBJzzg(e?>zJlzVpb*ikHZ~B0umRyc6xw!2uGy}<+xYd4clXxs56##TR?w7M*59-0TKm$3WW&Gagk4IxRdcDT zR`v7~O~3OsUS$J9BXrl%lO^6xC|%yS?M6{{O{}W_LdU7n?EJpfXQnUzzN_B$>2r68 zbyYL`$*+i~L)IQm`J$nFsc+`KU#B!2&$8g5BQw za948_1pR8MP*5lp+7?l)=+e=g$nZM9%Of8cl$7lE&}<1WX&BxixXs$D?Qdx{0%z7P zG1w5BCyg%_GAq4&eq~MpTUo-IIBoJH>Lfn}09?F8Yy2*!+ei7$S_PK^vOKNVY7`Zz z#H=j@d6Xu4c@3c>bO@a87s@d0BWg{Om$OrOmW&_-7@4)jlH{TE`ttH}T{*53y$(HU zGMV%UrpGWCXu!S-w?zA4w{Nx#F@Ry=eXLjTNP_6r$e1)EmP%%=7OZOq{d0M2wjp@8 zFUSJmL+__OdQ^w#T`v7d3!ju;20(%i{j7zrpu)rJ^LU?F>Sg)#GTtrC9tpv*L-w9h zuTu$!WA(g~cL7x&*cBbMrF`RtEMy8Cg3F^=0kTJFN`ifutWmznD@r&c9RcP;xTCZO zV^@@cmd!?4M7C6R&uTGi<^3s6WCe~=L>wnslI97R#~BPJFrI@+n&DsrPxCZ~8clqn zaRijr?UQIX%gayzTqgh=BSR3RiB5#=3`4?%AyI}fVlc*#CL?Y~04P5KVzE~MSxGxb zdL=_~01C%Y#Arehm?W`8m@ol68euWmXlGG`M+_{B(+U*FQW>JxMT6rMT(pDNd)y9X zK_;9^&9$1fm<}19$#v3_9T=Fkiv)M6e|VulaPj#PEwhOxVu>h9;07Ee3?`##Sm`m| z>jRl6V=A>%S&@&00>J=cX*o{;fHDtaq0+oOEs5R&QFNNMLsfTZ*#@o?M@zJYmUsX< zREG-&>oAOf$~@q{3}+KL!CvwIwB^gANdo%d$TI~W*uO%V8n{vU{EC6mz|biuS4pE$ zE(Jxi10ne6GM-cX1Xu%0Y%%S2@Su7G({*rO_?c87NxO+fK_c;hN0o7~NroBi^e+%1csBne#3a3376%VCN&i2` zKAjqA82RXp67Vh=>PWSvLQw10s5^8R7*Axf7g``j{(krS z)x}^Y(v$hP54@1RCO6fF&znUs87^6E>ETx*AADdzbn_3~XW$Qn#a2sd0eNQEvnT7m zMkZNa;xg3rAt5upeJ4{|Jad}yy1$0*SpMR(cT=0%y1xB#Rn_iLfo%NEY4eP&>K@fU zD>^@|JA1vh<;YH*g$IB-oWL$`09=mS6|(J?P7jbMR;Ler$07uW?f6!#NK7+U!7p7 z-X7C?{n(+d(5Mb_OLEb&?!%Y=G(YNI{`uZN+n`U5)E#=}!=e@EZXW)ysQvn(mVe-3 z56tS!Ja>C3Tid$t`qVXsq7xq9@Z8KF;u~9)~QwO-Mz1cyBAiWEXaaOHb6urj@-TX>~ahHaPNg( zD6N`ctjHjVjWJ}S)EJ+P4z!dYK1iZs)z&nQb(*Bg)O4^W<0B@Lh{m3KcX>@R(_tq5 z$L^dt-#O>|e&_ps=R4osyBnJlRj6o1&nmN~02>V#MMLmWfs`4+-55mC*V42x& zHYX!dZ~!$`QxH{1Pc=pkQ-vepaQ-FO;-D<+$Ze)7Lg^c!JS!ys9?J7VIh%qqc<>m z9PY1b9rZ{?y0@*O3;I_tWMx^+Sy^h2*KHRn0fP7gzj@i1`+i2^$yG&fC!?Af@vBc; z-~4>1rl~U~dvENo)-O$3qJ8kf+-c^9O>gzD@Z93sulN7E?ZAr%)KR}(OQ+HE59e-t zm>+}MjP#AZo?mb7@vXJ$$iH51P_?+;*k^kF9A9#>cR?*)ud46g@;W$YE{sd+yJW1Z zJG$wMw!aO0oA|Wef%pDAu5TOr(TQ0n$T$A{Zp{w*Tti1*T|qkgVZ_F#x)1vApX%=K z=q2B`Gx}!|=gyewZ2J?wpk?N5YPIR2bmmE7_JKebUGbmfipyJ$W7{s2Z0#-(LQ6+wPnDikl1mRXiCoZG2odAAK{{Z5a3U`YBRzlY^2fTXqohu|`5ZuT74 zs0H4rDbZUnizf?|3%RvkP*ht`%+*$K241shVNAN8fdEb*v1-4w(j_u}qej7Hpe#@8 zG-^dfsxWGn!92=xdx4tLQd$hn_6ya7W?_sv-OJmVLQ_r%0*;KDa!K+qI-Sqw)A~rQ z+w0Kb27^I|5juiEp$00}xFpt(y2Lp$L=eLSM9wRCB*E=c%b2XqT_qVc8n~_=_Rs0D zSVrJoVu%IEhtAJ>bhsANIi0$(7NV404M9QR2-ME=6mREfJ!eZD1M!Sk zfLX~_j`d20;vp1C;8=k;KYu;;BR`j#H$8APADg z$Wf)Gz$?N`lrfdssjSGy!oXl4v8r+^gi5Jtf# zScov)qYn|Y8(3Q^VM7fzz`_tQn4$)|0mVrg&^Sf0gq<7j^bZgsd^Qu~LrmAnWpVgW z({lXOkeH6aEjq&%5j zlXOjpfe9&3X4el!SIp=eBXGeVdOr9*=xd+f0N*92I5I7n2-3cJ>U}l>jvuq-FE$~& z&h9HWf7%+J z&^Nt^A)4mwKU}SSZR$T(G~%DNbU z4ahtHa@EJiE-zjGhZ|8(Bdz=CffdhPppJh0#q#is!RVDG@mCA>Jbt#LxzM(KVCk;T zt+8SFsoG4^8VJjs-xr!(j$9i$c2TW4kzkm;S-;y}mhjS>_t=D6mk%whOZ#eN z&CRa1BZJQ$Dk;p{n{042;`*%t(dgPf(9(2-IF&GcdO-ZDsiajrIJ5naw+C0DH=giZ zs?zUT`N|sb?CCQ(+_|AcA5bRi#k^`d@!HV#z#Z+UN$+00{k1P{)$u!B_f(FE*N@S+ SX1xR1M9kR*rh~sMd*OdJ!DkKt literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke3.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke3.png new file mode 100644 index 0000000000000000000000000000000000000000..54d21e20ad81dc14077039c54411ee1202f01757 GIT binary patch literal 4708 zcmeHLYj6|S6R_Qk2vYxQ=4rdYq(L+{BU;Nt_?pm7oE;cJNrcWfyJ11&g`1E zOMm{4z1sHI5(^H^dh(f7^Ox&}H$IwdZEf2(u*QFjKlbUshewYz9YN!N(#R}f7M&_; zxmTQsIn2yweLX+k(i3Vd)l(NgZPj%8UOa61;RRv!+1`xxM6;%OVC&Do1#4N#{Jws3 zL&FeoEg??oVePJVU*B{I~VHnG3Dm%Nk0uxOZb)7My%FJoMJd zf$m=Fw39WgNPBcnlK1GZh>XtE&*>V=75Us;@}VPLCm8p~i{00@zKQRAZ}pCoCBfMV zk2w-jEa`{#Hj^HUc*T0GWAAV{?%uP1f8p%|9YBsl140a9jePS1K*EO(A`cFpfx-YkWv8K2!O*8!G-m|sEpF8(eU3W^U)HW!I3n&As8LyZe{C-gEGc6HmQE zfAy7S$*w?0ocC}Ng3MSe+AHNs+j5qdygE*h96%TL`jrDivU0+Hj&}nYbpV&>GiwKX z-qfO^VAifS*l?RaA5@D)>jR*CeTki4@8(T{HYYnVE6hRwFOWGj?DhD9Y}l+-aakxU zYP}X!O=P!OTM6?hUkU(}*3mi~D+r5qq&7Pd%?b!kw#-r(g@7Zowpy0`tX>}qg>)fG zCk0%3!elb(aZ*o`7_`8G^*)&kW4_=*1tNlB0YN?>`ejk_p$aDFkZNVKRtx9R5&yh? zn{5={7mTt1`Ot?szn;+HdaqYMenn6&sDmI;hrV$|&|dEc`Z5rdY6Cndr~^KE;dlsv zA6@US4S3XW1YQq3zza=-a93i&mdcGAU7=9m61{$P6(oCtr7Swf$eQ4rGNXnw-VwNb z6nBF4NbIUHw6fV)i^SI|?pZBnt+GEWNW3Vpsz^}`&v1ao0OcStngjyIa1H@801j{h zk!b?P%yCdwUr^?JJW!w@xK4yPM#AVc(SXNDf}=6oLD87WNfMaT;N&t%!bmv@dK|=x zfC#ga^NjaOff67TMG| zOaHZFj~I-rqmY`24%TN_?)9VfKFS&N_kMn&>2^Q2K+&m9CdKa*T~l;Tih)TPPi5B> zU6W#9QpQu+^{vsBIQGT}eDH@}2)+-Rcjw-M?~*aDJX;=u9NUsK#Kpq#bVu=03*u0| zw|~@F4K)e=qN*T#A^nBYG@Ji&Sc1wp*=j3@`&+`?6eOX8|9mg}17U{Ml4obmZ+||o zyAYq%oMS!nyGw;tmG_b=O0GY0>61C<5+3V%I7WIYC2Qv3;Ku^{-c>5^@&1fPB)xTG zZ-ss3Y@zCSMfUEQYuxYB1)7iQ+na7O>5U5ue*HpC+MV{koc2R6KglE8KnpSb!11yj zAe@A}H4i!Znq{TDs-oh`)ore1=Y|>5s=>?j#q5{F&R;$|cjk=KIC?i_@% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke4.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke4.png new file mode 100644 index 0000000000000000000000000000000000000000..6a5036461c050ff1cbbac30bdc4261249f498c0b GIT binary patch literal 4655 zcmeHKeQ*=U6+Z!vL6nd&9w@{F93o>9Aruma%0cN3lI%AenNyTgewoIw74c znc9sB1_~yL3nfX3(=d<(^AUGoQYg3-w*j02DKv!fq{)EOv;!fXLNgTF0Yl%NX%sdA z`c`NR$eGaZfu^ia`uYvX`fsf9lz=n}T3=u2_INFfm8PsL59=w06DWtkuofBwN?ba+^iEnD1Un{fltm{`GNP1 zzwN+Z`lY#`?V;z^E}p)~+WW$+3GR)}JA0Nzu1ou`_WXI@-ZgtIV}I1hFW?_PQncY- ziJ9;@`M-B{{P5+Dc%zqOKfJopv@QJlZr3wsP(4Dh0x?U6ibo}At?CS@ATlXe^X5)e4`qFIiqqGe(4!0-noIKof zpp$*yFW8>Snl*WRXy1GEylvC|!L4*%&`wQZ9@*P^h_C+Z-0F*4j#00jU-HV~(pcuW z@B7AOxaPF&Xkvmc<$`;E%Z}be`n?~2_38(2x9lCW@TIhh?RmAmJFF!} z_4^jjCtL4uYwI6LfM3kzLX7Qnb5_aO( zI*#EMMRwv#Y#z!J$wyU6(W)paUsYNmt*VwBGM@8^3^D^a8}Mr5d{gQmcgGeTe73FUnp}eOhLfNiC1Y_L?Fp{JZ_D% zRy7(RX@|o>QVhv31XvKUy09iDh;ZyN9U_V0LNO_-L^MSWTXam(r`Bjr9EW*J-~K`o zkEb6#980kPe2@t-Lef@>428(SD`HwfEr6sp^o=WG6?G9rmZ6wh6O~XwEedOo4Tg}V z{`HZXXwV2pmPiytAux@BS9*v`{l@jL&?yKgp@^{x$R1*;DgFVnhU`tBF~S+V5m?@j zJH)y#cEcE~JRZTNN;UfS+%6}s`xj(YQe?ppS(cZ05pe`!eGI`dNG5pEClfX#B2lL8 z4m96B2+AFfX<}GHIuw9g6~JLxR+d;%Cj2(WM{o`YLpT_jCHxXgQ9hRSiFS4n#8XiP zvQi8V-jxm|>rf0$*&Q@R@H{ggpnNJg=#b;!f`4gF@VTO zIABcZgbR6Iw-aZq)PTkt6g59AaN>)Ua7|)hqCyFwa!u6Pq~|m9X`1608*67NnjSD( zjG{5fL><$poyLrQECK`r#EN>J0)U~1ScLp25;Zkip{hYA-d}b5r#*0;WKk1cqJ{vp zzYbUQ)nS6t3-W-yDl7iFZ?o1fk0m>KuyODPOA$ui{}63F z=R*wSq|Z)6wllN?vfW1!EF(Kuzi8)uvTf+5|JM+c?`GT35VJ|WEcP90Hu+!2o-`O# zM}eB84(cwWyC((OKa0O%1X!{T>@t`WM1#lWzPN3v^#u3<4SEaQ>v z`oGa-9{6HJVfdpLhws73`xke^x8#^Wo+l5(_P;#-j+h4H2Ye-kF6~ zY#M#?JDb{nxAj-02S4w8_sZ6L>E!hrk3LuU*16@&yyv-IQ&nU8SKitFtS)lWhPhU} zboOTZ7XEU^Qd4F1Y1Ufk;xD)DnRww~C~UUiAJ;V8%)WSg%Aq)RE`GIKnfX>`!=*`2 z=DI3hnfZ(Gv)u>M8tHYRPftzuod4cO%bIW9J<=w9xO@GswwZ}*#~%FS*Y8rNBcElh zTitLeXX<;iny}97vr8|(I(28IYjb6F!#(e@oKxQ&-Lhv%@zEKP`Y&f+DRZdi`hULh b=Jkn8b!BI6L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke5.png b/src/main/resources/assets/miscutils/textures/blocks/fuel/blockSugarCoke5.png new file mode 100644 index 0000000000000000000000000000000000000000..15e336931ab1f2c5431ce8dcd5c420b6db99f629 GIT binary patch literal 4621 zcmeHKe{dAl9p6J@ejpZ73KRk!$6%4Tw?FT)x8zLHTp*X^LP#=zL|fkNzPl{R-5$4_ z+$E+Z;YX1KB^|U%Oc7xaDAW;#nnFqmBQzFhb;{UGwIgZ8u~i4HI3goxzq@z&HFc(w zY56aE^X7fu_kF*g_r9O^ec!#^UQxb$YQ~%lf*_`Pi#?UlPcvHD-2`E&{p|G{Fn9y6 z@dmu!B}5twz|u0Auq5p)qvT1JyNJ6${}X7LAR9JDn`22a`yC+9P0CM!yf|rN_%N19 z#8l|Jp|K#(fc_WIlx>N%ehaekq?x}`kS0MJ>X&vbk zc@EaM>>b&Wfi(HWo^;sX7NxMT!dqBqjYQReQjZBD-u}F<*Wy|2M-T0EXGIL)4 zfV-vTbjPPh|M>n_SqmINrtf>1{m-Je&doi?J@?AlrssuA?Z-=6%5%}5QnufB@}>B# z-<=#h-p9Qf5FIPB?w>g&bo2z1-8JW5{07gP`h{8S{3G2xLfv~y>fYIPhJN<)>Ytq~ z*Jh+Y=ugk|EIzbv3tR6|-t->p+;=;k`t{=Q}mnuY!Xm>dowib)WD0Y;9>rmgV-_edilWt3GeN zIB(q-zwh+@<>_1e)|UD4y#4BhNt=7}uXGL6X!jlbR({v1l6Q#IZGG{!;{!{7(|hoA z&&JpJFTb=b-4pFh4IQ3B5ck$7)ob)MzA{l#Lv|#qer%72BF2Fcxq0yjlIpN-_2Zxt zcH2JgJ!7*fvfH-W;iG+#LR_m9H%D<*b9uGYTqn6?Ti!z%xp5HyLRd%Ec&I+CiE+2h z#1%m{)RfI?n&@?I+ZxEDLN$u5yq&kxWKmpcWNi;+SaYLtK&}oVfF)o*jqFIV%Nw6Tbrm&9UWLR5hKqN3cSd*ekL|4?X)xbo4wLy2=Y%p&f z+FvN*^9{p?wImC`2Ng#Vim}sFC`66+(Db5407-7>8$Gn@rU<4gv8FaeC0x{q!}`L} z5VADvA8Clzo8ib3h3jz$Of^`Q8MCBu;Su{nC6C?p)p2VD=C3zOhq=5V~>A(mh znQ^*sj&l^0H>~L>EMWr*!0ig)aLzyuE6Ebc3QmUP5#mS`a0sM?*Z^`MKW1HyQ4lMl z3S=d!AH6FBN;aTahIYCbniK>!hvZ#;fkd>#lFop{(3o~e5{FDESrV72(GY^;R6;0- zsYp0zP8fuX1r=VmjkVJwnu>a)2f)E?D^tP^@sWvYC4{SVWU$HPusICF!@~(I&y4b3 zg`*l|qJe4FPSf2u77>C0Vv&)j0AT7N7O^mjk*-FoRkhx28?L&;(>}OPGSZO;=@>wV z>u~i@9VTg`AdlFqvJzN|)+^>!vRchcAtEUe zf`%HgY_1Dfi7BZTg@YKXM>1W9^vXA+f*=H35(9~Z8J;6~7?OyWY0{4!e#YTMoFwsM z(KR)o$50d(1c6833ewYjLs=J_2lc>M>sT!|P5}rbX&1?I)eI*(czA;)38U_Oh`hwf zQUIdE4#q+9PUM7a#}dhKEGuKdAMhh??56+M5EJiah}g`DWQe(xQ5J^|HJAF2V^0{2 zs-r+nLI?F3$~`q)?~|MvmGurj$#lDeD**JwBIDwBg02a=#>K$6j3=^dg068fFfQYX z?E1gal`-2bmhhATdnszvYS8K zrrmo2Ejqkw*$GQW=XbCC&6j`m;A5L!_B!XzoPLt%BU*3FFP;AIfMYqI-&`?c$5S;2 zXs%n^{lYVWCj#jy+~&vE{nB@AQ-peS+O<>9&t6Xu+y#5thi%su&g*ZRz3`P#UClt~ zg_r-lYJbzCT#!! literal 0 HcmV?d00001 From 0100f875f215d9fa57075ef5bdc695c03d3b3dfd Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 24 Sep 2024 20:04:07 +0200 Subject: [PATCH 3/6] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8231ca19770..c474909bc68 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,7 +49,7 @@ dependencies { compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev') compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev") - compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.12:dev") + compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.13:dev") implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} From dc1d9546c3700dbae0754585af460970fdf28ea1 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:05:40 -0400 Subject: [PATCH 4/6] Fix broken imprecise casing recipe (#3274) --- src/main/java/bartworks/system/material/WerkstoffLoader.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java index 38ccdc90972..5b485b99053 100644 --- a/src/main/java/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java @@ -1049,6 +1049,7 @@ public static void setUp() { new Werkstoff.GenerationFeatures().onlyDust() .addMolten() .addMetalItems() + .addCraftingMetalWorkingItems() .enforceUnification(), 64, TextureSet.SET_METALLIC @@ -1236,6 +1237,7 @@ public static void setUp() { .onlyDust() .addMetalItems() .addMolten() + .addCraftingMetalWorkingItems() .enforceUnification(), 78, TextureSet.SET_METALLIC); From 00b6c43af283b0a7a33e039718a63826d635576e Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Wed, 25 Sep 2024 00:59:19 -0400 Subject: [PATCH 5/6] Fix callisto ice bee products (#3277) --- src/main/java/gregtech/loaders/misc/GTBeeDefinition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java index 48ecc4626d3..59e4ca8cb9e 100644 --- a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java @@ -1937,7 +1937,7 @@ public void accept(GTBeeDefinition dis) { JUPITER(GTBranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.35f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(Materials.CallistoIce.getDust(1), 0.05f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.05f); @@ -1991,7 +1991,7 @@ public void accept(GTBeeDefinition dis) { CALLISTO(GTBranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> { beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.JUPITER), 0.25f); beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(Materials.CallistoIce.getDust(1), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); From 683e0970aea98b5d59fb0de928d130cd8e44360e Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Wed, 25 Sep 2024 06:48:46 -0400 Subject: [PATCH 6/6] So, so, so many collisions (#3278) --- .../bartworks/system/material/Werkstoff.java | 21 ++ .../werkstoff_loaders/recipe/DustLoader.java | 207 +++++++----------- .../java/goodgenerator/items/GGMaterial.java | 4 +- .../goodgenerator/loader/RecipeLoader.java | 10 - .../goodgenerator/loader/RecipeLoader2.java | 5 +- .../java/goodgenerator/util/MaterialFix.java | 8 - .../java/gregtech/api/enums/Materials.java | 2 - .../gregtech/api/enums/MaterialsGTNH.java | 23 -- .../java/gregtech/api/recipe/RecipeMaps.java | 5 - .../gregtech/api/util/GTForestryCompat.java | 18 +- .../loaders/materials/MaterialsInit1.java | 44 ++-- .../loaders/oreprocessing/ProcessingDust.java | 3 +- .../loaders/oreprocessing/ProcessingLog.java | 4 - .../oreprocessing/ProcessingOreSmelting.java | 8 - .../oreprocessing/ProcessingShaping.java | 120 ---------- .../loaders/oreprocessing/ProcessingWire.java | 56 ++--- .../postload/chains/PCBFactoryRecipes.java | 6 +- .../postload/recipes/AssemblerRecipes.java | 10 - .../postload/recipes/MixerRecipes.java | 89 -------- .../postload/recipes/PackagerRecipes.java | 7 - .../recipes/VacuumFreezerRecipes.java | 28 --- .../loaders/preload/LoaderGTBlockFluid.java | 14 -- .../preload/LoaderGTOreDictionary.java | 37 ---- .../java/gtPlusPlus/core/item/ModItems.java | 4 - .../core/recipe/RecipesGregTech.java | 15 -- .../core/recipe/RecipesMachines.java | 11 + .../gregtech/loaders/RecipeGenRecycling.java | 2 +- .../gregtech/GregtechSimpleWasher.java | 4 +- .../java/gtnhlanth/loader/RecipeLoader.java | 110 +--------- .../java/tectech/loader/recipe/Assembler.java | 2 +- 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 1c29d52a92c..d9b6b4503c2 100644 --- a/src/main/java/bartworks/system/material/Werkstoff.java +++ b/src/main/java/bartworks/system/material/Werkstoff.java @@ -1089,8 +1089,29 @@ public Werkstoff.Stats setQualityOverride(byte qualityOverride) { 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 e83af7ad46f..ab7a2167aa3 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 void run(Werkstoff werkstoff) { List flOutputs = new ArrayList<>(); List stOutputs = new ArrayList<>(); HashMap> 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 container : werkstoff.getContents() @@ -182,8 +182,7 @@ public void run(Werkstoff werkstoff) { 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 void run(Werkstoff werkstoff) { (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 void run(Werkstoff werkstoff) { 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 void run(Werkstoff werkstoff) { (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 void run(Werkstoff werkstoff) { (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 void run(Werkstoff werkstoff) { (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 void run(Werkstoff werkstoff) { (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 void run(Werkstoff werkstoff) { (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 void run(Werkstoff werkstoff) { .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 f61aad5876b..ca26cfe986f 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 c43ffb58c68..2b4d79c3f0d 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1271,16 +1271,6 @@ public static void InitLoadRecipe() { .metadata(COIL_HEAT, 4600) .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)) diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java index 707c6fc11ac..1301ac97f53 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader2.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java @@ -104,14 +104,12 @@ public static void RecipeLoad() { .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 static void RecipeLoad() { 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 25c945f9fe6..065a01b223b 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -3,7 +3,6 @@ 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 static void addRecipeForMultiItems() { .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 9b60b6846ac..95463122f1f 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 12a53f6b860..8a3b7f96602 100644 --- a/src/main/java/gregtech/api/enums/MaterialsGTNH.java +++ b/src/main/java/gregtech/api/enums/MaterialsGTNH.java @@ -199,29 +199,6 @@ public MaterialsGTNH() { 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 77e49e37c71..197c15875d9 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -676,10 +676,6 @@ else if (Materials.PhasedIron.getMolten(1) .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 @@ && isArrayEmptyOrNull(b.getFluidOutputs()) public static final RecipeMap 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 379604205a1..ca61c955c7e 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 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 static void populateFakeNeiRecipes() { } 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 outputs = tRecipe.getAllProducts(); ItemStack[] tOutputs = new ItemStack[outputs.size()]; int[] tChances = new int[outputs.size()]; @@ -151,14 +159,6 @@ public static void transferCentrifugeRecipes() { .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 6fb747d4324..7ab2655b0c9 100644 --- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java +++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java @@ -243,7 +243,7 @@ public static void load() { 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 static void load() { 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 static void load() { 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 static void load() { 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 static void load() { 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 static void load() { 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 static void load() { 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 9964ea541e9..c37d3c614dc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -132,7 +132,8 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic && (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 f60987ec9e8..5bf1212faad 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -125,14 +125,12 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic 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 void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic 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 void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic 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 3d33df9711a..6cac506abfe 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -119,14 +119,6 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic .duration(2 * MINUTES) .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( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 396cce0c8cc..6c45761da0a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -458,22 +458,6 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic .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 void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic .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 void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic .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 81b8985d054..d3e6750f33b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -258,33 +258,6 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic .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 void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic } } } + // 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 f047bdcab2e..e4bb4681fc5 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.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 static void load() { .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 f4563a60cee..940f32e6048 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -633,16 +633,6 @@ public void run() { .eut(48) .addTo(assemblerRecipes); - 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), diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index c311ecd5324..09400b8ba71 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -1144,17 +1144,6 @@ public void run() { .eut(16) .addTo(mixerRecipes); - 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), @@ -1166,17 +1155,6 @@ public void run() { .eut(16) .addTo(mixerRecipes); - 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), @@ -1188,17 +1166,6 @@ public void run() { .eut(16) .addTo(mixerRecipes); - 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), @@ -1210,17 +1177,6 @@ public void run() { .eut(16) .addTo(mixerRecipes); - 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), @@ -1232,17 +1188,6 @@ public void run() { .eut(16) .addTo(mixerRecipes); - 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), @@ -1254,17 +1199,6 @@ public void run() { .eut(16) .addTo(mixerRecipes); - 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), @@ -1276,17 +1210,6 @@ public void run() { .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() @@ -1537,18 +1460,6 @@ public void run() { .eut(TierEU.RECIPE_HV) .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)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java index a86266029b7..74f70aac418 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java @@ -23,13 +23,6 @@ public void run() { .eut(16) .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)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index 70881690aa0..89f1fc61562 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 void run() { .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 ee207bbaeb0..051eee691a6 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -2036,20 +2036,6 @@ public void run() { .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 0d2bd3ad554..05a3712979d 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java @@ -301,43 +301,6 @@ public void run() { 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 0929b0b0ce9..a7fe8ced30e 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -874,16 +874,12 @@ public static void registerCustomMaterialComponents() { // 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); diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java index a78d2be2cb7..bf587a137f3 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java @@ -1427,14 +1427,6 @@ private static void fluidExtractorRecipes() { .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 @@ private static void compressorRecipes() { 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 23cc3f223e6..b66249a3ec2 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -980,6 +980,13 @@ private static void runModRecipes() { // 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 @@ private static void runModRecipes() { "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 5f5160b6a43..63812e2e6e8 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 static void generateRecipes(final Material material) { 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 3171cd00578..5a03fdcd266 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 @@ private static boolean generateDirtyDustRecipes() { } 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 44ac77769ec..3bc69c26755 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.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 static void loadGeneral() { .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 static void loadLanthanideRecipes() { .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 static void loadLanthanideRecipes() { // 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 static void loadLanthanideRecipes() { .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 static void loadLanthanideRecipes() { .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 static void loadLanthanideRecipes() { .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)) @@ -3473,13 +3382,6 @@ public static void addRandomChemCrafting() { // 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)) @@ -3627,12 +3529,6 @@ public static void addRandomChemCrafting() { .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 7965931f5b5..cbb6691a6ab 100644 --- a/src/main/java/tectech/loader/recipe/Assembler.java +++ b/src/main/java/tectech/loader/recipe/Assembler.java @@ -2691,7 +2691,7 @@ public void run() { .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)