レビュー対応

Author: tier940

src/main/java/com/github/gtexpert/gtmt/integration/tic/materials/ToolMaterialRegistrar.java

@@ -239,9 +239,9 @@ private static void registerHarvestLevelNames() {
         // Override TiC's native names (0–4) with vanilla/GT naming convention
         // so that the same harvest level shows the same name in both GT and TiC tooltips.
         java.util.Map<Integer, String> ticNames = slimeknights.tconstruct.library.utils.HarvestLevels.harvestLevelNames;
-        ticNames.put(0, TextFormatting.DARK_GREEN + "Wood");
-        ticNames.put(1, TextFormatting.GRAY + "Stone");
-        ticNames.put(2, TextFormatting.WHITE + "Iron");
+        ticNames.put(0, TextFormatting.GOLD + "Wood");
+        ticNames.put(1, TextFormatting.DARK_GRAY + "Stone");
+        ticNames.put(2, TextFormatting.GRAY + "Iron");
         ticNames.put(3, TextFormatting.AQUA + "Diamond");
         // Level 4 (Cobalt) — no vanilla equivalent, keep TiC's name
 

src/main/java/com/github/gtexpert/gtmt/mixins/tic/MixinForgeHooks.java

@@ -26,10 +26,13 @@
 @Mixin(value = ForgeHooks.class, remap = false)
 public class MixinForgeHooks {
 
-    @Inject(method = "canHarvestBlock", at = @At("RETURN"), cancellable = true)
+    @Inject(method = "canHarvestBlock(Lnet/minecraft/block/Block;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;)Z",
+            at = @At("RETURN"),
+            cancellable = true)
     private static void checkOffHandTool(Block block, EntityPlayer player, IBlockAccess world,
                                          BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
         if (Boolean.TRUE.equals(cir.getReturnValue())) return;
+        if (pos == null) return;
 
         ItemStack mainhand = player.getHeldItemMainhand();
         ItemStack offhand = player.getHeldItemOffhand();