FFM連携強化と細やかなリファクタ

Author: tier940

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

@@ -17,7 +17,7 @@ public class GTBMGuiTextures {
     public static final TextureArea GTBM_LOGO_BLINKING_RED = TextureArea
             .fullImage("textures/gui/icon/gtbm_logo_blinking_red.png");
 
-    // Bee status icon (from JEI)
+    // Bee status icon (directly from JEI's hint icons)
     public static final TextureArea BEE_INFO_ICON = new TextureArea(
             new ResourceLocation("jei", "textures/gui/icons/info.png"), 0, 0, 1, 1);
 

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

@@ -12,7 +12,6 @@
 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(
@@ -37,11 +36,6 @@ 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/farming/FarmableGTCEuSapling.java

@@ -12,14 +12,13 @@
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import forestry.api.farming.ICrop;
 import forestry.api.farming.IFarmable;
 import forestry.api.farming.IFarmableInfo;
-import forestry.core.network.packets.PacketFXSignal;
-import forestry.core.utils.NetworkUtil;
 import forestry.farming.logic.crops.CropDestroy;
 
 public class FarmableGTCEuSapling implements IFarmable {
@@ -79,10 +78,8 @@ public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World wor
             EnumActionResult result = copy.onItemUse(player, world, pos.down(),
                     EnumHand.MAIN_HAND, EnumFacing.UP, 0, 0, 0);
             if (result == EnumActionResult.SUCCESS) {
-                PacketFXSignal packet = new PacketFXSignal(
-                        PacketFXSignal.SoundFXType.BLOCK_PLACE, pos,
-                        Blocks.SAPLING.getDefaultState());
-                NetworkUtil.sendNetworkPacket(packet, pos, world);
+                world.playSound(null, pos, Blocks.SAPLING.getSoundType().getPlaceSound(),
+                        SoundCategory.BLOCKS, 1.0F, 1.0F);
                 return true;
             }
             return false;

src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/ForestryBeeHelper.java

@@ -1,13 +1,19 @@
 package com.github.gtexpert.gtbm.integration.forestry.util;
 
+import forestry.apiculture.ModuleApiculture;
+
 /**
  * Utilities for Forestry bee work cycle timing and display.
  */
 public class ForestryBeeHelper {
 
-    /** Get ticks per bee work cycle from Forestry config. Default 550. */
+    /**
+     * Returns ticks per bee work cycle from Forestry's config.
+     * Uses {@link ModuleApiculture#ticksPerBeeWorkCycle} (default 550,
+     * configured via "beekeeping.ticks.work" in forestry's config).
+     */
     public static int getTicksPerWorkCycle() {
-        return forestry.apiculture.ModuleApiculture.ticksPerBeeWorkCycle;
+        return ModuleApiculture.ticksPerBeeWorkCycle;
     }
 
     /** Effective ticks per health point, accounting for lifespan modifier. */

src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/ForestryFarmHelper.java

@@ -2,15 +2,17 @@
 
 import java.util.function.BiFunction;
 
+import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
+import com.github.gtexpert.gtbm.api.util.Mods;
+
 import forestry.api.circuits.ChipsetManager;
 import forestry.api.circuits.ICircuitLayout;
 import forestry.api.core.ForestryAPI;
 import forestry.api.farming.IFarmLogic;
 import forestry.api.farming.IFarmProperties;
-import forestry.core.ModuleCore;
 import forestry.core.items.EnumElectronTube;
 import forestry.farming.circuits.CircuitFarmLogic;
 
@@ -20,14 +22,15 @@ public static IFarmProperties registerFarmType(String farmId,
                                                    BiFunction<IFarmProperties, Boolean, IFarmLogic> logicFactory,
                                                    EnumElectronTube tube) {
         IFarmProperties farm = ForestryAPI.farmRegistry.registerLogic(farmId, logicFactory);
-        farm.registerSoil(new ItemStack(Blocks.DIRT), ModuleCore.getBlocks().humus.getDefaultState());
+        farm.registerSoil(new ItemStack(Blocks.DIRT),
+                Block.getBlockFromItem(Mods.Forestry.getItem("humus").getItem()).getDefaultState());
 
         CircuitFarmLogic managed = new CircuitFarmLogic("managed." + farmId, farm, false);
         CircuitFarmLogic manual = new CircuitFarmLogic("manual." + farmId, farm, true);
 
         ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed");
         ICircuitLayout layoutManual = ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual");
-        ItemStack tubeStack = ModuleCore.getItems().tubes.get(tube, 1);
+        ItemStack tubeStack = Mods.Forestry.getItem("thermionic_tubes", 1, tube.ordinal());
 
         ChipsetManager.solderManager.addRecipe(layoutManaged, tubeStack, managed);
         ChipsetManager.solderManager.addRecipe(layoutManual, tubeStack, manual);

src/main/java/com/github/gtexpert/gtbm/integration/gendustry/GendustryConfigHolder.java

@@ -13,4 +13,18 @@ public class GendustryConfigHolder {
 
     @Config.Comment({ "If true, each will be uncraftable.", "default: true" })
     public static boolean industrialApiary = true;
+
+    @Config.Comment("MetaTileEntity ID settings")
+    public static MetaTileEntityIds metaTileEntityIds = new MetaTileEntityIds();
+
+    public static class MetaTileEntityIds {
+
+        @Config.Comment({ "Starting ID for Industrial Apiary (uses 12 consecutive IDs).", "default: 20000" })
+        @Config.RangeInt(min = 1, max = 32767)
+        public int industrialApiaryStartId = 20000;
+
+        @Config.Comment({ "ID for Mega Apiary.", "default: 20500" })
+        @Config.RangeInt(min = 1, max = 32767)
+        public int megaApiaryId = 20500;
+    }
 }

src/main/java/com/github/gtexpert/gtbm/integration/gendustry/GendustryModule.java

@@ -18,7 +18,7 @@
          moduleID = Modules.MODULE_GENDUSTRY,
          containerID = ModValues.MODID,
          modDependencies = { Mods.Names.FORESTRY, Mods.Names.GENDUSTRY },
-         name = "GTBeesMatrix Gendustry For Minecraft Integration",
+         name = "GTBeesMatrix Gendustry Integration",
          description = "Gendustry Integration Module")
 public class GendustryModule extends GTBMIntegrationSubmodule {
 

src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/GendustryMetaTileEntities.java

@@ -6,6 +6,7 @@
 import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity;
 
 import com.github.gtexpert.gtbm.client.GTBMTextures;
+import com.github.gtexpert.gtbm.integration.gendustry.GendustryConfigHolder;
 import com.github.gtexpert.gtbm.integration.gendustry.GendustryRecipeMaps;
 import com.github.gtexpert.gtbm.integration.gendustry.metatileentities.multiblock.MetaTileEntityMegaApiary;
 
@@ -17,19 +18,16 @@ public class GendustryMetaTileEntities {
     public static MetaTileEntityMegaApiary MEGA_APIARY;
 
     public static void init() {
-        // INDUSTRIAL_APIARY 20000~20012
-        // TODO: IDの変更
+        GendustryConfigHolder.MetaTileEntityIds ids = GendustryConfigHolder.metaTileEntityIds;
 
-        registerMetaTileEntities(INDUSTRIAL_APIARY, 20000, "industrial_apiary",
+        registerMetaTileEntities(INDUSTRIAL_APIARY, ids.industrialApiaryStartId, "industrial_apiary",
                 (tier, voltageName) -> new MetaTileEntityIndustrialApiary(
                         gtbm(String.format("%s.%s", "industrial_apiary", voltageName)),
                         GendustryRecipeMaps.INDUSTRIAL_APIARY_RECIPES,
                         GTBMTextures.INDUSTRIAL_APIARY_OVERLAY,
                         tier, false, null));
 
-        // Multiblock
-        // Mega Apiary 20500
-        MEGA_APIARY = registerMetaTileEntity(20500, new MetaTileEntityMegaApiary(
+        MEGA_APIARY = registerMetaTileEntity(ids.megaApiaryId, new MetaTileEntityMegaApiary(
                 gtbm("mega_apiary")));
     }
 }