From 4540be0ad0325a9f98c4a498dd6e3e9d32a95539 Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 7 Feb 2025 00:46:23 +0900 Subject: [PATCH] Separate to GTBeesMatrix (#320) --- dependencies.gradle | 23 +- gradle.properties | 3 - .../com/github/gtexpert/core/GTExpertMod.java | 5 +- .../material/GTEMaterialFlags.java | 19 - .../github/gtexpert/core/api/util/Mods.java | 60 -- .../integration/binnies/BinniesModule.java | 30 - .../binnies/botany/BotanyModule.java | 29 - .../botany/recipes/BotanyItemsRecipe.java | 41 - .../binnies/extrabees/ExtraBeesModule.java | 29 - .../recipes/ExtraBeesItemsRecipe.java | 41 - .../binnies/extratrees/ExtraTreesModule.java | 29 - .../recipes/ExtraTreesItemsRecipe.java | 58 -- .../binnies/genetics/GeneticsModule.java | 29 - .../genetics/recipes/GeneticsItemsRecipe.java | 179 ----- .../binnies/recipes/BinniesItemsRecipe.java | 32 - .../core/integration/ffm/FFMConfigHolder.java | 18 - .../core/integration/ffm/FFMModule.java | 41 - .../core/integration/ffm/FFMUtility.java | 55 -- .../ffm/loaders/FFMOreDictionaryLoader.java | 14 - .../ffm/recipes/FFMBlockRecipe.java | 54 -- .../ffm/recipes/FFMItemRecipe.java | 37 - .../ffm/recipes/FFMMaterialsRecipe.java | 61 -- .../ffm/recipes/FFMToolRecipe.java | 97 --- .../ffm/recipes/machines/CarpenterLoader.java | 721 ------------------ .../recipes/machines/CentrifugeLoader.java | 260 ------- .../recipes/machines/FabricatorLoader.java | 71 -- .../gendustry/GendustryConfigHolder.java | 12 - .../gendustry/GendustryModule.java | 34 - .../gendustry/GendustryRecipeMaps.java | 21 - .../GendustryMetaTileEntities.java | 28 - .../IndustrialApiaryLogic.java | 18 - .../MetaTileEntityIndustrialApiary.java | 31 - .../recipes/GendustryBlocksRecipe.java | 6 - .../recipes/GendustryItemsRecipe.java | 6 - .../IndustrialApiaryRecipeBuilder.java | 29 - .../machines/RecipeMapIndustrialApiary.java | 12 - 36 files changed, 2 insertions(+), 2231 deletions(-) delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java delete mode 100644 src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java diff --git a/dependencies.gradle b/dependencies.gradle index de835a29..aa152360 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -96,27 +96,6 @@ dependencies { } } - // Debug Forestry - compileOnly rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387 - compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212 - if (project.debug_all.toBoolean() || project.debug_ffm.toBoolean()) { - runtimeOnlyNonPublishable rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387 - runtimeOnlyNonPublishable rfg.deobf("curse.maven:beebetteratbees-244516:2627215") // BeeBetterAtBees 2.0.3 - runtimeOnlyNonPublishable rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5 - - // Debug Gendustry - if (project.debug_all.toBoolean() || project.debug_gendustry.toBoolean()) { - runtimeOnlyNonPublishable rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12 - runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8 - runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-jei-addon-301364:2609434") // Gendustry JEI Addon 1.0.2 - } - - // Debug Binnies - if (project.debug_all.toBoolean() || project.debug_binnies.toBoolean()) { - runtimeOnlyNonPublishable rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212 - } - } - // Debug EnderIO compileOnly "info.loenwind.autoconfig:AutoConfig:1.12.2-1.0.2" // AutoConfig 1.0.2 compileOnly "info.loenwind.autosave:AutoSave:1.12.2-1.0.11" // AutoSave 1.0.11 @@ -153,7 +132,7 @@ dependencies { // Debug Avaritia if (project.debug_all.toBoolean() || project.debug_avaritia.toBoolean()) { - runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6029951") // Avaritia 1.1x UEL + runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6092956") // Avaritia UEL 3.3.0.41 } // Debug Chisel diff --git a/gradle.properties b/gradle.properties index da05b78a..8576b34b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,9 +34,6 @@ debug_nae2 = false debug_extracpus = false debug_thaumcraft = false debug_thaumenergy = false -debug_ffm = false -debug_gendustry = false -debug_binnies = false debug_eio = false debug_deda = false debug_avaritia = false diff --git a/src/main/java/com/github/gtexpert/core/GTExpertMod.java b/src/main/java/com/github/gtexpert/core/GTExpertMod.java index ebc7c7c6..a8935811 100644 --- a/src/main/java/com/github/gtexpert/core/GTExpertMod.java +++ b/src/main/java/com/github/gtexpert/core/GTExpertMod.java @@ -46,10 +46,7 @@ "after:" + Mods.Names.ENDER_CONDUITS + ";" + "after:" + Mods.Names.ENDER_AE2_CONDUITS + ";" + "after:" + Mods.Names.DRACONIC_EVOLUTION + ";" + "after:" + Mods.Names.DRACONIC_ADDITIONS + ";" + "after:" + Mods.Names.CHISEL + ";" + "after:" + Mods.Names.AVARITIA + ";" + - "after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";" + - "after:" + Mods.Names.FORESTRY + ";" + "after:" + Mods.Names.GENDUSTRY + ";" + - "after:" + Mods.Names.GENETICS + ";" + "after:" + Mods.Names.BOTANY + ";" + - "after:" + Mods.Names.EXTRA_BEES + ";" + "after:" + Mods.Names.EXTRA_TREES + ";") + "after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";") @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class GTExpertMod { diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java index f21cb54f..17903a86 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java @@ -8,8 +8,6 @@ import gregtech.api.unification.material.properties.*; import gregtech.api.unification.ore.OrePrefix; -import com.github.gtexpert.core.api.util.Mods; - public class GTEMaterialFlags { public static void init() { @@ -65,22 +63,5 @@ public static void init() { // Iridium Materials.Iridium.setProperty(PropertyKey.ORE, new OreProperty()); Materials.Iridium.getProperty(PropertyKey.ORE).setOreByProducts(Materials.Platinum, Materials.Osmium); - - if (Mods.Forestry.isModLoaded()) { - // Copper - Materials.Copper.addFlags(GENERATE_GEAR); - - // Tin - Materials.Tin.addFlags(GENERATE_GEAR); - - // Iron - Materials.Iron.addFlags(GENERATE_FINE_WIRE, GENERATE_FOIL); - - // Bronze - Materials.Bronze.addFlags(GENERATE_FINE_WIRE); - - // Rose Gold - Materials.RoseGold.addFlags(GENERATE_FOIL); - } } } diff --git a/src/main/java/com/github/gtexpert/core/api/util/Mods.java b/src/main/java/com/github/gtexpert/core/api/util/Mods.java index 40793965..e622d31b 100644 --- a/src/main/java/com/github/gtexpert/core/api/util/Mods.java +++ b/src/main/java/com/github/gtexpert/core/api/util/Mods.java @@ -31,7 +31,6 @@ public enum Mods { Avaritia(Names.AVARITIA), Avaritiaaddons(Names.AVARITIAADDONS), Baubles(Names.BAUBLES), - Botany(Names.BOTANY), Chisel(Names.CHISEL), CTM(Names.CONNECTED_TEXTURES_MOD), CraftTweaker(Names.CRAFT_TWEAKER), @@ -43,34 +42,8 @@ public enum Mods { EnderIOMachines(Names.ENDER_MACHINES), EnderIOConduits(Names.ENDER_CONDUITS), EnderIOAE2Conduits(Names.ENDER_AE2_CONDUITS), - ExtraBees(Names.EXTRA_BEES), ExtraCPUs(Names.EXTRA_CPUS), - ExtraTrees(Names.EXTRA_TREES), - Forestry(Names.FORESTRY), - ForestryApiculture(Names.FORESTRY, forestryModule(Names.FORESTRY_APICULTURE)), - ForestryArboriculture(Names.FORESTRY, forestryModule(Names.FORESTRY_ARBORICULTURE)), - ForestryCharcoal(Names.FORESTRY, forestryModule(Names.FORESTRY_CHARCOAL)), - ForestryCore(Names.FORESTRY, forestryModule(Names.FORESTRY_CORE)), - ForestryEnergy(Names.FORESTRY, forestryModule(Names.FORESTRY_ENERGY)), - ForestryFactory(Names.FORESTRY, forestryModule(Names.FORESTRY_FACTORY)), - ForestryWorktable(Names.FORESTRY, forestryModule(Names.FORESTRY_WORKTABLE)), - ForestryFarming(Names.FORESTRY, forestryModule(Names.FORESTRY_FARMING)), - ForestryClimatology(Names.FORESTRY, forestryModule(Names.FORESTRY_CLIMATOLOGY)), - ForestryGreenhouse(Names.FORESTRY, forestryModule(Names.FORESTRY_GREENHOUSE)), - ForestryFluids(Names.FORESTRY, forestryModule(Names.FORESTRY_FLUIDS)), - ForestryFood(Names.FORESTRY, forestryModule(Names.FORESTRY_FOOD)), - ForestryLepidopterology(Names.FORESTRY, forestryModule(Names.FORESTRY_LEPIDOPTEROLOGY)), - ForestryMail(Names.FORESTRY, forestryModule(Names.FORESTRY_MAIL)), - ForestryCrate(Names.FORESTRY, forestryModule(Names.FORESTRY_CRATE)), - ForestryBackpacks(Names.FORESTRY, forestryModule(Names.FORESTRY_BACKPACKS)), - ForestryDatabase(Names.FORESTRY, forestryModule(Names.FORESTRY_DATABASE)), - ForestrySorting(Names.FORESTRY, forestryModule(Names.FORESTRY_SORTING)), - ForestryBook(Names.FORESTRY, forestryModule(Names.FORESTRY_BOOK)), - ForestryCultivation(Names.FORESTRY, forestryModule(Names.FORESTRY_CULTIVATION)), - ForestryResearch(Names.FORESTRY, forestryModule(Names.FORESTRY_RESEARCH)), GalacticraftCore(Names.GALACTICRAFT_CORE), - Genetics(Names.GENETICS), - Gendustry(Names.GENDUSTRY), GregicalityMultiblocks(Names.GREGICALITY_MULTIBLOCKS), GregTech(Names.GREGTECH), GregTechFoodOption(Names.GREGTECH_FOOD_OPTION), @@ -82,7 +55,6 @@ public enum Mods { InventoryTweaks(Names.INVENTORY_TWEAKS), JourneyMap(Names.JOURNEY_MAP), JustEnoughItems(Names.JUST_ENOUGH_ITEMS), - MagicBees(Names.MAGIC_BEES), ModularUI(Names.MODULRAUI), MixinBooter(Names.MIXINBOOTER), NeevesAE2(Names.NEEVES_AE2), @@ -143,28 +115,6 @@ public static class Names { public static final String EXTRA_BEES = "extrabees"; public static final String EXTRA_CPUS = "extracpus"; public static final String EXTRA_TREES = "extratrees"; - public static final String FORESTRY = "forestry"; - public static final String FORESTRY_APICULTURE = "apiculture"; - public static final String FORESTRY_ARBORICULTURE = "arboriculture"; - public static final String FORESTRY_CHARCOAL = "charcoal"; - public static final String FORESTRY_CORE = "core"; - public static final String FORESTRY_ENERGY = "energy"; - public static final String FORESTRY_FACTORY = "factory"; - public static final String FORESTRY_WORKTABLE = "worktable"; - public static final String FORESTRY_FARMING = "farming"; - public static final String FORESTRY_CLIMATOLOGY = "climatology"; - public static final String FORESTRY_GREENHOUSE = "greenhouse"; - public static final String FORESTRY_FLUIDS = "fluids"; - public static final String FORESTRY_FOOD = "food"; - public static final String FORESTRY_LEPIDOPTEROLOGY = "lepidopterology"; - public static final String FORESTRY_MAIL = "mail"; - public static final String FORESTRY_CRATE = "crates"; - public static final String FORESTRY_BACKPACKS = "backpacks"; - public static final String FORESTRY_DATABASE = "database"; - public static final String FORESTRY_SORTING = "sorting"; - public static final String FORESTRY_BOOK = "book"; - public static final String FORESTRY_CULTIVATION = "cultivation"; - public static final String FORESTRY_RESEARCH = "research"; public static final String GALACTICRAFT_CORE = "galacticraftcore"; public static final String GENETICS = "genetics"; public static final String GENDUSTRY = "gendustry"; @@ -178,7 +128,6 @@ public static class Names { public static final String INVENTORY_TWEAKS = "inventorytweaks"; public static final String JOURNEY_MAP = "journeymap"; public static final String JUST_ENOUGH_ITEMS = "jei"; - public static final String MAGIC_BEES = "magicbees"; public static final String MODULRAUI = "modularui"; public static final String MIXINBOOTER = "mixinbooter"; public static final String NEEVES_AE2 = "nae2"; @@ -303,13 +252,4 @@ private static Function versionExcludes(String versionPart) { return !container.getVersion().contains(versionPart); }; } - - /** Test if a specific Forestry module is enabled. */ - private static Function forestryModule(String moduleID) { - if (Forestry.isModLoaded()) { - return mod -> forestry.modules.ModuleHelper.isEnabled(moduleID); - } else { - return $ -> false; - } - } } diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java deleted file mode 100644 index 91318a2f..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.gtexpert.core.integration.binnies; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.binnies.recipes.BinniesItemsRecipe; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_BINNIES, - containerID = GTEValues.MODID, - modDependencies = { Mods.Names.FORESTRY, Mods.Names.GENETICS, Mods.Names.BOTANY, - Mods.Names.EXTRA_BEES, Mods.Names.EXTRA_TREES }, - name = "GTExpert Binnie's Mods Integration", - description = "Binnie's Mods Integration Module") -public class BinniesModule extends GTEIntegrationSubmodule { - - @Override - public void postInit(FMLPostInitializationEvent event) { - BinniesItemsRecipe.init(); - } - - @Override - public void registerRecipesNormal(RegistryEvent.Register event) {} -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java deleted file mode 100644 index 40e91830..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.botany; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.binnies.botany.recipes.BotanyItemsRecipe; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_BOTANY, - containerID = GTEValues.MODID, - modDependencies = { Mods.Names.FORESTRY, Mods.Names.BOTANY }, - name = "GTExpert Botany(Binnie's Mods) Integration", - description = "Botany(Binnie's Mods) Integration Module") -public class BotanyModule extends GTEIntegrationSubmodule { - - @Override - public void postInit(FMLPostInitializationEvent event) { - BotanyItemsRecipe.init(); - } - - @Override - public void registerRecipesNormal(RegistryEvent.Register event) {} -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java deleted file mode 100644 index e3be2b08..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.botany.recipes; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.MarkerMaterials; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - -import forestry.api.recipes.RecipeManagers; - -public class BotanyItemsRecipe { - - public static void init() { - Enum recipeMode = FFMUtility.recipeMode.safeValueOf(FFMConfigHolder.gameMode); - - // Botanist Database - ModHandler.addShapelessNBTClearingRecipe("botanist_database_nbt", - Mods.Botany.getItem("database"), - Mods.Botany.getItem("database")); - - if (recipeMode == FFMUtility.recipeMode.HARD) { - // Botanist Database - CarpenterLoader.removeCarpenterRecipe(Mods.Botany.getItem("database")); - RecipeManagers.carpenterManager.addRecipe( - 20, Materials.Redstone.getFluid(1440), - Mods.Forestry.getItem("portable_alyzer"), Mods.Botany.getItem("database"), - "SPS", "DCE", "SPS", - 'S', new UnificationEntry(screw, Materials.Silver).toString(), - 'D', new UnificationEntry(plate, Materials.Diamond).toString(), - 'E', new UnificationEntry(plate, Materials.Emerald).toString(), - 'P', new UnificationEntry(plate, Materials.Gold).toString(), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.HV).toString()); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java deleted file mode 100644 index 1ad77955..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.extrabees; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.binnies.extrabees.recipes.ExtraBeesItemsRecipe; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_EXBEES, - containerID = GTEValues.MODID, - modDependencies = { Mods.Names.FORESTRY, Mods.Names.EXTRA_BEES }, - name = "GTExpert Extra Bees(Binnie's Mods) Integration", - description = "Extra Bees(Binnie's Mods) Integration Module") -public class ExtraBeesModule extends GTEIntegrationSubmodule { - - @Override - public void postInit(FMLPostInitializationEvent event) { - ExtraBeesItemsRecipe.init(); - } - - @Override - public void registerRecipesNormal(RegistryEvent.Register event) {} -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java deleted file mode 100644 index fb402170..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.extrabees.recipes; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.MarkerMaterials; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - -import forestry.api.recipes.RecipeManagers; - -public class ExtraBeesItemsRecipe { - - public static void init() { - Enum recipeMode = FFMUtility.recipeMode.safeValueOf(FFMConfigHolder.gameMode); - - // Apiarist Database - ModHandler.addShapelessNBTClearingRecipe("apiarist_database_nbt", - Mods.ExtraBees.getItem("dictionary"), - Mods.ExtraBees.getItem("dictionary")); - - if (recipeMode == FFMUtility.recipeMode.HARD) { - // Apiarist Database - CarpenterLoader.removeCarpenterRecipe(Mods.ExtraBees.getItem("dictionary")); - RecipeManagers.carpenterManager.addRecipe( - 20, Materials.Redstone.getFluid(1440), - Mods.Forestry.getItem("portable_alyzer"), Mods.ExtraBees.getItem("dictionary"), - "SPS", "DCE", "SPS", - 'S', new UnificationEntry(screw, Materials.Lead).toString(), - 'D', new UnificationEntry(plate, Materials.Diamond).toString(), - 'E', new UnificationEntry(plate, Materials.Emerald).toString(), - 'P', new UnificationEntry(plate, Materials.Gold).toString(), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.HV).toString()); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java deleted file mode 100644 index 69b4dcfc..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.extratrees; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.binnies.extratrees.recipes.*; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_EXTREES, - containerID = GTEValues.MODID, - modDependencies = { Mods.Names.FORESTRY, Mods.Names.EXTRA_TREES }, - name = "GTExpert Extra Trees(Binnie's Mods) Integration", - description = "Extra Trees(Binnie's Mods) Integration Module") -public class ExtraTreesModule extends GTEIntegrationSubmodule { - - @Override - public void postInit(FMLPostInitializationEvent event) { - ExtraTreesItemsRecipe.init(); - } - - @Override - public void registerRecipesNormal(RegistryEvent.Register event) {} -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java deleted file mode 100644 index 72bbea70..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.extratrees.recipes; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.MarkerMaterials; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - -import forestry.api.recipes.RecipeManagers; - -public class ExtraTreesItemsRecipe { - - public static void init() { - Enum recipeMode = FFMUtility.recipeMode.safeValueOf(FFMConfigHolder.gameMode); - - // Arborist Database - ModHandler.addShapelessNBTClearingRecipe("arborist_database_nbt", - Mods.ExtraTrees.getItem("databasetree"), - Mods.ExtraTrees.getItem("databasetree")); - - // Lepidopterist Database - ModHandler.addShapelessNBTClearingRecipe("lepidopterist_database_nbt", - Mods.ExtraTrees.getItem("databaselepi"), - Mods.ExtraTrees.getItem("databaselepi")); - - if (recipeMode == FFMUtility.recipeMode.HARD) { - // Arborist Database - CarpenterLoader.removeCarpenterRecipe(Mods.ExtraTrees.getItem("databasetree")); - RecipeManagers.carpenterManager.addRecipe( - 20, Materials.Redstone.getFluid(1440), - Mods.Forestry.getItem("portable_alyzer"), Mods.ExtraTrees.getItem("databasetree"), - "SPS", "DCE", "SPS", - 'S', new UnificationEntry(screw, Materials.Copper).toString(), - 'D', new UnificationEntry(plate, Materials.Diamond).toString(), - 'E', new UnificationEntry(plate, Materials.Emerald).toString(), - 'P', new UnificationEntry(plate, Materials.Gold).toString(), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.HV).toString()); - - // Lepidopterist Database - CarpenterLoader.removeCarpenterRecipe(Mods.ExtraTrees.getItem("databaselepi")); - RecipeManagers.carpenterManager.addRecipe( - 20, Materials.Redstone.getFluid(1440), - Mods.Forestry.getItem("portable_alyzer"), Mods.ExtraTrees.getItem("databaselepi"), - "SPS", "DCE", "SPS", - 'S', new UnificationEntry(screw, Materials.Tin).toString(), - 'D', new UnificationEntry(plate, Materials.Diamond).toString(), - 'E', new UnificationEntry(plate, Materials.Emerald).toString(), - 'P', new UnificationEntry(plate, Materials.Gold).toString(), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.HV).toString()); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java deleted file mode 100644 index 01575677..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.genetics; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.binnies.genetics.recipes.GeneticsItemsRecipe; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_GENETICS, - containerID = GTEValues.MODID, - modDependencies = { Mods.Names.FORESTRY, Mods.Names.GENETICS }, - name = "GTExpert Genetics(Binnie's Mods) Integration", - description = "Genetics(Binnie's Mods) Integration Module") -public class GeneticsModule extends GTEIntegrationSubmodule { - - @Override - public void postInit(FMLPostInitializationEvent event) { - GeneticsItemsRecipe.init(); - } - - @Override - public void registerRecipesNormal(RegistryEvent.Register event) {} -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java deleted file mode 100644 index ebb5cca9..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.genetics.recipes; - -import static gregtech.api.GTValues.*; -import static gregtech.api.unification.ore.OrePrefix.*; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -import gregtech.api.recipes.GTRecipeHandler; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.OreDictUnifier; -import gregtech.api.unification.material.MarkerMaterials; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; -import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; - -import forestry.api.recipes.RecipeManagers; - -public class GeneticsItemsRecipe { - - public static void init() { - Enum recipeMode = FFMUtility.recipeMode.safeValueOf(FFMConfigHolder.gameMode); - - // Gene Database - ModHandler.addShapelessNBTClearingRecipe("gene_database_nbt", - Mods.Genetics.getItem("geneticdatabase"), - Mods.Genetics.getItem("geneticdatabase")); - - if (recipeMode == FFMUtility.recipeMode.HARD) { - // Reinforced Casing - ModHandler.removeRecipeByName(Mods.Genetics.getResource("laboratory_casing")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Aluminium, 4) - .inputs(Mods.Forestry.getItem("sturdy_machine")) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(Mods.Genetics.getItem("misc")) - .EUt(VA[MV]).duration(FFMUtility.timeCarpenter(75)).buildAndRegister(); - RecipeManagers.carpenterManager.addRecipe( - 75, Materials.Water.getFluid(5000), - ItemStack.EMPTY, Mods.Genetics.getItem("misc"), - "# #", " Y ", "# #", - '#', "plateAluminium", - 'Y', Mods.Forestry.getItem("sturdy_machine")); - - // DNA Dye - ModHandler.removeRecipeByName(Mods.Genetics.getResource("dna_dye_from_glowstone")); - ModHandler.removeRecipeByName(Mods.Genetics.getResource("dna_dye")); - GTRecipeHandler.removeRecipesByInputs(RecipeMaps.MIXER_RECIPES, - OreDictUnifier.get(dust, Materials.Glowstone), - OreDictUnifier.get("dyeBlue"), - OreDictUnifier.get("dyePurple")); - RecipeMaps.MIXER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(dust, Materials.Redstone)) - .inputs(OreDictUnifier.get(dust, Materials.Glowstone)) - .input("dyeBlue") - .input("dyePurple") - .fluidInputs(Materials.Blaze.getFluid(144)) - .outputs(Mods.Genetics.getItem("misc", 1, 1)) - .EUt(VA[LV]).duration(100).buildAndRegister(); - - // Fluorescent Dye - ModHandler.removeRecipeByName(Mods.Genetics.getResource("fluorescent_dye")); - GTRecipeHandler.removeRecipesByInputs(RecipeMaps.MIXER_RECIPES, - OreDictUnifier.get(dust, Materials.Glowstone), - OreDictUnifier.get("dyeOrange"), - OreDictUnifier.get("dyeYellow")); - RecipeMaps.MIXER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(dust, Materials.Redstone)) - .inputs(OreDictUnifier.get(dust, Materials.Glowstone)) - .input("dyeOrange") - .input("dyeYellow") - .fluidInputs(Materials.Blaze.getFluid(144)) - .outputs(Mods.Genetics.getItem("misc", 1, 2)) - .EUt(VA[LV]).duration(100).buildAndRegister(); - - // Growth Medium - ModHandler.removeRecipeByName(Mods.Genetics.getResource("growth_medium")); - GTRecipeHandler.removeRecipesByInputs(RecipeMaps.MIXER_RECIPES, - OreDictUnifier.get(dust, Materials.Sugar), - OreDictUnifier.get(dust, Materials.Bone)); - RecipeMaps.MIXER_RECIPES.recipeBuilder() - .inputs(OreDictUnifier.get(dust, Materials.Sugar)) - .inputs(OreDictUnifier.get(dust, Materials.Calcium)) - .inputs(Mods.Forestry.getItem("mulch")) - .inputs(OreDictUnifier.get(dust, Materials.Wood)) - .inputs(OreDictUnifier.get(dust, Materials.Ash)) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(Mods.Genetics.getItem("misc", 1, 4)) - .EUt(VA[LV]).duration(400).buildAndRegister(); - - // Blank Sequence - ModHandler.removeRecipeByName(Mods.Genetics.getResource("empty_sequencer")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .circuitMeta(6) - .inputs(new ItemStack(Blocks.GLASS_PANE, 2)) - .fluidInputs(Materials.Gold.getFluid(288)) - .outputs(Mods.Genetics.getItem("misc", 1, 5)) - .EUt(VA[LV]).duration(200).buildAndRegister(); - - // Empty Serum Vial - ModHandler.removeRecipeByName(Mods.Genetics.getResource("empty_serum")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .circuitMeta(7) - .inputs(new ItemStack(Blocks.GLASS_PANE, 4)) - .fluidInputs(Materials.Gold.getFluid(144)) - .outputs(Mods.Genetics.getItem("misc", 1, 6)) - .EUt(VH[MV]).duration(200).buildAndRegister(); - - // Empty Serum Array - ModHandler.removeRecipeByName(Mods.Genetics.getResource("empty_genome")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .circuitMeta(8) - .inputs(new ItemStack(Blocks.GLASS_PANE, 10)) - .fluidInputs(Materials.Gold.getFluid(576)) - .outputs(Mods.Genetics.getItem("misc", 1, 7)) - .EUt(VA[MV]).duration(200).buildAndRegister(); - - // Integrated Circuit Board - ModHandler.removeRecipeByName(Mods.Genetics.getResource("integrated_circuit")); - ModHandler.addShapedRecipe(true, "integrated_circuit", - Mods.Genetics.getItem("misc", 1, 8), - "SdS", "CBC", "SwS", - 'S', new UnificationEntry(screw, Materials.StainlessSteel), - 'B', Mods.Forestry.getItem("chipsets", 1, 1), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.HV)); - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("chipsets", 1, 1)) - .input(circuit, MarkerMaterials.Tier.HV, 2) - .fluidInputs(Materials.StainlessSteel.getFluid(64)) - .outputs(Mods.Genetics.getItem("misc", 1, 8)) - .EUt(VA[LV]).duration(600).buildAndRegister(); - - // Integrated CPU - ModHandler.removeRecipeByName(Mods.Genetics.getResource("integrated_cpu")); - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .input(GTEUtility.circuitBoard(HV)) - .inputs(Mods.Forestry.getItem("thermionic_tubes", 1, 5)) - .fluidInputs(Materials.Glowstone.getFluid(144)) - .outputs(Mods.Genetics.getItem("misc", 1, 9)) - .EUt(VA[LV]).duration(600).buildAndRegister(); - - // Integrated Casing - ModHandler.removeRecipeByName(Mods.Genetics.getResource("integrated_casing")); - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("hardened_machine")) - .inputs(Mods.Genetics.getItem("misc", 2, 9)) - .fluidInputs(Materials.Glowstone.getFluid(288)) - .outputs(Mods.Genetics.getItem("misc", 1, 10)) - .EUt(VA[HV]).duration(900).buildAndRegister(); - - // Gene Database - CarpenterLoader.removeCarpenterRecipe(Mods.Genetics.getItem("geneticdatabase")); - RecipeManagers.carpenterManager.addRecipe( - 20, Materials.Redstone.getFluid(2880), - Mods.Forestry.getItem("portable_alyzer"), Mods.Genetics.getItem("geneticdatabase"), - "SPS", "PCP", "SPS", - 'S', new UnificationEntry(screw, Materials.Emerald).toString(), - 'P', new UnificationEntry(plate, Materials.Diamond).toString(), - 'C', new UnificationEntry(circuit, MarkerMaterials.Tier.EV).toString()); - - // Analyst - ModHandler.removeRecipeByName(Mods.Genetics.getResource("analyst")); - RecipeManagers.carpenterManager.addRecipe( - 40, Materials.Redstone.getFluid(4320), - Mods.Forestry.getItem("portable_alyzer"), Mods.Genetics.getItem("analyst"), - "IAI", "PCP", "IPI", - 'I', Mods.Genetics.getItem("misc", 1, 8), - 'A', Mods.Forestry.getItem("portable_alyzer"), - 'P', new UnificationEntry(plate, Materials.Diamond).toString(), - 'C', Mods.Genetics.getItem("misc", 1, 9)); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java deleted file mode 100644 index c1b6c545..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.gtexpert.core.integration.binnies.recipes; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.unification.material.Materials; - -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; - -import forestry.api.recipes.RecipeManagers; - -public class BinniesItemsRecipe { - - public static void init() { - Enum recipeMode = FFMUtility.recipeMode.safeValueOf(FFMConfigHolder.gameMode); - - if (recipeMode == FFMUtility.recipeMode.HARD) { - // Registry - ModHandler.removeRecipeByName(Mods.Genetics.getResource("registry")); - RecipeManagers.carpenterManager.addRecipe( - 40, Materials.Redstone.getFluid(4320), - Mods.Forestry.getItem("portable_alyzer"), Mods.Genetics.getItem("registry"), - "IAI", "BCP", "ILI", - 'I', Mods.Genetics.getItem("misc", 1, 8), - 'A', Mods.ExtraTrees.getItem("databasetree"), - 'B', Mods.Botany.getItem("database"), - 'C', Mods.Genetics.getItem("misc", 1, 9), - 'P', Mods.ExtraBees.getItem("dictionary"), - 'L', Mods.ExtraTrees.getItem("databaselepi")); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java deleted file mode 100644 index efaee201..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.gtexpert.core.integration.ffm; - -import net.minecraftforge.common.config.Config; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.modules.GTEModules; - -@Config.LangKey(GTEValues.MODID + ".config.integration.ffm") -@Config(modid = GTEValues.MODID, - name = GTEValues.MODID + "/integration/" + GTEModules.MODULE_FFM, - category = "Forestry") -public class FFMConfigHolder { - - @Config.Comment({ "Recipes for various items in Forestry will be more difficult", - "default: NORMAL", - "valid: [NORMAL, HARD]" }) - public static String gameMode = "NORMAL"; -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java deleted file mode 100644 index 3c642dc7..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.github.gtexpert.core.integration.ffm; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.ffm.loaders.FFMOreDictionaryLoader; -import com.github.gtexpert.core.integration.ffm.recipes.*; -import com.github.gtexpert.core.integration.ffm.recipes.machines.*; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_FFM, - containerID = GTEValues.MODID, - modDependencies = Mods.Names.FORESTRY, - name = "GTExpert Forestry For Minecraft Integration", - description = "Forestry For Minecraft Integration Module") -public class FFMModule extends GTEIntegrationSubmodule { - - @Override - public void postInit(FMLPostInitializationEvent event) { - FFMBlockRecipe.init(); - FFMItemRecipe.init(); - FFMMaterialsRecipe.init(); - FFMToolRecipe.init(); - - CarpenterLoader.initBase(); - CarpenterLoader.initMode(); - CentrifugeLoader.init(); - FabricatorLoader.init(); - } - - @Override - public void registerRecipesNormal(RegistryEvent.Register event) { - FFMOreDictionaryLoader.init(); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java deleted file mode 100644 index 0cd209ad..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.github.gtexpert.core.integration.ffm; - -import org.jetbrains.annotations.NotNull; - -import gregtech.common.ConfigHolder; - -import com.github.gtexpert.core.api.util.GTELog; - -import forestry.api.core.ForestryAPI; - -public class FFMUtility { - - public static float energyModifier = ForestryAPI.activeMode.getFloatSetting("energy.demand.modifier"); - public static int feToEu = ConfigHolder.compat.energy.euToFeRatio; - - public static int timeCarpenter(int EUt) { - return Math.round(EUt * 204 * energyModifier / (100 * feToEu)); - } - - public static int timeFabricator(int EUt) { - return Math.round(200 * energyModifier / (EUt * feToEu)); - } - - public enum recipeMode { - - EASY("EASY"), // NO SUPPORT - NORMAL("NORMAL"), - HARD("HARD"), - OP("OP"); // NO SUPPORT - - private final String mode; - - public String getString() { - return this.mode; - } - - recipeMode(final String mode) { - this.mode = mode; - } - - public static recipeMode safeValueOf(@NotNull String name) { - if (name.isEmpty()) { - GTELog.logger.error("Invalid recipe mode is empty! Set to default value.", new Throwable()); - return NORMAL; - } - - try { - return recipeMode.valueOf(name); - } catch (IllegalArgumentException e) { - GTELog.logger.error("Invalid recipe mode! Set to default value. : {}", name, e, new Throwable()); - return NORMAL; - } - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java deleted file mode 100644 index c2246980..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.loaders; - -import net.minecraftforge.oredict.OreDictionary; - -import com.github.gtexpert.core.api.util.Mods; - -public class FFMOreDictionaryLoader { - - public static void init() { - OreDictionary.registerOre("oreApatite", Mods.Forestry.getItem("resources")); - OreDictionary.registerOre("oreCopper", Mods.Forestry.getItem("resources", 1, 1)); - OreDictionary.registerOre("oreTin", Mods.Forestry.getItem("resources", 1, 2)); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java deleted file mode 100644 index 7367f1ff..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.recipes; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.common.ConfigHolder; - -import com.github.gtexpert.core.api.util.Mods; - -public class FFMBlockRecipe { - - public static void init() { - if (Mods.ForestryCore.isModLoaded()) { - blockCore(); - } - if (Mods.ForestryCharcoal.isModLoaded()) { - blockCharcoal(); - } - } - - public static void blockCore() { - // Ash Brick - if (ConfigHolder.recipes.harderBrickRecipes) { - ModHandler.removeRecipeByName(Mods.Forestry.getResource("ash_brick")); - RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder() - .input(dust, Materials.Ash, 4) - .inputs(new ItemStack(Items.BRICK, 4)) - .outputs(Mods.Forestry.getItem("ash_brick")) - .duration(400).EUt(2).buildAndRegister(); - RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder() - .input(dust, Materials.Ash, 4) - .inputs(new ItemStack(Blocks.BRICK_BLOCK)) - .outputs(Mods.Forestry.getItem("ash_brick")) - .duration(100).EUt(2).buildAndRegister(); - } - } - - public static void blockCharcoal() { - // Loam - ModHandler.removeRecipeByName(Mods.Forestry.getResource("loam")); - RecipeMaps.MIXER_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.CLAY_BALL, 4)) - .input("sand", 2) - .inputs(Mods.Forestry.getItem("fertilizer_bio", 2)) - .outputs(Mods.Forestry.getItem("loam", 4)) - .duration(200).EUt(16).buildAndRegister(); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java deleted file mode 100644 index 8872bd63..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.recipes; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; - -import com.github.gtexpert.core.api.util.Mods; - -public class FFMItemRecipe { - - public static void init() { - if (Mods.ForestryCore.isModLoaded()) { - itemCore(); - } - } - - public static void itemCore() { - // Study Casing - ModHandler.removeRecipeByName(Mods.Forestry.getResource("sturdy_casing")); - ModHandler.addShapedRecipe(true, "sturdy_casing", Mods.Forestry.getItem("sturdy_machine"), - "PPP", "PwP", "PPP", - 'P', new UnificationEntry(plate, Materials.Bronze)); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Bronze, 8) - .circuitMeta(8) - .outputs(Mods.Forestry.getItem("sturdy_machine")) - .duration(50).EUt(16).buildAndRegister(); - - // Portable Analyzer - ModHandler.addShapelessNBTClearingRecipe("portable_alyzer_nbt", - Mods.Forestry.getItem("portable_alyzer"), - Mods.Forestry.getItem("portable_alyzer")); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java deleted file mode 100644 index 7d502cca..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.recipes; - -import gregtech.api.recipes.ModHandler; - -import com.github.gtexpert.core.api.util.Mods; - -public class FFMMaterialsRecipe { - - public static void init() { - if (Mods.ForestryCore.isModLoaded()) { - materialsCore(); - } - if (Mods.ForestryCharcoal.isModLoaded()) { - materialCharcoal(); - } - } - - public static void materialsCore() { - // Copper Ingot - ModHandler.removeRecipeByName(Mods.Forestry.getResource("block_to_copper")); - - // Copper Block - ModHandler.removeRecipeByName(Mods.Forestry.getResource("copper_block")); - - // Copper Gear - ModHandler.removeRecipeByName(Mods.Forestry.getResource("gear_copper")); - - // Tin Ingot - ModHandler.removeRecipeByName(Mods.Forestry.getResource("block_to_tin")); - - // Tin Block - ModHandler.removeRecipeByName(Mods.Forestry.getResource("tin_block")); - - // Tin Gear - ModHandler.removeRecipeByName(Mods.Forestry.getResource("gear_tin")); - - // Bronze Ingot - ModHandler.removeRecipeByName(Mods.Forestry.getResource("bronze_ingot")); - ModHandler.removeRecipeByName(Mods.Forestry.getResource("block_to_bronze")); - - // Bronze Block - ModHandler.removeRecipeByName(Mods.Forestry.getResource("bronze_block")); - - // Bronze Gear - ModHandler.removeRecipeByName(Mods.Forestry.getResource("gear_bronze")); - - // Apatite - ModHandler.removeRecipeByName(Mods.Forestry.getResource("block_to_apatite")); - - // Apatite Block - ModHandler.removeRecipeByName(Mods.Forestry.getResource("apatite_block")); - } - - public static void materialCharcoal() { - // Charcoal - ModHandler.removeRecipeByName(Mods.Forestry.getResource("charcoal")); - - // Charcoal Block - ModHandler.removeRecipeByName(Mods.Forestry.getResource("charcoal_block")); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java deleted file mode 100644 index d7a76c5c..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.recipes; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.GTValues; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; -import gregtech.common.ConfigHolder; - -import com.github.gtexpert.core.api.util.Mods; - -public class FFMToolRecipe { - - public static void init() { - if (Mods.ForestryCore.isModLoaded()) { - toolCore(); - } - if (Mods.ForestryArboriculture.isModLoaded()) { - toolArboriculture(); - } - if (Mods.ForestryApiculture.isModLoaded()) { - toolApiculture(); - } - } - - public static void toolCore() { - if (!ConfigHolder.recipes.hardToolArmorRecipes) return; - - // Survivalist Tools - ModHandler.removeRecipeByName(Mods.Forestry.getResource("bronze_pickaxe")); - ModHandler.addShapedRecipe(true, "survivalist_pickaxe", Mods.Forestry.getItem("bronze_pickaxe"), - " S ", "hSf", "PII", - 'S', new ItemStack((Items.STICK)), - 'P', new UnificationEntry(plate, Materials.Bronze), - 'I', new UnificationEntry(ingot, Materials.Bronze)); - - ModHandler.removeRecipeByName(Mods.Forestry.getResource("bronze_shovel")); - ModHandler.addShapedRecipe(true, "survivalist_shovel", Mods.Forestry.getItem("bronze_shovel"), - " S ", " S ", "hPf", - 'S', new ItemStack(Items.STICK), - 'P', new UnificationEntry(plate, Materials.Bronze)); - - // Naturalist's Armor - ModHandler.removeRecipeByName(Mods.Forestry.getResource("spectacles")); - ModHandler.addShapedRecipe(true, "spectacles", Mods.Forestry.getItem("naturalist_helmet"), - " P ", "G G", - 'P', new UnificationEntry(plate, Materials.Bronze), - 'G', new ItemStack(Blocks.GLASS_PANE)); - } - - private static void toolArboriculture() { - if (!ConfigHolder.recipes.hardToolArmorRecipes) return; - - // Grafter - ModHandler.removeRecipeByName(Mods.Forestry.getResource("grafter")); - ModHandler.addShapedRecipe(true, "grafter", Mods.Forestry.getItem("grafter"), - "Ph ", "fS ", " S", - 'P', new UnificationEntry(plate, Materials.Bronze), - 'S', new UnificationEntry(stick, Materials.Wood)); - } - - private static void toolApiculture() { - // Habitat Locator - if (!ConfigHolder.recipes.hardToolArmorRecipes) { - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(dust, Materials.Redstone) - .input(plate, Materials.Bronze, 4) - .circuitMeta(1) - .outputs(Mods.Forestry.getItem("habitat_locator")) - .duration(100).EUt(4).buildAndRegister(); - } else { - ModHandler.removeRecipeByName(Mods.Forestry.getResource("habitat_locator")); - ModHandler.addShapedRecipe(true, "habitat_locator", Mods.Forestry.getItem("habitat_locator"), - "SGB", "RPR", "AdS", - 'S', new UnificationEntry(screw, Materials.Bronze), - 'G', new ItemStack(Blocks.GLASS_PANE, 1, GTValues.W), - 'B', new UnificationEntry(bolt, Materials.IronMagnetic), - 'R', new UnificationEntry(ring, Materials.Zinc), - 'P', new UnificationEntry(plate, Materials.Bronze), - 'A', new UnificationEntry(bolt, Materials.RedAlloy)); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Bronze) - .input(ring, Materials.Zinc) - .input(bolt, Materials.RedAlloy) - .input(bolt, Materials.IronMagnetic) - .input(screw, Materials.Bronze, 2) - .outputs(Mods.Forestry.getItem("habitat_locator")) - .duration(100).EUt(16).buildAndRegister(); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java deleted file mode 100644 index e5f6c8b2..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.recipes.machines; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.GTValues; -import gregtech.api.items.metaitem.MetaItem; -import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition; -import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; -import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.stack.UnificationEntry; -import gregtech.api.util.GTUtility; -import gregtech.common.items.MetaItems; -import gregtech.common.metatileentities.MetaTileEntities; - -import com.github.gtexpert.core.api.util.GTELog; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; -import com.github.gtexpert.core.integration.ffm.FFMUtility; - -import forestry.api.circuits.ICircuit; -import forestry.api.recipes.RecipeManagers; -import forestry.arboriculture.ModuleArboriculture; -import forestry.core.circuits.EnumCircuitBoardType; -import forestry.core.circuits.ItemCircuitBoard; -import forestry.core.fluids.Fluids; -import forestry.factory.recipes.CarpenterRecipeManager; -import forestry.lepidopterology.ModuleLepidopterology; - -public class CarpenterLoader { - - public static void initBase() { - Core(); - Apiculture(); - Climatology(); - Factory(); - Mail(); - Storage(); - } - - public static void initMode() { - Enum recipeMode = FFMUtility.recipeMode.safeValueOf(FFMConfigHolder.gameMode); - - if (recipeMode == FFMUtility.recipeMode.NORMAL) { - CoreNormal(); - ApicultureNormal(); - - // Circuit - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1), - 20, Materials.Iron, MetaItems.COATED_BOARD); - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1, 1), - 40, Materials.Bronze, MetaItems.COATED_BOARD); - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1, 2), - 80, Materials.Steel, MetaItems.PHENOLIC_BOARD); - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1, 3), - 160, Materials.Electrum, MetaItems.PHENOLIC_BOARD); - - } else if (recipeMode == FFMUtility.recipeMode.HARD) { - CoreHard(); - ApicultureHard(); - ArboricultureHard(); - LepidopterologyHard(); - - // Circuit - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1), - 20, Materials.Iron, MetaItems.COATED_BOARD, GTEUtility.oreDictionaryCircuit(GTValues.ULV)); - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1, 1), - 40, Materials.Bronze, MetaItems.COATED_BOARD, GTEUtility.oreDictionaryCircuit(GTValues.LV)); - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1, 2), - 80, Materials.Steel, MetaItems.PHENOLIC_BOARD, GTEUtility.oreDictionaryCircuit(GTValues.MV)); - CarpenterLoader.registerCarpenterRecipe(recipeMode, Mods.Forestry.getItem("chipsets", 1, 3), - 160, Materials.Electrum, MetaItems.PHENOLIC_BOARD, GTEUtility.oreDictionaryCircuit(GTValues.HV)); - } - } - - /** - * XX : Module Name - * - : Always loaded - * Normal : Only loaded when hardForestryRecipe is false - * Hard : Only loaded when hardForestryRecipe is true - */ - private static void Core() { - if (Mods.ForestryFactory.isModLoaded()) { - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("portable_alyzer")); - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("hardened_machine")); - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("kit_pickaxe")); - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("kit_shovel")); - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("wood_pulp")); - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("carton")); - CarpenterLoader.removeCarpenterRecipe(new ItemStack(Items.PAPER)); - - RecipeManagers.carpenterManager.addRecipe( - 5, Materials.Water.getFluid(1000), - ItemStack.EMPTY, Mods.Forestry.getItem("carton"), - " D ", "D D", " D ", 'D', new UnificationEntry(dust, Materials.Wood).toString()); - - RecipeManagers.carpenterManager.addRecipe( - 20, - Mods.Forestry.getItem("carton"), Mods.Forestry.getItem("kit_pickaxe"), - " S ", " S ", "PII", - 'S', new UnificationEntry(stick, Materials.Wood).toString(), - 'P', new UnificationEntry(plate, Materials.Bronze).toString(), - 'I', new UnificationEntry(ingot, Materials.Bronze).toString()); - - RecipeManagers.carpenterManager.addRecipe(20, - Mods.Forestry.getItem("carton"), Mods.Forestry.getItem("kit_shovel"), - " S ", " S ", " P ", - 'S', new UnificationEntry(stick, Materials.Wood).toString(), - 'P', new UnificationEntry(plate, Materials.Bronze).toString()); - - // Hardened Casing - RecipeManagers.carpenterManager.addRecipe( - 75, Materials.Water.getFluid(5000), - ItemStack.EMPTY, Mods.Forestry.getItem("hardened_machine"), - "# #", " Y ", "# #", - '#', "plateDiamond", - 'Y', Mods.Forestry.getItem("sturdy_machine")); - } else { - ModHandler.removeRecipeByName(Mods.Forestry.getResource("portable_alyzer")); - } - - // Impregnated Casing - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input("logWood", 8) - .fluidInputs(Materials.SeedOil.getFluid(250)) - .circuitMeta(1) - .outputs(Mods.Forestry.getItem("impregnated_casing")) - .EUt(50).duration(FFMUtility.timeCarpenter(50)).buildAndRegister(); - - // Escritoire - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input("plankWood", 6) - .fluidInputs(Materials.SeedOil.getFluid(500)) - .circuitMeta(10) - .outputs(Mods.Forestry.getItem("escritoire")) - .EUt(50).duration(FFMUtility.timeCarpenter(50)).buildAndRegister(); - - // Impregnated Stick - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input("logWood", 2) - .fluidInputs(Materials.SeedOil.getFluid(100)) - .circuitMeta(11) - .outputs(Mods.Forestry.getItem("oak_stick")) - .EUt(10).duration(FFMUtility.timeCarpenter(10)).buildAndRegister(); - - // Bog Earth - RecipeMaps.MIXER_RECIPES.recipeBuilder() - .inputs(new ItemStack(Blocks.DIRT, 4, GTValues.W)) - .input("sand", 4) - .inputs(Mods.Forestry.getItem("mulch")) - .fluidInputs(Materials.Water.getFluid(1000)) - .circuitMeta(2) - .outputs(Mods.Forestry.getItem("bog_earth", 8)) - .EUt(5).duration(FFMUtility.timeCarpenter(5)).buildAndRegister(); - - // Hardened Casing - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Diamond, 4) - .inputs(Mods.Forestry.getItem("sturdy_machine")) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(Mods.Forestry.getItem("hardened_machine")) - .EUt(75).duration(FFMUtility.timeCarpenter(75)).buildAndRegister(); - - // Ender Pearl - RecipeMaps.CHEMICAL_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("crafting_material", 5, 1)) - .outputs(new ItemStack(Items.ENDER_PEARL)) - .EUt(100).duration(FFMUtility.timeCarpenter(100)).buildAndRegister(); - - // Woven Silk - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("crafting_material", 9, 2)) - .fluidInputs(Materials.Water.getFluid(500)) - .outputs(Mods.Forestry.getItem("crafting_material", 1, 3)) - .EUt(10).duration(FFMUtility.timeCarpenter(10)).buildAndRegister(); - - // Tool - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("bronze_pickaxe")) - .inputs(Mods.Forestry.getItem("carton")) - .outputs(Mods.Forestry.getItem("kit_pickaxe")) - .EUt(20).duration(FFMUtility.timeCarpenter(20)).buildAndRegister(); - - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("bronze_shovel")) - .inputs(Mods.Forestry.getItem("carton")) - .outputs(Mods.Forestry.getItem("kit_shovel")) - .EUt(20).duration(FFMUtility.timeCarpenter(20)).buildAndRegister(); - - RecipeMaps.ARC_FURNACE_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("broken_bronze_pickaxe")) - .fluidInputs(Materials.Oxygen.getFluid(100)) - .output(ingot, Materials.Bronze, 2) - .EUt(5).duration(FFMUtility.timeCarpenter(5)).buildAndRegister(); - - RecipeMaps.ARC_FURNACE_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("broken_bronze_shovel")) - .fluidInputs(Materials.Oxygen.getFluid(100)) - .output(ingot, Materials.Bronze) - .EUt(5).duration(FFMUtility.timeCarpenter(5)).buildAndRegister(); - - // Carton - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(dust, Materials.Wood, 4) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(Mods.Forestry.getItem("carton")) - .EUt(5).duration(FFMUtility.timeCarpenter(5)).buildAndRegister(); - } - - private static void CoreNormal() { - // Portable Analyzer - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Tin, 2) - .input("circuitLv", 2) - .input(plate, Materials.Diamond) - .input("paneGlass", 2) - .input(plate, Materials.RedAlloy, 2) - .fluidInputs(Materials.Water.getFluid(2000)) - .outputs(Mods.Forestry.getItem("portable_alyzer")) - .EUt(50).duration(FFMUtility.timeCarpenter(50 * 4)).buildAndRegister(); - - if (Mods.ForestryFactory.isModLoaded()) { - RecipeManagers.carpenterManager.addRecipe( - 50, Materials.Water.getFluid(2000), - ItemStack.EMPTY, Mods.Forestry.getItem("portable_alyzer"), - "TGT", "CGC", "RDR", - 'T', new UnificationEntry(plate, Materials.Tin).toString(), - 'G', "paneGlass", - 'C', "circuitLv", - 'R', new UnificationEntry(plate, Materials.RedAlloy).toString(), - 'D', new UnificationEntry(plate, Materials.Diamond).toString()); - } - } - - private static void CoreHard() { - // Portable Analyzer - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Tin, 2) - .input("circuitMv", 2) - .input(plate, Materials.Diamond) - .input("paneGlass", 2) - .input(plate, Materials.RedAlloy, 2) - .fluidInputs(Materials.Water.getFluid(2000)) - .outputs(Mods.Forestry.getItem("portable_alyzer")) - .EUt(50).duration(FFMUtility.timeCarpenter(50 * 4)).buildAndRegister(); - - if (Mods.ForestryFactory.isModLoaded()) { - RecipeManagers.carpenterManager.addRecipe( - 50, Materials.Water.getFluid(2000), - ItemStack.EMPTY, Mods.Forestry.getItem("portable_alyzer"), - "TGT", "CGC", "RDR", - 'T', new UnificationEntry(plate, Materials.Tin).toString(), - 'G', "paneGlass", - 'C', "circuitMv", - 'R', new UnificationEntry(plate, Materials.RedAlloy).toString(), - 'D', new UnificationEntry(plate, Materials.Diamond).toString()); - } - } - - private static void Apiculture() { - if (!Mods.ForestryApiculture.isModLoaded()) return; - // Scented Paneling - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("royal_jelly")) - .input("plankWood", 3) - .inputs(Mods.Forestry.getItem("beeswax", 2)) - .inputs(Mods.Forestry.getItem("pollen")) - .fluidInputs(Fluids.FOR_HONEY.getFluid(500)) - .outputs(Mods.Forestry.getItem("crafting_material", 1, 6)) - .EUt(50).duration(FFMUtility.timeCarpenter(50)).buildAndRegister(); - - // Candle - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(Items.STRING) - .inputs(Mods.Forestry.getItem("beeswax", 6)) - .fluidInputs(Materials.Water.getFluid(600)) - .outputs(Mods.Forestry.getItem("candle", 24)) - .EUt(30).duration(FFMUtility.timeCarpenter(30)).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("crafting_material", 1, 2)) - .inputs(Mods.Forestry.getItem("beeswax", 6)) - .fluidInputs(Materials.Water.getFluid(200)) - .outputs(Mods.Forestry.getItem("candle", 6)) - .EUt(10).duration(FFMUtility.timeCarpenter(10)).buildAndRegister(); - - // Iodine Capsule - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("honey_drop", 2)) - .inputs(GTUtility.copy(4, ModuleArboriculture.getItems().pollenFertile.getWildcard())) - .inputs(Mods.Forestry.getItem("can")) - .input(dust, Materials.Gunpowder, 2) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(Mods.Forestry.getItem("iodine_capsule")) - .EUt(5).duration(FFMUtility.timeCarpenter(5)).buildAndRegister(); - - // Dissipation Charge - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("honeydew", 2)) - .inputs(Mods.Forestry.getItem("royal_jelly", 4)) - .inputs(Mods.Forestry.getItem("can")) - .input(dust, Materials.Gunpowder, 2) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(Mods.Forestry.getItem("crafting_material", 1, 4)) - .EUt(5).duration(FFMUtility.timeCarpenter(5)).buildAndRegister(); - - if (Mods.ForestryFactory.isModLoaded()) {} - } - - private static void ApicultureNormal() { - if (!Mods.ForestryApiculture.isModLoaded()) return; - if (Mods.ForestryFactory.isModLoaded()) {} - } - - private static void ApicultureHard() { - if (!Mods.ForestryApiculture.isModLoaded()) return; - // Apiarist's Chest - ModHandler.removeRecipeByName(Mods.Forestry.getResource("bee_chest")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(screw, Materials.Steel, 2) - .input("blockGlass") - .input("beeComb", 5) - .input("chestWood") - .fluidInputs(Fluids.FOR_HONEY.getFluid(1000)) - .outputs(Mods.Forestry.getItem("bee_chest")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - // Apiariy - ModHandler.removeRecipeByName(Mods.Forestry.getResource("apiary")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("bee_house", 2)) - .inputs(Mods.Forestry.getItem("frame_impregnated")) - .input(screw, Materials.Steel, 2) - .input("slabWood", 2) - .input("beeComb") - .input("fenceWood") - .fluidInputs(Materials.SeedOil.getFluid(1000)) - .outputs(Mods.Forestry.getItem("apiary")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - // Alvearies - ModHandler.removeRecipeByName(Mods.Forestry.getResource("alveary_swarmer")); - ModHandler.removeRecipeByName(Mods.Forestry.getResource("alveary_fan")); - ModHandler.removeRecipeByName(Mods.Forestry.getResource("alveary_heater")); - ModHandler.removeRecipeByName(Mods.Forestry.getResource("alveary_hygro")); - ModHandler.removeRecipeByName(Mods.Forestry.getResource("alveary_stabiliser")); - ModHandler.removeRecipeByName(Mods.Forestry.getResource("alveary_sieve")); - - // Swarmer - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("alveary.plain")) - .inputs(Mods.Forestry.getItem("thermionic_tubes", 4, 5)) - .inputs(Mods.Forestry.getItem("frame_impregnated")) - .inputs(Mods.Forestry.getItem("royal_jelly")) - .input(foil, Materials.RoseGold, 2) - .fluidInputs(Fluids.FOR_HONEY.getFluid(5000)) - .outputs(Mods.Forestry.getItem("alveary.swarmer")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - // Fan - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("alveary.plain")) - .inputs(Mods.Forestry.getItem("thermionic_tubes", 4, 11)) - .input(Blocks.IRON_BARS, 2) - .input(rotor, Materials.Bronze) - .input(MetaItems.ELECTRIC_MOTOR_MV, 2) - .fluidInputs(Fluids.FOR_HONEY.getFluid(5000)) - .outputs(Mods.Forestry.getItem("alveary.fan")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - // Heater - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("alveary.plain")) - .inputs(Mods.Forestry.getItem("thermionic_tubes", 4, 7)) - .input(Blocks.IRON_BARS) - .input(MetaItems.ELECTRIC_MOTOR_MV) - .input(wireGtQuadruple, Materials.Cupronickel, 3) - .fluidInputs(Fluids.FOR_HONEY.getFluid(5000)) - .outputs(Mods.Forestry.getItem("alveary.heater")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - // Hygroregulator - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("alveary.plain")) - .inputs(Mods.Forestry.getItem("thermionic_tubes", 4, 6)) - .input("circuitMv") - .input(MetaTileEntities.BRONZE_DRUM, 2) - .input(pipeNormalFluid, Materials.StainlessSteel) - .input(plate, Materials.RedAlloy) - .fluidInputs(Fluids.FOR_HONEY.getFluid(5000)) - .outputs(Mods.Forestry.getItem("alveary.hygro")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - // Stabiliser - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("alveary.plain")) - .inputs(Mods.Forestry.getItem("thermionic_tubes", 4, 4)) - .inputs(Mods.Forestry.getItem("royal_jelly")) - .input(MetaItems.ITEM_FILTER, 2) - .input(plate, Materials.CertusQuartz, 2) - .fluidInputs(Fluids.FOR_HONEY.getFluid(5000)) - .outputs(Mods.Forestry.getItem("alveary.stabiliser")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - // Sieve - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("alveary.plain")) - .inputs(Mods.Forestry.getItem("thermionic_tubes", 4, 9)) - .inputs(Mods.Forestry.getItem("crafting_material", 3, 4)) - .inputs(GTUtility.copy(2, ModuleArboriculture.getItems().pollenFertile.getWildcard())) - .fluidInputs(Fluids.FOR_HONEY.getFluid(5000)) - .outputs(Mods.Forestry.getItem("alveary.sieve")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - if (Mods.ForestryFactory.isModLoaded()) { - // Apiarist's Chest - RecipeManagers.carpenterManager.addRecipe( - 60, Fluids.FOR_HONEY.getFluid(1000), - ItemStack.EMPTY, Mods.Forestry.getItem("bee_chest"), - "SGS", "BCB", "BBB", - 'S', new UnificationEntry(screw, Materials.Steel).toString(), - 'G', "blockGlass", - 'C', "chestWood", - 'B', "beeComb"); - - // Apiariy - RecipeManagers.carpenterManager.addRecipe( - 60, Materials.SeedOil.getFluid(1000), Mods.Forestry.getItem("frame_impregnated"), - Mods.Forestry.getItem("apiary"), - "sws", "aca", "fwf", - 's', "screwSteel", - 'w', "slabWood", - 'a', Mods.Forestry.getItem("bee_house"), - 'c', "beeComb", - 'f', "fenceWood"); - - // Alvearies - // Swarmer - RecipeManagers.carpenterManager.addRecipe( - 60, Fluids.FOR_HONEY.getFluid(5000), - Mods.Forestry.getItem("alveary.plain"), Mods.Forestry.getItem("alveary.swarmer"), - "TGT", "RFR", "TGT", - 'T', Mods.Forestry.getItem("thermionic_tubes", 1, 5), - 'G', new UnificationEntry(foil, Materials.RoseGold).toString(), - 'R', Mods.Forestry.getItem("royal_jelly"), - 'F', Mods.Forestry.getItem("frame_impregnated")); - - // Fan - RecipeManagers.carpenterManager.addRecipe( - 60, Fluids.FOR_HONEY.getFluid(5000), - Mods.Forestry.getItem("alveary.plain"), Mods.Forestry.getItem("alveary.fan"), - "TBT", "MRM", "TBT", - 'T', Mods.Forestry.getItem("thermionic_tubes", 1, 11), - 'B', Blocks.IRON_BARS, - 'M', MetaItems.ELECTRIC_MOTOR_MV.getStackForm(), - 'R', new UnificationEntry(rotor, Materials.Bronze).toString()); - - // Heater - RecipeManagers.carpenterManager.addRecipe( - 60, Fluids.FOR_HONEY.getFluid(5000), - Mods.Forestry.getItem("alveary.plain"), Mods.Forestry.getItem("alveary.heater"), - "TBT", "CCC", "TMT", - 'T', Mods.Forestry.getItem("thermionic_tubes", 1, 7), - 'B', Blocks.IRON_BARS, - 'C', new UnificationEntry(wireGtQuadruple, Materials.Cupronickel).toString(), - 'M', MetaItems.ELECTRIC_MOTOR_MV.getStackForm()); - - // Hygroregulator - RecipeManagers.carpenterManager.addRecipe( - 60, Fluids.FOR_HONEY.getFluid(5000), - Mods.Forestry.getItem("alveary.plain"), Mods.Forestry.getItem("alveary.hygro"), - "TCT", "DPD", "TRT", - 'T', Mods.Forestry.getItem("thermionic_tubes", 1, 6), - 'C', "circuitMv", - 'D', MetaTileEntities.BRONZE_DRUM.getStackForm(), - 'P', new UnificationEntry(pipeNormalFluid, Materials.StainlessSteel).toString(), - 'R', new UnificationEntry(plate, Materials.RedAlloy).toString()); - - // Stabiliser - RecipeManagers.carpenterManager.addRecipe( - 60, Fluids.FOR_HONEY.getFluid(5000), - Mods.Forestry.getItem("alveary.plain"), Mods.Forestry.getItem("alveary.stabiliser"), - "TQT", "FJF", "TQT", - 'T', Mods.Forestry.getItem("thermionic_tubes", 1, 4), - 'Q', new UnificationEntry(plate, Materials.CertusQuartz).toString(), - 'F', MetaItems.ITEM_FILTER.getStackForm(), - 'J', Mods.Forestry.getItem("royal_jelly")); - - // Sieve - RecipeManagers.carpenterManager.addRecipe( - 60, Fluids.FOR_HONEY.getFluid(5000), - Mods.Forestry.getItem("alveary.plain"), Mods.Forestry.getItem("alveary.sieve"), - "TPT", "CCC", "TPT", - 'T', Mods.Forestry.getItem("thermionic_tubes", 1, 9), - 'C', Mods.Forestry.getItem("crafting_material", 1, 4), - 'P', ModuleArboriculture.getItems().pollenFertile.getWildcard()); - } - } - - private static void ArboricultureHard() { - if (!Mods.ForestryArboriculture.isModLoaded()) return; - // Arborist's Chest - ModHandler.removeRecipeByName(Mods.Forestry.getResource("tree_chest")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(screw, Materials.Steel, 2) - .input("blockGlass") - .input("treeSapling", 5) - .input("chestWood") - .fluidInputs(Materials.SeedOil.getFluid(1000)) - .outputs(Mods.Forestry.getItem("tree_chest")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - if (Mods.ForestryFactory.isModLoaded()) { - RecipeManagers.carpenterManager.addRecipe( - 60, Materials.SeedOil.getFluid(1000), - ItemStack.EMPTY, Mods.Forestry.getItem("tree_chest"), - "SGS", "TCT", "TTT", - 'S', new UnificationEntry(screw, Materials.Steel).toString(), - 'G', "blockGlass", - 'C', "chestWood", - 'T', "treeSapling"); - } - } - - private static void Climatology() { - if (!Mods.ForestryClimatology.isModLoaded()) return; - if (Mods.ForestryFactory.isModLoaded()) { - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("habitat_screen")); - - RecipeManagers.carpenterManager.addRecipe( - 100, Materials.Water.getFluid(2000), - ItemStack.EMPTY, Mods.Forestry.getItem("habitat_screen"), - "BPB", "BPB", "GDG", - 'B', new UnificationEntry(plate, Materials.Bronze).toString(), - 'P', "paneGlass", - 'G', new UnificationEntry(gear, Materials.Bronze).toString(), - 'D', new UnificationEntry(plate, Materials.Diamond).toString()); - } else { - ModHandler.removeRecipeByName(Mods.Forestry.getResource("habitat_screen")); - } - - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Bronze, 4) - .input("paneGlass", 2) - .input(gear, Materials.Bronze, 2) - .input(plate, Materials.Diamond) - .fluidInputs(Materials.Water.getFluid(2000)) - .outputs(Mods.Forestry.getItem("habitat_screen")) - .EUt(100).duration(FFMUtility.timeCarpenter(100)).buildAndRegister(); - } - - private static void Factory() { - if (!Mods.ForestryFactory.isModLoaded()) return; - CarpenterLoader.removeCarpenterRecipe( - ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[] {})); - CarpenterLoader.removeCarpenterRecipe( - ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[] {})); - CarpenterLoader.removeCarpenterRecipe( - ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[] {})); - CarpenterLoader.removeCarpenterRecipe( - ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.INTRICATE, null, new ICircuit[] {})); - CarpenterLoader.removeCarpenterRecipe(Mods.Forestry.getItem("soldering_iron")); - - RecipeManagers.carpenterManager.addRecipe( - 40, Materials.Water.getFluid(1000), - ItemStack.EMPTY, Mods.Forestry.getItem("soldering_iron"), - " I ", "I I", " B", - 'I', new UnificationEntry(plate, Materials.Iron).toString(), - 'B', new UnificationEntry(plate, Materials.Bronze).toString()); - - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, Materials.Iron, 3) - .input(plate, Materials.Bronze) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(Mods.Forestry.getItem("soldering_iron")) - .EUt(40).duration(FFMUtility.timeCarpenter(40)).buildAndRegister(); - } - - private static void Mail() { - if (!Mods.ForestryMail.isModLoaded()) return; - - Material[] matStamp = { Materials.Apatite, Materials.Copper, Materials.Tin, Materials.Gold }; - - for (int i = 0; i < matStamp.length; i++) { - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(matStamp[i] == Materials.Apatite ? gem : plate, matStamp[i], 3) - .inputs(new ItemStack(Items.PAPER, 3)) - .fluidInputs(Materials.SeedOil.getFluid(300)) - .outputs(Mods.Forestry.getItem("stamps", 1, i)) - .EUt(10).duration(FFMUtility.timeCarpenter(10)).buildAndRegister(); - } - } - - private static void LepidopterologyHard() { - if (!Mods.ForestryLepidopterology.isModLoaded()) return; - // Lepidoptetist's Chest - ModHandler.removeRecipeByName(Mods.Forestry.getResource("butterfly_chest")); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(screw, Materials.Steel, 2) - .input("blockGlass") - .inputs(GTUtility.copy(5, ModuleLepidopterology.getItems().butterflyGE.getWildcard())) - .input("chestWood") - .fluidInputs(Materials.SeedOil.getFluid(1000)) - .outputs(Mods.Forestry.getItem("butterfly_chest")) - .EUt(60).duration(FFMUtility.timeCarpenter(60)).buildAndRegister(); - - if (Mods.ForestryFactory.isModLoaded()) { - RecipeManagers.carpenterManager.addRecipe( - 60, Materials.SeedOil.getFluid(1000), - ItemStack.EMPTY, Mods.Forestry.getItem("butterfly_chest"), - "SGS", "BCB", "BBB", - 'S', new UnificationEntry(screw, Materials.Steel).toString(), - 'G', "blockGlass", - 'C', "chestWood", - 'B', ModuleLepidopterology.getItems().butterflyGE.getWildcard()); - } - } - - private static void Storage() { - if (Mods.ForestryBackpacks.isModLoaded()) { - ItemStack[] backStack = { Mods.Forestry.getItem("miner_bag"), - Mods.Forestry.getItem("digger_bag"), - Mods.Forestry.getItem("forester_bag"), - Mods.Forestry.getItem("hunter_bag"), - Mods.Forestry.getItem("adventurer_bag"), - Mods.Forestry.getItem("builder_bag") }; - ItemStack[] backStackT2 = { Mods.Forestry.getItem("miner_bag_t2"), - Mods.Forestry.getItem("digger_bag_t2"), - Mods.Forestry.getItem("forester_bag_t2"), - Mods.Forestry.getItem("hunter_bag_t2"), - Mods.Forestry.getItem("adventurer_bag_t2"), - Mods.Forestry.getItem("builder_bag_t2") }; - - for (int i = 0; i < backStack.length; i++) { - - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(gem, Materials.Diamond) - .inputNBT(backStack[i].getItem(), NBTMatcher.ANY, NBTCondition.ANY) - .inputs(Mods.Forestry.getItem("crafting_material", 7, 3)) - .fluidInputs(Materials.Water.getFluid(1000)) - .outputs(backStackT2[i]) - .EUt(200).duration(FFMUtility.timeCarpenter(200)).buildAndRegister(); - } - } - if (Mods.ForestryCrate.isModLoaded()) { - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input("logWood", 4) - .fluidInputs(Materials.Water.getFluid(1000)) - .circuitMeta(10) - .outputs(Mods.Forestry.getItem("crate")) - .EUt(20).duration(FFMUtility.timeCarpenter(20)).buildAndRegister(); - } - } - - public static void registerCarpenterRecipe(Enum recipeMode, ItemStack output, int EUt, Material material, - MetaItem.MetaValueItem broad, String... circuit) { - if (recipeMode == FFMUtility.recipeMode.NORMAL) { - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .input(plate, material, 6) - .input(plate, Materials.RedAlloy, 2) - .input(broad) - .outputs(output) - .EUt(EUt).duration(FFMUtility.timeCarpenter(EUt)).buildAndRegister(); - RecipeManagers.carpenterManager.addRecipe( - EUt, Materials.SolderingAlloy.getFluid(72), - ItemStack.EMPTY, output, - "STS", "SBS", "STS", - 'S', new UnificationEntry(plate, material).toString(), - 'T', new UnificationEntry(plate, Materials.RedAlloy).toString(), - 'B', broad.getStackForm()); - RecipeManagers.carpenterManager.addRecipe( - EUt, Materials.Tin.getFluid(144), - ItemStack.EMPTY, output, - "STS", "SBS", "STS", - 'S', new UnificationEntry(plate, material).toString(), - 'T', new UnificationEntry(plate, Materials.RedAlloy).toString(), - 'B', broad.getStackForm()); - - } else if (recipeMode == FFMUtility.recipeMode.HARD) { - if (circuit.length >= 2) { - GTELog.logger.error("Circuit recipe for " + output.getDisplayName() + " has more than one circuit."); - return; - } - - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .input(screw, material, 4) - .input(foil, material, 2) - .input(wireFine, material) - .input(circuit[0], 2) - .input(broad) - .outputs(output) - .EUt(EUt).duration(FFMUtility.timeCarpenter(EUt)).buildAndRegister(); - RecipeManagers.carpenterManager.addRecipe( - EUt, Materials.SolderingAlloy.getFluid(72), - broad.getStackForm(), output, - "SFS", "CWC", "SFS", - 'S', new UnificationEntry(screw, material).toString(), - 'F', new UnificationEntry(foil, material).toString(), - 'C', circuit[0], - 'W', new UnificationEntry(wireFine, material).toString()); - RecipeManagers.carpenterManager.addRecipe( - EUt, Materials.Tin.getFluid(72), - broad.getStackForm(), output, - "SFS", "CWC", "SFS", - 'S', new UnificationEntry(screw, material).toString(), - 'F', new UnificationEntry(foil, material).toString(), - 'C', circuit[0], - 'W', new UnificationEntry(wireFine, material).toString()); - } - } - - public static void removeCarpenterRecipe(ItemStack output) { - CarpenterRecipeManager.getRecipes(output).forEach(r -> RecipeManagers.carpenterManager.removeRecipe(r)); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java deleted file mode 100644 index a7b3acf7..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java +++ /dev/null @@ -1,260 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.recipes.machines; - -import static gregtech.api.unification.ore.OrePrefix.*; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.recipes.RecipeBuilder; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.OreDictUnifier; -import gregtech.api.unification.material.Materials; - -import com.github.gtexpert.core.api.util.Mods; - -import forestry.factory.MachineUIDs; -import forestry.factory.ModuleFactory; - -public class CentrifugeLoader { - - public static void init() { - if (!Mods.ForestryApiculture.isModLoaded()) return; - - ItemStack wax = Mods.Forestry.getItem("beeswax"); - ItemStack drop = Mods.Forestry.getItem("honey_drop"); - // Recipe was not added by GTCEu - // GenDustry Section - if (Mods.Gendustry.isModLoaded()) { - for (int i = 10; i < 26; i++) { - registerCombRecipe(Mods.Gendustry.getItem("honey_comb", 1, i), - new ItemStack[] { Mods.Gendustry.getItem("honey_drop", 1, i), wax, drop }, - new int[] { 10000, 5000, 3000 }); - } - } - // If Forestry's Centrifuge is enabled, recipes will be added by GTCEu - if (ModuleFactory.machineEnabled(MachineUIDs.CENTRIFUGE)) return; - // Forestry Section - RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder() - .inputs(Mods.Forestry.getItem("propolis", 1, 3)) - .chancedOutput(Mods.Forestry.getItem("crafting_material", 1, 2), 6000, 0) - .chancedOutput(Mods.Forestry.getItem("propolis"), 1000, 0) - .EUt(5).duration(128).buildAndRegister(); - - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1), - new ItemStack[] { wax, drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 2), - new ItemStack[] { Mods.Forestry.getItem("refractory_wax"), Mods.Forestry.getItem("phosphor", 2) }, - new int[] { 10000, 7000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 3), - new ItemStack[] { Mods.Forestry.getItem("propolis"), drop }, - new int[] { 10000, 4000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 4), - new ItemStack[] { wax, drop, new ItemStack(Items.SNOWBALL), Mods.Forestry.getItem("pollen", 1, 1) }, - new int[] { 8000, 7000, 4000, 2000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 5), - new ItemStack[] { Mods.Forestry.getItem("honeydew"), drop }, - new int[] { 10000, 4000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 6), - new ItemStack[] { drop, Mods.Forestry.getItem("propolis", 1, 3) }, - new int[] { 10000, 8000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 7), - new ItemStack[] { wax, drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 15), - new ItemStack[] { wax, drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(Mods.Forestry.getItem("bee_combs", 1, 16), - new ItemStack[] { Mods.Forestry.getItem("honeydew"), new ItemStack(Items.QUARTZ), drop }, - new int[] { 6000, 3000, 2000 }); - // ExtraBee Section - if (Mods.ExtraBees.isModLoaded()) { - registerCombRecipe(combExtraBee(0), - new ItemStack[] { wax, drop }, - new int[] { 10000, 5000 }); - registerCombRecipe(combExtraBee(1), - new ItemStack[] { new ItemStack(Items.ROTTEN_FLESH), wax, drop }, - new int[] { 8000, 2000, 2000 }); - registerCombRecipe(combExtraBee(2), - new ItemStack[] { new ItemStack(Items.DYE, 1, 15), wax, drop }, - new int[] { 8000, 2000, 2000 }); - registerCombRecipe(combExtraBee(3), - new ItemStack[] { drop, Mods.ExtraBees.getItem("propolis", 1, 1) }, - new int[] { 7500, 600 }); - registerCombRecipe(combExtraBee(4), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Coal), wax, drop }, - new int[] { 10000, 8000, 7500 }); - registerCombRecipe(combExtraBee(6), - new ItemStack[] { Mods.ExtraBees.getItem("propolis"), drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(combExtraBee(7), - new ItemStack[] { Mods.ExtraBees.getItem("honey_drop", 1, 6), drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(combExtraBee(8), - new ItemStack[] { Mods.ExtraBees.getItem("honey_drop", 1, 3), drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(combExtraBee(9), - new ItemStack[] { Mods.ExtraBees.getItem("honey_drop", 1, 7), drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(combExtraBee(10), - new ItemStack[] { Mods.ExtraBees.getItem("honey_drop", 1, 8), drop }, - new int[] { 10000, 9000 }); - registerCombRecipe(combExtraBee(11), - new ItemStack[] { wax, drop }, - new int[] { 5000, 2500 }); - registerCombRecipe(combExtraBee(12), - new ItemStack[] { OreDictUnifier.get(dust, Materials.Redstone), wax, drop }, - new int[] { 10000, 8000, 5000 }); - registerCombRecipe(combExtraBee(14), - new ItemStack[] { Mods.ExtraBees.getItem("honey_drop"), wax, - OreDictUnifier.get(dust, Materials.Redstone) }, - new int[] { 10000, 8000, 7500 }); - registerCombRecipe(combExtraBee(15), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Iron), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(16), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Gold), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(17), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Copper), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(18), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Tin), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(19), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Silver), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(21), - new ItemStack[] { wax, drop }, - new int[] { 5000, 2500 }); - registerCombRecipe(combExtraBee(22), - new ItemStack[] { drop, new ItemStack(Items.CLAY_BALL), wax }, - new int[] { 8000, 8000, 2500 }); - registerCombRecipe(combExtraBee(23), - new ItemStack[] { wax, drop }, - new int[] { 1000, 9000 }); - registerCombRecipe(combExtraBee(24), - new ItemStack[] { new ItemStack(Blocks.BROWN_MUSHROOM_BLOCK), wax, - new ItemStack(Blocks.RED_MUSHROOM_BLOCK) }, - new int[] { 10000, 9000, 7500 }); - registerCombRecipe(combExtraBee(25), - new ItemStack[] { Mods.ExtraBees.getItem("propolis", 1, 7), drop }, - new int[] { 7000, 5000 }); - registerCombRecipe(combExtraBee(27), - new ItemStack[] { wax, OreDictUnifier.get(dust, Materials.Sulfur), - Mods.ExtraBees.getItem("honey_drop", 1, 1) }, - new int[] { 8000, 7500, 5000 }); - registerCombRecipe(combExtraBee(28), - new ItemStack[] { wax, Mods.ExtraBees.getItem("honey_drop", 1, 2) }, - new int[] { 8000, 8000 }); - registerCombRecipe(combExtraBee(29), - new ItemStack[] { wax, new ItemStack(Items.SLIME_BALL), drop }, - new int[] { 10000, 7500, 7500 }); - registerCombRecipe(combExtraBee(30), - new ItemStack[] { new ItemStack(Items.BLAZE_POWDER), wax }, - new int[] { 10000, 7500 }); - registerCombRecipe(combExtraBee(32), - new ItemStack[] { Mods.ExtraBees.getItem("honey_drop", 1, 5), drop }, - new int[] { 8000, 7500 }); - registerCombRecipe(combExtraBee(36), - new ItemStack[] { OreDictUnifier.get(dust, Materials.Obsidian), drop }, - new int[] { 7500, 5000 }); - registerCombRecipe(combExtraBee(37), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Lead), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(40), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Zinc), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(41), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Titanium), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(42), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Tungsten), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(45), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Platinum), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(46), - new ItemStack[] { new ItemStack(Items.DYE, 6, 4), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(48), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Pyrite), - OreDictUnifier.get(dustSmall, Materials.Iron), wax, drop }, - new int[] { 10000, 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(50), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Cinnabar), wax, drop, - OreDictUnifier.get(dust, Materials.Redstone) }, - new int[] { 10000, 5000, 2500, 500 }); - registerCombRecipe(combExtraBee(51), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Sphalerite), - OreDictUnifier.get(dustSmall, Materials.Zinc), wax, drop }, - new int[] { 10000, 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(52), - new ItemStack[] { Mods.ExtraBees.getItem("misc", 1, 2), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(53), - new ItemStack[] { Mods.ExtraBees.getItem("misc", 1, 3), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(54), - new ItemStack[] { Mods.ExtraBees.getItem("misc", 1, 4), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(56), - new ItemStack[] { Mods.ExtraBees.getItem("misc", 1, 1), wax, drop }, - new int[] { 10000, 5000, 2500 }); - - int meta = 13; - for (int i = 57; i < 73; i++) { - registerCombRecipe(combExtraBee(i), - new ItemStack[] { Mods.ExtraBees.getItem("honey_drop", 1, meta), drop, wax }, - new int[] { 10000, 8000, 8000 }); - meta++; - } - registerCombRecipe(combExtraBee(73), - new ItemStack[] { OreDictUnifier.get(dustSmall, Materials.Nickel), wax, drop }, - new int[] { 10000, 5000, 2500 }); - registerCombRecipe(combExtraBee(75), - new ItemStack[] { OreDictUnifier.get(dust, Materials.Glowstone), drop }, - new int[] { 10000, 2500 }); - registerCombRecipe(combExtraBee(76), - new ItemStack[] { OreDictUnifier.get(dust, Materials.Saltpeter), drop }, - new int[] { 10000, 2500 }); - registerCombRecipe(combExtraBee(79), - new ItemStack[] { Mods.Forestry.getItem("fertilizer_bio"), drop }, - new int[] { 10000, 2500 }); - registerCombRecipe(combExtraBee(81), - new ItemStack[] { drop, new ItemStack(Items.QUARTZ), - OreDictUnifier.get(dust, Materials.CertusQuartz) }, - new int[] { 2500, 2500, 2000 }); - registerCombRecipe(combExtraBee(82), - new ItemStack[] { drop, OreDictUnifier.get(dust, Materials.EnderPearl) }, - new int[] { 2500, 2500 }); - } - } - - public static void registerCombRecipe(ItemStack comb, ItemStack[] output, int[] chance) { - RecipeBuilder builder = RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder() - .inputs(comb) - .EUt(5) - .duration(128); - - int outputs = 0; - for (int i = 0; i < output.length; i++) { - if (output[i] == null || output[i] == ItemStack.EMPTY) continue; - if (outputs < RecipeMaps.CENTRIFUGE_RECIPES.getMaxOutputs()) { - if (chance[i] >= 10000) { - builder.outputs(output[i]); - } else { - builder.chancedOutput(output[i], chance[i], 0); - } - outputs++; - } - } - - builder.buildAndRegister(); - } - - public static ItemStack combExtraBee(int meta) { - return Mods.ExtraBees.getItem("honey_comb", 1, meta); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java deleted file mode 100644 index 8308c208..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.github.gtexpert.core.integration.ffm.recipes.machines; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.util.GTUtility; - -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.ffm.FFMUtility; - -import binnie.extratrees.wood.EnumETLog; -import forestry.api.arboriculture.*; - -public class FabricatorLoader { - - public static void init() { - // Fireproof Recipe - if (!Mods.ForestryArboriculture.isModLoaded()) return; - if (!Mods.ForestryApiculture.isModLoaded()) return; - - List allWoodType = new ArrayList<>(); - Collections.addAll(allWoodType, EnumForestryWoodType.VALUES); - Collections.addAll(allWoodType, EnumVanillaWoodType.VALUES); - - for (IWoodType woodType : allWoodType) { - ItemStack planks = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, false); - ItemStack planksFireproof = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, true); - - ItemStack logs = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, false); - ItemStack logsFireproof = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, true); - - registerFireproofPlanksRecipe(planks, planksFireproof); - registerFireproofLogsRecipe(logs, logsFireproof); - } - if (Mods.ExtraTrees.isModLoaded()) { - for (EnumETLog log : EnumETLog.VALUES) { - ItemStack logs = TreeManager.woodAccess.getStack(log, WoodBlockKind.LOG, false); - ItemStack planks = log.getPlank().getStack(false); - - ItemStack logsFireproof = TreeManager.woodAccess.getStack(log, WoodBlockKind.LOG, true); - ItemStack planksFireproof = log.getPlank().getStack(true); - - registerFireproofPlanksRecipe(planks, planksFireproof); - registerFireproofLogsRecipe(logs, logsFireproof); - } - } - } - - public static void registerFireproofPlanksRecipe(ItemStack planks, ItemStack planksFireproof) { - RecipeMaps.CHEMICAL_RECIPES.recipeBuilder() - .inputs(GTUtility.copy(5, planks)) - .inputs(Mods.Forestry.getItem("refractory_wax", 4)) - .fluidInputs(Materials.Glass.getFluid(500)) - .outputs(GTUtility.copy(5, planksFireproof)) - .EUt(10).duration(FFMUtility.timeFabricator(10)).buildAndRegister(); - } - - public static void registerFireproofLogsRecipe(ItemStack logs, ItemStack logsFireproof) { - RecipeMaps.CHEMICAL_RECIPES.recipeBuilder() - .inputs(logs) - .inputs(Mods.Forestry.getItem("refractory_wax", 4)) - .fluidInputs(Materials.Glass.getFluid(500)) - .outputs(logsFireproof) - .EUt(10).duration(FFMUtility.timeFabricator(10)).buildAndRegister(); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java deleted file mode 100644 index b2375add..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry; - -import net.minecraftforge.common.config.Config; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.modules.GTEModules; - -@Config.LangKey(GTEValues.MODID + ".config.integration.gendustry") -@Config(modid = GTEValues.MODID, - name = GTEValues.MODID + "/integration/" + GTEModules.MODULE_GENDUSTRY, - category = "Gendustry") -public class GendustryConfigHolder {} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java deleted file mode 100644 index 7b3ad1a1..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry; - -import net.minecraft.block.Block; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; - -import com.github.gtexpert.core.api.GTEValues; -import com.github.gtexpert.core.api.modules.GTEModule; -import com.github.gtexpert.core.api.util.Mods; -import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; -import com.github.gtexpert.core.integration.gendustry.metatileentities.GendustryMetaTileEntities; -import com.github.gtexpert.core.integration.gendustry.recipes.GendustryBlocksRecipe; -import com.github.gtexpert.core.integration.gendustry.recipes.GendustryItemsRecipe; -import com.github.gtexpert.core.modules.GTEModules; - -@GTEModule( - moduleID = GTEModules.MODULE_GENDUSTRY, - containerID = GTEValues.MODID, - modDependencies = { Mods.Names.FORESTRY, Mods.Names.GENDUSTRY }, - name = "GTExpert Gendustry For Minecraft Integration", - description = "Gendustry Integration Module") -public class GendustryModule extends GTEIntegrationSubmodule { - - @Override - public void registerBlocks(RegistryEvent.Register event) { - GendustryMetaTileEntities.init(); - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - GendustryItemsRecipe.init(); - GendustryBlocksRecipe.init(); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java deleted file mode 100644 index 88fa2b0c..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry; - -import gregtech.api.recipes.RecipeMap; -import gregtech.core.sound.GTSoundEvents; - -import com.github.gtexpert.core.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; -import com.github.gtexpert.core.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; - -import crafttweaker.annotations.ZenRegister; -import stanhebben.zenscript.annotations.ZenExpansion; -import stanhebben.zenscript.annotations.ZenProperty; - -@ZenExpansion("mods.gregtech.recipe.RecipeMaps") -@ZenRegister -public class GendustryRecipeMaps { - - @ZenProperty - public static final RecipeMap INDUSTRIAL_APIARY_RECIPES = new RecipeMapIndustrialApiary<>( - "industrial_apiary", 2, 9, 0, 0, new IndustrialApiaryRecipeBuilder(), false) - .setSound(GTSoundEvents.ARC); -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java deleted file mode 100644 index 3004dfc6..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry.metatileentities; - -import static com.github.gtexpert.core.api.util.GTEUtility.gteId; -import static gregtech.api.GTValues.V; -import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; - -import com.github.gtexpert.core.client.GTETextures; -import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.gendustry.GendustryRecipeMaps; - -public class GendustryMetaTileEntities { - - public static MetaTileEntityIndustrialApiary[] INDUSTRIAL_APIARY = new MetaTileEntityIndustrialApiary[V.length - 1]; - - public static void init() { - // INDUSTRIAL_APIARY 20000~20012 - // TODO: IDの変更 - - if (GTEConfigHolder.gteFlag.featureFlag) { - registerMetaTileEntities(INDUSTRIAL_APIARY, 20000, "industrial_apiary", - (tier, voltageName) -> new MetaTileEntityIndustrialApiary( - gteId(String.format("%s.%s", "industrial_apiary", voltageName)), - GendustryRecipeMaps.INDUSTRIAL_APIARY_RECIPES, - GTETextures.INDUSTRIAL_APIARY_OVERLAY, - tier, false, null)); - } - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java deleted file mode 100644 index 71104052..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry.metatileentities; - -import java.util.function.Supplier; - -import org.jetbrains.annotations.NotNull; - -import gregtech.api.capability.IEnergyContainer; -import gregtech.api.capability.impl.RecipeLogicEnergy; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.recipes.RecipeMap; - -public class IndustrialApiaryLogic extends RecipeLogicEnergy { - - public IndustrialApiaryLogic(@NotNull MetaTileEntity metaTileEntity, RecipeMap recipeMap, - Supplier energyContainer) { - super(metaTileEntity, recipeMap, energyContainer); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java deleted file mode 100644 index e7a4944a..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry.metatileentities; - -import java.util.function.Function; - -import net.minecraft.util.ResourceLocation; - -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; -import gregtech.api.recipes.RecipeMap; -import gregtech.client.renderer.ICubeRenderer; - -import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; - -public class MetaTileEntityIndustrialApiary extends GTESimpleMachineMetaTileEntity { - - public MetaTileEntityIndustrialApiary(ResourceLocation metaTileEntityId, RecipeMap recipeMap, - ICubeRenderer renderer, int tier, boolean hasFrontFacing, - Function tankScalingFunction) { - super(metaTileEntityId, recipeMap, renderer, tier, hasFrontFacing, tankScalingFunction); - } - - @Override - public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityIndustrialApiary(metaTileEntityId, workable.getRecipeMap(), renderer, getTier(), - hasFrontFacing(), getTankScalingFunction()); - } - - private IndustrialApiaryLogic getLogic() { - return (IndustrialApiaryLogic) workable; - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java deleted file mode 100644 index 39521c41..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry.recipes; - -public class GendustryBlocksRecipe { - - public static void init() {} -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java deleted file mode 100644 index ab0c124c..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry.recipes; - -public class GendustryItemsRecipe { - - public static void init() {} -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java deleted file mode 100644 index 64361200..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry.recipes.builders; - -import org.jetbrains.annotations.NotNull; - -import gregtech.api.recipes.Recipe; -import gregtech.api.recipes.RecipeBuilder; -import gregtech.api.recipes.RecipeMap; - -public class IndustrialApiaryRecipeBuilder extends RecipeBuilder { - - private boolean generatingRecipes = true; - - public IndustrialApiaryRecipeBuilder() {} - - @SuppressWarnings("unused") - public IndustrialApiaryRecipeBuilder(Recipe recipe, RecipeMap recipeMap) { - super(recipe, recipeMap); - } - - public IndustrialApiaryRecipeBuilder(@NotNull IndustrialApiaryRecipeBuilder builder) { - super(builder); - this.generatingRecipes = builder.generatingRecipes; - } - - @Override - public IndustrialApiaryRecipeBuilder copy() { - return new IndustrialApiaryRecipeBuilder(this); - } -} diff --git a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java deleted file mode 100644 index e52e11d2..00000000 --- a/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.gtexpert.core.integration.gendustry.recipes.machines; - -import gregtech.api.recipes.RecipeBuilder; -import gregtech.api.recipes.RecipeMap; - -public class RecipeMapIndustrialApiary> extends RecipeMap { - - public RecipeMapIndustrialApiary(String unlocalizedName, int maxInputs, int maxOutputs, - int maxFluidInputs, int maxFluidOutputs, R defaultRecipe, boolean isHidden) { - super(unlocalizedName, maxInputs, maxOutputs, maxFluidInputs, maxFluidOutputs, defaultRecipe, isHidden); - } -}