Merge branch 'main' into gregificationMultiFarm

Author: MrKono

CHANGELOG.md

@@ -1,3 +1,13 @@
+# v1.2.0
+- Add Forestry Multifarm support for GregTech/GTFO saplings and GT fertilizer [#11](https://github.com/GTModpackTeam/GTBeesMatrix/pull/11)
+
+* * *
+
+# v1.1.1
+- Fix recipe conflict with GTFO [#8](https://github.com/GTModpackTeam/GTBeesMatrix/pull/8)
+
+* * *
+
 # v1.1.0
 - Addition of items that can be changed in cfg. [#7](https://github.com/GTModpackTeam/GTBeesMatrix/pull/7)
 

buildscript.properties

@@ -7,7 +7,7 @@ modGroup = com.github.gtexpert.gtbm
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 1.1.1-beta
+modVersion = 1.2.0-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true

dependencies.gradle

@@ -96,6 +96,7 @@ dependencies {
     }
 
     // Debug GTFO: 1.12.5
+    compileOnly rfg.deobf("curse.maven:gregtech-food-option-477021:6472136")
     if (project.debug_all.toBoolean() || project.debug_gtfo.toBoolean()) {
         runtimeOnly rfg.deobf("curse.maven:gregtech-food-option-477021:6472136")
     }

src/main/java/com/github/gtexpert/gtbm/integration/forestry/ForestryModule.java

@@ -8,6 +8,7 @@
 import com.github.gtexpert.gtbm.api.modules.TModule;
 import com.github.gtexpert.gtbm.api.util.Mods;
 import com.github.gtexpert.gtbm.integration.GTBMIntegrationSubmodule;
+import com.github.gtexpert.gtbm.integration.forestry.loaders.FFMFarmingLoader;
 import com.github.gtexpert.gtbm.integration.forestry.loaders.FFMOreDictionaryLoader;
 import com.github.gtexpert.gtbm.integration.forestry.recipes.*;
 import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.*;
@@ -29,6 +30,8 @@ public void postInit(FMLPostInitializationEvent event) {
         FFMToolRecipe.init();
         FFMCraftingRecipe.init();
 
+        FFMFarmingLoader.init();
+
         CarpenterLoader.initBase();
         CarpenterLoader.initMode();
         CentrifugeLoader.init();

src/main/java/com/github/gtexpert/gtbm/integration/forestry/loaders/FFMFarmingLoader.java

@@ -0,0 +1,24 @@
+package com.github.gtexpert.gtbm.integration.forestry.loaders;
+
+import net.minecraft.item.ItemStack;
+
+import gregtech.common.blocks.MetaBlocks;
+import gregtech.common.items.MetaItems;
+
+import forestry.api.core.ForestryAPI;
+import forestry.api.farming.IFarmRegistry;
+import forestry.farming.logic.farmables.FarmableSapling;
+
+public class FFMFarmingLoader {
+
+    public static void init() {
+        IFarmRegistry farmRegistry = ForestryAPI.farmRegistry;
+
+        // GregTech Rubber Sapling
+        farmRegistry.registerFarmables("farmArboreal",
+                new FarmableSapling(new ItemStack(MetaBlocks.RUBBER_SAPLING), new ItemStack[0]));
+
+        // GregTech Fertilizer
+        farmRegistry.registerFertilizer(MetaItems.FERTILIZER.getStackForm(), 500);
+    }
+}

src/main/java/com/github/gtexpert/gtbm/integration/forestry/recipes/FFMMaterialsRecipe.java

@@ -1,6 +1,15 @@
 package com.github.gtexpert.gtbm.integration.forestry.recipes;
 
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+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.Materials;
+import gregtech.api.unification.ore.OrePrefix;
+import gregtech.common.items.MetaItems;
 
 import com.github.gtexpert.gtbm.api.util.Mods;
 
@@ -49,6 +58,23 @@ public static void materialsCore() {
 
         // Apatite Block
         ModHandler.removeRecipeByName(Mods.Forestry.getResource("apatite_block"));
+
+        // Remove GT Fertilizer -> Forestry fertilizer_compound bulk recipes
+        GTRecipeHandler.removeRecipesByInputs(RecipeMaps.MIXER_RECIPES,
+                new ItemStack[] {
+                        MetaItems.FERTILIZER.getStackForm(8),
+                        OreDictUnifier.get(OrePrefix.dust, Materials.Apatite)
+                },
+                new FluidStack[] { Materials.Water.getFluid(1000) });
+
+        if (Mods.MagicBees.isModLoaded()) {
+            GTRecipeHandler.removeRecipesByInputs(RecipeMaps.MIXER_RECIPES,
+                    new ItemStack[] {
+                            MetaItems.FERTILIZER.getStackForm(8),
+                            Mods.MagicBees.getItem("resource", 1, 2)
+                    },
+                    new FluidStack[] { Materials.Water.getFluid(1000) });
+        }
     }
 
     public static void materialCharcoal() {

src/main/java/com/github/gtexpert/gtbm/integration/gtfo/GTFOModule.java

@@ -2,11 +2,13 @@
 
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 
 import com.github.gtexpert.gtbm.api.ModValues;
 import com.github.gtexpert.gtbm.api.modules.TModule;
 import com.github.gtexpert.gtbm.api.util.Mods;
 import com.github.gtexpert.gtbm.integration.GTBMIntegrationSubmodule;
+import com.github.gtexpert.gtbm.integration.gtfo.loaders.GTFOFarmingLoader;
 import com.github.gtexpert.gtbm.integration.gtfo.recipes.GTFOOverrideRecipe;
 import com.github.gtexpert.gtbm.module.Modules;
 
@@ -18,6 +20,12 @@
          description = "Gregtech Food Option Integration Module")
 public class GTFOModule extends GTBMIntegrationSubmodule {
 
+    @Override
+    public void postInit(FMLPostInitializationEvent event) {
+        if (Mods.Forestry.isModLoaded())
+            GTFOFarmingLoader.init();
+    }
+
     @Override
     public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
         GTFOOverrideRecipe.init();

src/main/java/com/github/gtexpert/gtbm/integration/gtfo/loaders/GTFOFarmingLoader.java

@@ -0,0 +1,31 @@
+package com.github.gtexpert.gtbm.integration.gtfo.loaders;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
+import forestry.api.core.ForestryAPI;
+import forestry.api.farming.IFarmRegistry;
+import forestry.farming.logic.farmables.FarmableSapling;
+
+public class GTFOFarmingLoader {
+
+    @SuppressWarnings("unchecked")
+    public static void init() {
+        IFarmRegistry farmRegistry = ForestryAPI.farmRegistry;
+        try {
+            Class<?> metaBlocksClass = Class.forName("gregtechfoodoption.block.GTFOMetaBlocks");
+            Field saplingsField = metaBlocksClass.getField("GTFO_SAPLINGS");
+            List<Block> saplings = (List<Block>) saplingsField.get(null);
+            for (Block sapling : saplings) {
+                farmRegistry.registerFarmables("farmArboreal",
+                        new FarmableSapling(new ItemStack(sapling), new ItemStack[0]));
+            }
+        } catch (ReflectiveOperationException e) {
+            com.github.gtexpert.gtbm.api.util.ModLog.logger.error("Failed to register GTFO saplings with Forestry farm",
+                    e);
+        }
+    }
+}

src/main/java/com/github/gtexpert/gtbm/mixins/GTBMMixinLoader.java

@@ -5,10 +5,10 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.ImmutableMap;
-
 import net.minecraftforge.fml.common.Loader;
 
+import com.google.common.collect.ImmutableMap;
+
 import com.github.gtexpert.gtbm.api.ModValues;
 import com.github.gtexpert.gtbm.api.util.ModLog;
 import com.github.gtexpert.gtbm.api.util.Mods;