From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../xmod/railcraft/HANDLER_Railcraft.java | 218 --------------------- .../xmod/railcraft/HandlerRailcraft.java | 218 +++++++++++++++++++++ 2 files changed, 218 insertions(+), 218 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java create mode 100644 src/main/java/gtPlusPlus/xmod/railcraft/HandlerRailcraft.java (limited to 'src/main/java/gtPlusPlus/xmod/railcraft') diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java deleted file mode 100644 index 7e920565e8..0000000000 --- a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java +++ /dev/null @@ -1,218 +0,0 @@ -package gtPlusPlus.xmod.railcraft; - -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; -import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.item.base.BaseItemBurnable; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils; - -public class HANDLER_Railcraft { - - public static void preInit() { - // Register Custom Coal Coke - ModItems.itemCoalCoke = new BaseItemBurnable( - "itemCoalCoke", - "Coking Coal", - tabMisc, - 64, - 0, - "Used for metallurgy.", - "fuelCoke", - 3200, - 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCoalCoke"); - - // Add in things that once existed in 1.5.2 - ModItems.itemCactusCharcoal = new BaseItemBurnable( - "itemCactusCharcoal", - "Cactus Charcoal", - tabMisc, - 64, - 0, - "Used for smelting.", - "fuelCactusCharcoal", - 400, - 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCharcoal"); - ModItems.itemSugarCharcoal = new BaseItemBurnable( - "itemSugarCharcoal", - "Sugar Charcoal", - tabMisc, - 64, - 0, - "Used for smelting.", - "fuelSugarCharcoal", - 400, - 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCharcoal"); - ModItems.itemCactusCoke = new BaseItemBurnable( - "itemCactusCoke", - "Cactus Coke", - tabMisc, - 64, - 0, - "Used for smelting.", - "fuelCactusCoke", - 800, - 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCoke"); - ModItems.itemSugarCoke = new BaseItemBurnable( - "itemSugarCoke", - "Sugar Coke", - tabMisc, - 64, - 0, - "Used for smelting.", - "fuelSugarCoke", - 800, - 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCoke"); - - ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), "itemCharcoalCactus"); - ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCoke), "itemCokeCactus"); - ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal), "itemCharcoalSugar"); - ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCoke), "itemCokeSugar"); - } - - public static void postInit() { - generateCokeOvenRecipes(); - } - - private static void generateCokeOvenRecipes() { - ItemStack[] aInputs1 = new ItemStack[] { ItemUtils.getSimpleStack(Blocks.cactus), - ItemUtils.getSimpleStack(Items.reeds) }; - ItemStack[] aInputs2 = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), - ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal) }; - ItemStack[] aOutputs = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemCactusCoke), - ItemUtils.getSimpleStack(ModItems.itemSugarCoke) }; - for (int i = 0; i < aOutputs.length; i++) { - // Recipes for the Charcoals and Cokes, outputting either Creosote or Charcoal Byproducts depending on the - // fluid input - GT_Values.RA.stdBuilder() - .itemInputs(aInputs1[i], GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(aInputs2[i]) - .fluidOutputs(FluidUtils.getFluidStack("creosote", 100)) - .eut(16) - .duration(1 * SECONDS) - .addTo(cokeOvenRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(aInputs1[i], GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(aInputs2[i]) - .fluidInputs(FluidUtils.getFluidStack("nitrogen", 100)) - .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 200)) - .eut(16) - .duration(10 * TICKS) - .addTo(cokeOvenRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(aOutputs[i]) - .fluidOutputs(FluidUtils.getFluidStack("creosote", 200)) - .eut(16) - .duration(2 * SECONDS) - .addTo(cokeOvenRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(aOutputs[i]) - .fluidInputs(FluidUtils.getFluidStack("nitrogen", 50)) - .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 100)) - .eut(16) - .duration(1 * SECONDS) - .addTo(cokeOvenRecipes); - - // Generate Wood Tar and Wood Gas from these Cokes - GT_Values.RA.stdBuilder() - .itemInputs(aOutputs[i], GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(Materials.Ash.getDustSmall(1)) - .fluidInputs(FluidUtils.getFluidStack("steam", 100)) - .fluidOutputs(Materials.WoodTar.getFluid(200)) - .eut(240) - .duration(3 * SECONDS) - .addTo(cokeOvenRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(aOutputs[i], GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(Materials.Ash.getDustSmall(1)) - .fluidInputs(FluidUtils.getFluidStack("steam", 100)) - .fluidOutputs(Materials.WoodGas.getGas(300)) - .eut(3 * SECONDS) - .duration(240) - .addTo(cokeOvenRecipes); - - // Fluid Extracting the Charcoals for Wood Tar - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i]) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L)) - .outputChances(1000) - .fluidOutputs(Materials.WoodTar.getFluid(50L)) - .duration(1 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(fluidExtractionRecipes); - - // Processing the Charcoals with Oxygen to get CO and CO2 - // C + O = CO - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ash.getDustTiny(1)) - .fluidInputs(Materials.Oxygen.getGas(500)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(500)) - .duration(4 * SECONDS) - .eut(8) - .addTo(UniversalChemical); - // C + 2O = CO2 - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Ash.getDustTiny(1)) - .fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) - .duration(2 * SECONDS) - .eut(8) - .addTo(UniversalChemical); - } - if (Railcraft.isModLoaded()) { - for (int i = 0; i < aOutputs.length; i++) { - RailcraftUtils.addCokeOvenRecipe( - aInputs1[i], - true, - true, - aInputs2[i], - FluidUtils.getFluidStack("creosote", 30), - 500); - } - for (int i = 0; i < aOutputs.length; i++) { - RailcraftUtils.addCokeOvenRecipe( - aInputs2[i], - true, - true, - aOutputs[i], - FluidUtils.getFluidStack("creosote", 30), - 500); - } - - if (NewHorizonsCoreMod.isModLoaded()) { - for (int i = 0; i < aOutputs.length; i++) { - RailcraftUtils.addAdvancedCokeOvenRecipe(aInputs1[i], true, true, aInputs2[i], 20); - } - for (int i = 0; i < aOutputs.length; i++) { - RailcraftUtils.addAdvancedCokeOvenRecipe(aInputs2[i], true, true, aOutputs[i], 20); - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HandlerRailcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HandlerRailcraft.java new file mode 100644 index 0000000000..4587a86a10 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/railcraft/HandlerRailcraft.java @@ -0,0 +1,218 @@ +package gtPlusPlus.xmod.railcraft; + +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.item.base.BaseItemBurnable; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils; + +public class HandlerRailcraft { + + public static void preInit() { + // Register Custom Coal Coke + ModItems.itemCoalCoke = new BaseItemBurnable( + "itemCoalCoke", + "Coking Coal", + tabMisc, + 64, + 0, + "Used for metallurgy.", + "fuelCoke", + 3200, + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCoalCoke"); + + // Add in things that once existed in 1.5.2 + ModItems.itemCactusCharcoal = new BaseItemBurnable( + "itemCactusCharcoal", + "Cactus Charcoal", + tabMisc, + 64, + 0, + "Used for smelting.", + "fuelCactusCharcoal", + 400, + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCharcoal"); + ModItems.itemSugarCharcoal = new BaseItemBurnable( + "itemSugarCharcoal", + "Sugar Charcoal", + tabMisc, + 64, + 0, + "Used for smelting.", + "fuelSugarCharcoal", + 400, + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCharcoal"); + ModItems.itemCactusCoke = new BaseItemBurnable( + "itemCactusCoke", + "Cactus Coke", + tabMisc, + 64, + 0, + "Used for smelting.", + "fuelCactusCoke", + 800, + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCoke"); + ModItems.itemSugarCoke = new BaseItemBurnable( + "itemSugarCoke", + "Sugar Coke", + tabMisc, + 64, + 0, + "Used for smelting.", + "fuelSugarCoke", + 800, + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCoke"); + + ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), "itemCharcoalCactus"); + ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCoke), "itemCokeCactus"); + ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal), "itemCharcoalSugar"); + ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCoke), "itemCokeSugar"); + } + + public static void postInit() { + generateCokeOvenRecipes(); + } + + private static void generateCokeOvenRecipes() { + ItemStack[] aInputs1 = new ItemStack[] { ItemUtils.getSimpleStack(Blocks.cactus), + ItemUtils.getSimpleStack(Items.reeds) }; + ItemStack[] aInputs2 = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), + ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal) }; + ItemStack[] aOutputs = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemCactusCoke), + ItemUtils.getSimpleStack(ModItems.itemSugarCoke) }; + for (int i = 0; i < aOutputs.length; i++) { + // Recipes for the Charcoals and Cokes, outputting either Creosote or Charcoal Byproducts depending on the + // fluid input + GTValues.RA.stdBuilder() + .itemInputs(aInputs1[i], GTUtility.getIntegratedCircuit(3)) + .itemOutputs(aInputs2[i]) + .fluidOutputs(FluidUtils.getFluidStack("creosote", 100)) + .eut(16) + .duration(1 * SECONDS) + .addTo(cokeOvenRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(aInputs1[i], GTUtility.getIntegratedCircuit(4)) + .itemOutputs(aInputs2[i]) + .fluidInputs(FluidUtils.getFluidStack("nitrogen", 100)) + .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 200)) + .eut(16) + .duration(10 * TICKS) + .addTo(cokeOvenRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(3)) + .itemOutputs(aOutputs[i]) + .fluidOutputs(FluidUtils.getFluidStack("creosote", 200)) + .eut(16) + .duration(2 * SECONDS) + .addTo(cokeOvenRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(4)) + .itemOutputs(aOutputs[i]) + .fluidInputs(FluidUtils.getFluidStack("nitrogen", 50)) + .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 100)) + .eut(16) + .duration(1 * SECONDS) + .addTo(cokeOvenRecipes); + + // Generate Wood Tar and Wood Gas from these Cokes + GTValues.RA.stdBuilder() + .itemInputs(aOutputs[i], GTUtility.getIntegratedCircuit(5)) + .itemOutputs(Materials.Ash.getDustSmall(1)) + .fluidInputs(FluidUtils.getFluidStack("steam", 100)) + .fluidOutputs(Materials.WoodTar.getFluid(200)) + .eut(240) + .duration(3 * SECONDS) + .addTo(cokeOvenRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(aOutputs[i], GTUtility.getIntegratedCircuit(6)) + .itemOutputs(Materials.Ash.getDustSmall(1)) + .fluidInputs(FluidUtils.getFluidStack("steam", 100)) + .fluidOutputs(Materials.WoodGas.getGas(300)) + .eut(3 * SECONDS) + .duration(240) + .addTo(cokeOvenRecipes); + + // Fluid Extracting the Charcoals for Wood Tar + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i]) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L)) + .outputChances(1000) + .fluidOutputs(Materials.WoodTar.getFluid(50L)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(fluidExtractionRecipes); + + // Processing the Charcoals with Oxygen to get CO and CO2 + // C + O = CO + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(500)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(500)) + .duration(4 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + // C + 2O = CO2 + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + } + if (Railcraft.isModLoaded()) { + for (int i = 0; i < aOutputs.length; i++) { + RailcraftUtils.addCokeOvenRecipe( + aInputs1[i], + true, + true, + aInputs2[i], + FluidUtils.getFluidStack("creosote", 30), + 500); + } + for (int i = 0; i < aOutputs.length; i++) { + RailcraftUtils.addCokeOvenRecipe( + aInputs2[i], + true, + true, + aOutputs[i], + FluidUtils.getFluidStack("creosote", 30), + 500); + } + + if (NewHorizonsCoreMod.isModLoaded()) { + for (int i = 0; i < aOutputs.length; i++) { + RailcraftUtils.addAdvancedCokeOvenRecipe(aInputs1[i], true, true, aInputs2[i], 20); + } + for (int i = 0; i < aOutputs.length; i++) { + RailcraftUtils.addAdvancedCokeOvenRecipe(aInputs2[i], true, true, aOutputs[i], 20); + } + } + } + } +} -- cgit