GeminiのRV対応

tier940 · tier940 · commit ebd29f79ee66 · 2026-03-15T14:17:35.000+09:00
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/ForestryConfigHolder.java b/src/main/java/com/github/gtexpert/gtbm/integration/forestry/ForestryConfigHolder.java
@@ -17,15 +17,15 @@ public class ForestryConfigHolder {
     public static String gameMode = "NORMAL";
 
     @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;
+    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;
 }
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/recipes/FFMBlockRecipe.java b/src/main/java/com/github/gtexpert/gtbm/integration/forestry/recipes/FFMBlockRecipe.java
@@ -70,7 +70,7 @@ public static void blockCharcoal() {
     }
 
     public static void farm() {
-        if (!ForestryConfigHolder.FarmBlock) return;
+        if (!ForestryConfigHolder.farmBlock) return;
 
         BlockRegistryFarming blocks = getBlocks();
 
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/recipes/FFMCraftingRecipe.java b/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()) {
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/ApiaryModifierBridge.java b/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/ApiaryModifierBridge.java
@@ -14,6 +14,8 @@
  */
 public class ApiaryModifierBridge extends DefaultBeeModifier {
 
+    private static final float MAX_TERRITORY = 5;
+
     protected final ApiaryModifiers modifiers;
 
     public ApiaryModifierBridge(ApiaryModifiers modifiers) {
@@ -22,7 +24,7 @@ public ApiaryModifierBridge(ApiaryModifiers modifiers) {
 
     @Override
     public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
-        return Math.min(modifiers.territory, 5);
+        return Math.min(modifiers.territory, MAX_TERRITORY);
     }
 
     @Override
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeClimateHelper.java b/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeClimateHelper.java
@@ -30,8 +30,10 @@ public Biome getEffectiveBiome(@Nullable World world, BlockPos pos) {
     }
 
     public Biome getBiome(World world, BlockPos pos) {
-        Biome biome = getEffectiveBiome(world, pos);
-        return biome != null ? biome : world.getBiome(pos);
+        if (modifiers.biomeOverride != null) {
+            return modifiers.biomeOverride;
+        }
+        return world.getBiome(pos);
     }
 
     public EnumTemperature getTemperature(@Nullable World world, BlockPos pos) {
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeHousingInfoProvider.java b/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeHousingInfoProvider.java
@@ -22,6 +22,10 @@
  */
 public class BeeHousingInfoProvider implements IProbeInfoProvider {
 
+    private static final int HEALTH_THRESHOLD_DIVISOR = 4;
+    private static final int HEALTH_COLOR_HIGH = 0xFF00D4CE;
+    private static final int HEALTH_COLOR_LOW = 0xFFBB1C28;
+
     @Override
     public String getID() {
         return ModValues.MODID + ":bee_housing_provider";
@@ -49,7 +53,7 @@ public void addProbeInfo(@NotNull ProbeMode mode, @NotNull IProbeInfo probeInfo,
             if (bee != null && bee.getMaxHealth() > 0) {
                 int health = bee.getHealth();
                 int maxHealth = bee.getMaxHealth();
-                int color = health > maxHealth / 4 ? 0xFF00D4CE : 0xFFBB1C28;
+                int color = health > maxHealth / HEALTH_THRESHOLD_DIVISOR ? HEALTH_COLOR_HIGH : HEALTH_COLOR_LOW;
                 probeInfo.progress(health, maxHealth, probeInfo.defaultProgressStyle()
                         .suffix(" / " + maxHealth + " HP")
                         .filledColor(color)
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/WidgetBeeStatus.java b/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/WidgetBeeStatus.java
@@ -117,17 +117,21 @@ private List<String> buildTooltipLines() {
         }
 
         // Upgrade note (check if any modifier is non-default)
-        if (modifiers.energy != 1 || modifiers.lifespan != 1 || modifiers.production != 1 ||
-                modifiers.mutation != 1 || modifiers.territory != 1 || modifiers.flowering != 1 ||
-                modifiers.geneticDecay != 1 || modifiers.humidity != 0 || modifiers.temperature != 0 ||
-                modifiers.isSealed || modifiers.isSelfLighted || modifiers.isSunlightSimulated ||
-                modifiers.isAutomated || modifiers.isCollectingPollen || modifiers.biomeOverride != null) {
+        if (hasActiveUpgrades(modifiers)) {
             addLine(lines, "gtbm.bee.label.upgrade_note", "");
         }
 
         return lines;
     }
 
+    private static boolean hasActiveUpgrades(ApiaryModifiers mods) {
+        return mods.energy != 1 || mods.lifespan != 1 || mods.production != 1 ||
+                mods.mutation != 1 || mods.territory != 1 || mods.flowering != 1 ||
+                mods.geneticDecay != 1 || mods.humidity != 0 || mods.temperature != 0 ||
+                mods.isSealed || mods.isSelfLighted || mods.isSunlightSimulated ||
+                mods.isAutomated || mods.isCollectingPollen || mods.biomeOverride != null;
+    }
+
     private void addBeeStats(List<String> lines, IBee bee, IBeeHousingInventory inv) {
         EnumBeeType type = beeRoot.getType(inv.getQueen());
 
@@ -147,6 +151,8 @@ private void addBeeStats(List<String> lines, IBee bee, IBeeHousingInventory inv)
             addLine(lines, "gtbm.bee.label.territory", String.format("%.0f x %.0f x %.0f",
                     t.getX() * modifiers.territory, t.getY() * modifiers.territory,
                     t.getZ() * modifiers.territory));
+        } else {
+            addLine(lines, "gtbm.bee.label.not_analyzed", "");
         }
     }
 
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/GendustryConfigHolder.java b/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/GendustryConfigHolder.java
@@ -12,5 +12,5 @@
 public class GendustryConfigHolder {
 
     @Config.Comment({ "If true, each will be uncraftable.", "default: true" })
-    public static boolean IndustrialApiary = true;
+    public static boolean industrialApiary = true;
 }
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/IndustrialApiaryLogic.java b/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/IndustrialApiaryLogic.java
@@ -23,6 +23,8 @@
 public class IndustrialApiaryLogic extends RecipeLogicEnergy {
 
     private static final int BASE_EU_PER_TICK = 80;
+    private static final int PROGRESS_SYNC_TICKS = 20;
+    private static final int BREEDING_TIME_TICKS = 100;
     private IBeeRoot beeRoot;
     private IBeekeepingLogic beekeepingLogic;
     private boolean needsMovePrincess;
@@ -192,7 +194,7 @@ private void updateProgress(boolean isWorking, MetaTileEntityIndustrialApiary ap
             // Periodic resync with actual health (every 20 ticks)
             // Forestry's aging is probabilistic, so progress can drift
             progressSyncCounter++;
-            if (progressSyncCounter >= 20 && maxProgressTime > 0) {
+            if (progressSyncCounter >= PROGRESS_SYNC_TICKS && maxProgressTime > 0) {
                 progressSyncCounter = 0;
                 resyncIfHealthChanged(apiary);
             }
@@ -223,7 +225,7 @@ private void syncProgressFromBee(MetaTileEntityIndustrialApiary apiary) {
                 lastSyncedHealth = bee.getHealth();
             }
         } else if (type == EnumBeeType.PRINCESS) {
-            maxProgressTime = 100;
+            maxProgressTime = BREEDING_TIME_TICKS;
             progressTime = beekeepingLogic.getBeeProgressPercent();
             lastSyncedHealth = -1;
         }
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java b/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java
@@ -17,7 +17,6 @@
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.items.IItemHandlerModifiable;
-import net.minecraftforge.items.ItemStackHandler;
 
 import com.mojang.authlib.GameProfile;
 
@@ -132,7 +131,7 @@ private int getUpgradeSlotCount() {
     @Override
     protected void initializeInventory() {
         super.initializeInventory();
-        this.upgradeInventory = new ItemStackHandler(getUpgradeSlotCount()) {
+        this.upgradeInventory = new NotifiableItemStackHandler(this, getUpgradeSlotCount(), this, false) {
 
             @Override
             public boolean isItemValid(int slot, @org.jetbrains.annotations.NotNull ItemStack stack) {
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/recipes/GendustryCraftingRecipe.java b/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/recipes/GendustryCraftingRecipe.java
@@ -23,7 +23,7 @@ public static void init() {
 
     public static void recipeRemoval() {
         Map<Supplier<Boolean>, String> recipes = new HashMap<>();
-        recipes.put(() -> GendustryConfigHolder.IndustrialApiary, "industrial_apiary");
+        recipes.put(() -> GendustryConfigHolder.industrialApiary, "industrial_apiary");
 
         recipes.forEach((config, name) -> {
             if (config.get()) {
diff --git a/src/main/resources/assets/gtbm/lang/en_us.lang b/src/main/resources/assets/gtbm/lang/en_us.lang
@@ -29,6 +29,7 @@ gtbm.bee.label.territory=Territory: %s
 gtbm.bee.label.health=Queen Health: %s
 gtbm.bee.label.cycle=Next Product: %s
 gtbm.bee.label.breeding=Breeding Progress: %s
+gtbm.bee.label.not_analyzed=§o§eInsert analyzed bee to see more info
 gtbm.bee.label.upgrade_note=§o§7Upgrade changes apply from next cycle
 
 # GUI
diff --git a/src/main/resources/assets/gtbm/lang/ja_jp.lang b/src/main/resources/assets/gtbm/lang/ja_jp.lang
@@ -29,6 +29,7 @@ gtbm.bee.label.territory=活動範囲: %s
 gtbm.bee.label.health=女王の体力: %s
 gtbm.bee.label.cycle=次の産出まで: %s
 gtbm.bee.label.breeding=交配進行度: %s
+gtbm.bee.label.not_analyzed=§o§e解析済みの蜂を入れるとより詳しい情報が表示されます
 gtbm.bee.label.upgrade_note=§o§7アップグレードの変更は次のサイクルから適用されます
 
 # GUI

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static void blockCharcoal() {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public static void farm() {`
`73`		`- if (!ForestryConfigHolder.FarmBlock) return;`
	`73`	`+ if (!ForestryConfigHolder.farmBlock) return;`
`74`	`74`
`75`	`75`	`BlockRegistryFarming blocks = getBlocks();`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,10 @@ public Biome getEffectiveBiome(@Nullable World world, BlockPos pos) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public Biome getBiome(World world, BlockPos pos) {`
`33`		`- Biome biome = getEffectiveBiome(world, pos);`
`34`		`- return biome != null ? biome : world.getBiome(pos);`
	`33`	`+ if (modifiers.biomeOverride != null) {`
	`34`	`+ return modifiers.biomeOverride;`
	`35`	`+ }`
	`36`	`+ return world.getBiome(pos);`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`public EnumTemperature getTemperature(@Nullable World world, BlockPos pos) {`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@`
`12`	`12`	`public class GendustryConfigHolder {`
`13`	`13`
`14`	`14`	`@Config.Comment({ "If true, each will be uncraftable.", "default: true" })`
`15`		`- public static boolean IndustrialApiary = true;`
	`15`	`+ public static boolean industrialApiary = true;`
`16`	`16`	`}`