From 5497075f54732ccf3c7580fe311a2327ebb05cb2 Mon Sep 17 00:00:00 2001
From: Abdiel Kavash <19243993+AbdielKavash@users.noreply.github.com>
Date: Wed, 28 Feb 2024 05:45:44 -0600
Subject: Tree Growth Simulator can now harvest leaves and fruits, using
 appropriate tools. (#839)

* TGS logic rework and new outputs

* TGS logic rework and new outputs

* NEI frontend.

* NEI frontend part 2

* Recover saws from controller slot to input bus.

* Added documentation and removed unused stuff.

* Recipes for non-Forestry trees.

* Updated tooltip.

* Better handling of saws in controller slot from previous versions + grafter support.

* Added Forestry and Extra Trees trees registration and processing.

* BS + deps.

* Disable ME stocking bus to fix an exploit.

* Fixes based on feedback.

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../java/gtPlusPlus/xmod/forestry/HANDLER_FR.java  | 57 ----------------------
 1 file changed, 57 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/forestry')

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
index 80d1620f02..a1b96d0f2f 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -1,22 +1,10 @@
 package gtPlusPlus.xmod.forestry;
 
-import static gregtech.api.enums.Mods.ExtraTrees;
 import static gregtech.api.enums.Mods.Forestry;
 
-import net.minecraft.item.ItemStack;
-
-import binnie.extratrees.genetics.ExtraTreeSpecies;
-import cpw.mods.fml.common.Optional;
-import forestry.api.arboriculture.EnumGermlingType;
-import forestry.api.arboriculture.EnumWoodType;
-import forestry.api.arboriculture.TreeManager;
-import forestry.arboriculture.genetics.TreeDefinition;
-import gregtech.api.enums.Mods;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
 import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm;
 
 public class HANDLER_FR {
 
@@ -30,51 +18,6 @@ public class HANDLER_FR {
         if (Forestry.isModLoaded()) {
             FR_Gregtech_Recipes.registerItems();
             new GTPP_Bees();
-            mapForestrySaplingToLog();
-        }
-
-        if (ExtraTrees.isModLoaded()) {
-            mapExtraTreesSaplingToLog();
-        }
-    }
-
-    @Optional.Method(modid = Mods.Names.FORESTRY)
-    private static void mapForestrySaplingToLog() {
-        for (TreeDefinition value : TreeDefinition.values()) {
-            ItemStack aSaplingStack = value.getMemberStack(EnumGermlingType.SAPLING);
-            EnumWoodType woodType = ReflectionUtils.getField(value, "woodType");
-            ItemStack aLog;
-            if (woodType != null) {
-                aLog = TreeManager.woodItemAccess.getLog(woodType, false);
-
-                GregtechMetaTileEntityTreeFarm.sLogCache.put(value.getUID(), aLog);
-                GregtechMetaTileEntityTreeFarm.sLogCache
-                        .put(value.getUID() + "fireproof", TreeManager.woodItemAccess.getLog(woodType, true));
-            } else {
-                aLog = ReflectionUtils.getField(value, "vanillaWood");
-
-                GregtechMetaTileEntityTreeFarm.sLogCache
-                        .put(value.getUID(), ReflectionUtils.getField(value, "vanillaWood"));
-            }
-
-            GregtechMetaTileEntityTreeFarm.addFakeRecipeToNEI(aSaplingStack, aLog);
-        }
-    }
-
-    @Optional.Method(modid = Mods.Names.EXTRA_TREES)
-    private static void mapExtraTreesSaplingToLog() {
-        for (ExtraTreeSpecies value : ExtraTreeSpecies.values()) {
-            ItemStack aSaplingStack = TreeManager.treeRoot
-                    .getMemberStack(TreeManager.treeRoot.templateAsIndividual(value.getTemplate()), 0);
-            ItemStack aLog = null;
-            if (value.getLog() != null) {
-                aLog = value.getLog().getItemStack();
-
-                GregtechMetaTileEntityTreeFarm.sLogCache.put(value.getUID(), aLog);
-                GregtechMetaTileEntityTreeFarm.sLogCache.put(value.getUID() + "fireproof", aLog);
-            }
-
-            GregtechMetaTileEntityTreeFarm.addFakeRecipeToNEI(aSaplingStack, aLog);
         }
     }
 }
-- 
cgit