Industrial Apiary

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.3.0
+- Add Industrial Apiary [#13](https://github.com/GTModpackTeam/GTBeesMatrix/pull/13)
+    - Please report any unusual behavior. However, please note that the UI being null is by design.
+
+* * *
+
 # v1.2.0
 - Add Forestry Multifarm support for GregTech/GTFO saplings and GT fertilizer [#11](https://github.com/GTModpackTeam/GTBeesMatrix/pull/11)
 

dependencies.gradle

@@ -74,9 +74,9 @@ dependencies {
     }
 
     // Debug Binnies
-    compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
+    compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:7731146") // Binnie's Mods Patched 2.5.1.213
     if (project.debug_all.toBoolean() || project.debug_binnies.toBoolean()) {
-        runtimeOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
+        runtimeOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:7731146") // Binnie's Mods Patched 2.5.1.213
     }
 
     // Debug EnderIO

src/main/java/com/github/gtexpert/gtbm/api/gui/GTBMGuiTextures.java

@@ -1,5 +1,7 @@
 package com.github.gtexpert.gtbm.api.gui;
 
+import net.minecraft.util.ResourceLocation;
+
 import gregtech.api.gui.resources.TextureArea;
 
 public class GTBMGuiTextures {
@@ -14,4 +16,16 @@ public class GTBMGuiTextures {
             .fullImage("textures/gui/icon/gtbm_logo_blinking_yellow.png");
     public static final TextureArea GTBM_LOGO_BLINKING_RED = TextureArea
             .fullImage("textures/gui/icon/gtbm_logo_blinking_red.png");
+
+    // Bee status icon (from JEI)
+    public static final TextureArea BEE_INFO_ICON = new TextureArea(
+            new ResourceLocation("jei", "textures/gui/icons/info.png"), 0, 0, 1, 1);
+
+    // Bee slot overlays (directly from Gendustry's hint icons)
+    public static final TextureArea QUEEN_OVERLAY = new TextureArea(
+            new ResourceLocation("gendustry", "textures/items/hints/queen.png"), 0, 0, 1, 1);
+    public static final TextureArea DRONE_OVERLAY = new TextureArea(
+            new ResourceLocation("gendustry", "textures/items/hints/drone.png"), 0, 0, 1, 1);
+    public static final TextureArea UPGRADE_OVERLAY = new TextureArea(
+            new ResourceLocation("gendustry", "textures/items/hints/upgrade.png"), 0, 0, 1, 1);
 }

src/main/java/com/github/gtexpert/gtbm/integration/binnies/botany/recipes/BotanyItemsRecipe.java

@@ -9,23 +9,23 @@
 
 import com.github.gtexpert.gtbm.api.util.Mods;
 import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
-import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
 import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
+import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
 
 import forestry.api.recipes.RecipeManagers;
 
 public class BotanyItemsRecipe {
 
     public static void init() {
-        Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
+        Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
                 .safeValueOf(ForestryConfigHolder.gameMode);
 
         // Botanist Database
         ModHandler.addShapelessNBTClearingRecipe("botanist_database_nbt",
                 Mods.Botany.getItem("database"),
                 Mods.Botany.getItem("database"));
 
-        if (recipeMode == ForestryUtility.recipeMode.HARD) {
+        if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
             // Botanist Database
             CarpenterLoader.removeCarpenterRecipe(Mods.Botany.getItem("database"));
             RecipeManagers.carpenterManager.addRecipe(

src/main/java/com/github/gtexpert/gtbm/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java

@@ -9,23 +9,23 @@
 
 import com.github.gtexpert.gtbm.api.util.Mods;
 import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
-import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
 import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
+import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
 
 import forestry.api.recipes.RecipeManagers;
 
 public class ExtraBeesItemsRecipe {
 
     public static void init() {
-        Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
+        Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
                 .safeValueOf(ForestryConfigHolder.gameMode);
 
         // Apiarist Database
         ModHandler.addShapelessNBTClearingRecipe("apiarist_database_nbt",
                 Mods.ExtraBees.getItem("dictionary"),
                 Mods.ExtraBees.getItem("dictionary"));
 
-        if (recipeMode == ForestryUtility.recipeMode.HARD) {
+        if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
             // Apiarist Database
             CarpenterLoader.removeCarpenterRecipe(Mods.ExtraBees.getItem("dictionary"));
             RecipeManagers.carpenterManager.addRecipe(

src/main/java/com/github/gtexpert/gtbm/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java

@@ -9,15 +9,15 @@
 
 import com.github.gtexpert.gtbm.api.util.Mods;
 import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
-import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
 import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
+import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
 
 import forestry.api.recipes.RecipeManagers;
 
 public class ExtraTreesItemsRecipe {
 
     public static void init() {
-        Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
+        Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
                 .safeValueOf(ForestryConfigHolder.gameMode);
 
         // Arborist Database
@@ -30,7 +30,7 @@ public static void init() {
                 Mods.ExtraTrees.getItem("databaselepi"),
                 Mods.ExtraTrees.getItem("databaselepi"));
 
-        if (recipeMode == ForestryUtility.recipeMode.HARD) {
+        if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
             // Arborist Database
             CarpenterLoader.removeCarpenterRecipe(Mods.ExtraTrees.getItem("databasetree"));
             RecipeManagers.carpenterManager.addRecipe(

src/main/java/com/github/gtexpert/gtbm/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java

@@ -17,31 +17,31 @@
 import com.github.gtexpert.gtbm.api.util.ModUtility;
 import com.github.gtexpert.gtbm.api.util.Mods;
 import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
-import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
 import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
+import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
 
 import forestry.api.recipes.RecipeManagers;
 
 public class GeneticsItemsRecipe {
 
     public static void init() {
-        Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
+        Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
                 .safeValueOf(ForestryConfigHolder.gameMode);
 
         // Gene Database
         ModHandler.addShapelessNBTClearingRecipe("gene_database_nbt",
                 Mods.Genetics.getItem("geneticdatabase"),
                 Mods.Genetics.getItem("geneticdatabase"));
 
-        if (recipeMode == ForestryUtility.recipeMode.HARD) {
+        if (recipeMode == ForestryRecipeHelper.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(ForestryUtility.timeCarpenter(75)).buildAndRegister();
+                    .EUt(VA[MV]).duration(ForestryRecipeHelper.timeCarpenter(75)).buildAndRegister();
             RecipeManagers.carpenterManager.addRecipe(
                     75, Materials.Water.getFluid(5000),
                     ItemStack.EMPTY, Mods.Genetics.getItem("misc"),

src/main/java/com/github/gtexpert/gtbm/integration/binnies/recipes/BinniesItemsRecipe.java

@@ -5,17 +5,17 @@
 
 import com.github.gtexpert.gtbm.api.util.Mods;
 import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
-import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
+import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
 
 import forestry.api.recipes.RecipeManagers;
 
 public class BinniesItemsRecipe {
 
     public static void init() {
-        Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
+        Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
                 .safeValueOf(ForestryConfigHolder.gameMode);
 
-        if (recipeMode == ForestryUtility.recipeMode.HARD) {
+        if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
             // Registry
             ModHandler.removeRecipeByName(Mods.Genetics.getResource("registry"));
             RecipeManagers.carpenterManager.addRecipe(

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

@@ -16,15 +16,16 @@ public class ForestryConfigHolder {
             "valid: [NORMAL, HARD]" })
     public static String gameMode = "NORMAL";
 
-    @Config.Comment({ "If true, each will be uncraftable.", "default: false" })
-    public static boolean Still = false,
-            Fabricator = false,
-            Centrifuge = false,
-            Bottler = false,
-            Fermenter = false,
-            Rainmaker = false,
-            Carpenter = false,
-            Moistener = false,
-            Raintank = false,
-            Squeezer = false;
+    @Config.Comment({ "If true, each will be uncraftable.", "default: true" })
+    public static boolean still = true,
+            fabricator = true,
+            centrifuge = true,
+            bottler = true,
+            fermenter = true,
+            rainmaker = true,
+            carpenter = true,
+            moistener = true,
+            raintank = true,
+            squeezer = true,
+            farmBlock = true;
 }

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

@@ -12,6 +12,7 @@
 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.*;
+import com.github.gtexpert.gtbm.integration.forestry.util.BeeHousingInfoProvider;
 import com.github.gtexpert.gtbm.module.Modules;
 
 @TModule(
@@ -36,6 +37,11 @@ public void postInit(FMLPostInitializationEvent event) {
         CarpenterLoader.initMode();
         CentrifugeLoader.init();
         FabricatorLoader.init();
+
+        // Register TOP provider for bee housing health display
+        if (Mods.TheOneProbe.isModLoaded()) {
+            mcjty.theoneprobe.TheOneProbe.theOneProbeImp.registerProvider(new BeeHousingInfoProvider());
+        }
     }
 
     @Override

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

@@ -1,7 +1,7 @@
 package com.github.gtexpert.gtbm.integration.forestry.recipes;
 
-import static com.github.gtexpert.gtbm.integration.forestry.ForestryUtility.feToEu;
-import static com.github.gtexpert.gtbm.integration.forestry.ForestryUtility.timeCarpenter;
+import static com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper.feToEu;
+import static com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper.timeCarpenter;
 import static forestry.farming.ModuleFarming.getBlocks;
 import static gregtech.api.unification.ore.OrePrefix.*;
 
@@ -19,6 +19,7 @@
 import gregtech.common.items.MetaItems;
 
 import com.github.gtexpert.gtbm.api.util.Mods;
+import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
 
 import forestry.core.ModuleCore;
 import forestry.core.items.EnumElectronTube;
@@ -69,6 +70,8 @@ public static void blockCharcoal() {
     }
 
     public static void farm() {
+        if (!ForestryConfigHolder.farmBlock) return;
+
         BlockRegistryFarming blocks = getBlocks();
 
         ItemStack basic = blocks.farm.get(EnumFarmBlockType.PLAIN, 1);

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

@@ -23,17 +23,17 @@ public static void init() {
 
     public static void recipeRemoval() {
         Map<Supplier<Boolean>, String> recipes = new HashMap<>();
-        recipes.put(() -> ForestryConfigHolder.Still, "still");
-        recipes.put(() -> ForestryConfigHolder.Fabricator, "fabricator");
-        recipes.put(() -> ForestryConfigHolder.Centrifuge, "centrifuge");
-        recipes.put(() -> ForestryConfigHolder.Bottler, "bottler");
-        recipes.put(() -> ForestryConfigHolder.Fermenter, "fermenter");
-        recipes.put(() -> ForestryConfigHolder.Rainmaker, "Rainmaker");
-        recipes.put(() -> ForestryConfigHolder.Carpenter, "carpenter");
-        recipes.put(() -> ForestryConfigHolder.Moistener, "moistener");
-        recipes.put(() -> ForestryConfigHolder.Raintank, "raintank");
-        recipes.put(() -> ForestryConfigHolder.Squeezer, "squeezer");
-        recipes.put(() -> ForestryConfigHolder.Fermenter, "fermenter");
+        recipes.put(() -> ForestryConfigHolder.still, "still");
+        recipes.put(() -> ForestryConfigHolder.fabricator, "fabricator");
+        recipes.put(() -> ForestryConfigHolder.centrifuge, "centrifuge");
+        recipes.put(() -> ForestryConfigHolder.bottler, "bottler");
+        recipes.put(() -> ForestryConfigHolder.fermenter, "fermenter");
+        recipes.put(() -> ForestryConfigHolder.rainmaker, "Rainmaker");
+        recipes.put(() -> ForestryConfigHolder.carpenter, "carpenter");
+        recipes.put(() -> ForestryConfigHolder.moistener, "moistener");
+        recipes.put(() -> ForestryConfigHolder.raintank, "raintank");
+        recipes.put(() -> ForestryConfigHolder.squeezer, "squeezer");
+        recipes.put(() -> ForestryConfigHolder.fermenter, "fermenter");
 
         recipes.forEach((config, name) -> {
             if (config.get()) {