fix: Barrier display and getBlockName

Zpiboo · Jul 9, 2024 · ebbcec7 · ebbcec7
1 parent 4941a14
commit ebbcec7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/BarrierDisplayComponent.java b/common/src/main/java/io/github/kurrycat/mpkmod/gui/components/BarrierDisplayComponent.java
@@ -23,7 +23,7 @@ public class BarrierDisplayComponent extends ResizableComponent {
     @Override
     public void render(Vector2D mouse) {
         String lookingAtBlock = WorldInteraction.getLookingAtBlock();
-        boolean lookingAtBarrier = lookingAtBlock != null && lookingAtBlock.equals("minecraft:barrier");
+        boolean lookingAtBarrier = lookingAtBlock != null && lookingAtBlock.contains("minecraft:barrier");
 
         Color color = lookingAtBarrier ? Theme.warnText : Theme.defaultText;
         if (selected) color = selectedColor;

diff --git a/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_19_4/FunctionCompatibility.java b/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_19_4/FunctionCompatibility.java
@@ -86,7 +86,7 @@ public String getBlockName(Vector3D blockPos) {
 
         return Registries.BLOCK.getKey(
                 MinecraftClient.getInstance().world.getBlockState(blockpos).getBlock()
-        ).toString();
+        ).get().getValue().toString();
     }
 
     @Override
@@ -114,7 +114,7 @@ public String getLookingAtBlock() {
         if (hitResult.getType() == HitResult.Type.BLOCK && MinecraftClient.getInstance().world != null) {
             return Registries.BLOCK.getKey(
                     MinecraftClient.getInstance().world.getBlockState(((BlockHitResult) hitResult).getBlockPos()).getBlock()
-            ).toString();
+            ).get().getValue().toTranslationKey();
         }
         return null;
     }

diff --git a/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/FunctionCompatibility.java b/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/FunctionCompatibility.java
@@ -87,7 +87,7 @@ public String getBlockName(Vector3D blockPos) {
 
         return Registries.BLOCK.getKey(
                 MinecraftClient.getInstance().world.getBlockState(blockpos).getBlock()
-        ).toString();
+        ).get().getValue().toString();
     }
 
     @Override
@@ -115,7 +115,7 @@ public String getLookingAtBlock() {
         if (hitResult.getType() == HitResult.Type.BLOCK && MinecraftClient.getInstance().world != null) {
             return Registries.BLOCK.getKey(
                     MinecraftClient.getInstance().world.getBlockState(((BlockHitResult) hitResult).getBlockPos()).getBlock()
-            ).toString();
+            ).get().getValue().toTranslationKey();
         }
         return null;
     }

diff --git a/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_6/FunctionCompatibility.java b/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_6/FunctionCompatibility.java
@@ -87,7 +87,7 @@ public String getBlockName(Vector3D blockPos) {
 
         return Registries.BLOCK.getKey(
                 MinecraftClient.getInstance().world.getBlockState(blockpos).getBlock()
-        ).toString();
+        ).get().getValue().toString();
     }
 
     @Override
@@ -115,7 +115,7 @@ public String getLookingAtBlock() {
         if (hitResult.getType() == HitResult.Type.BLOCK && MinecraftClient.getInstance().world != null) {
             return Registries.BLOCK.getKey(
                     MinecraftClient.getInstance().world.getBlockState(((BlockHitResult) hitResult).getBlockPos()).getBlock()
-            ).toString();
+            ).get().getValue().toTranslationKey();
         }
         return null;
     }

diff --git a/.../main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_21/FunctionCompatibility.java b/.../main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_21/FunctionCompatibility.java
@@ -87,7 +87,7 @@ public String getBlockName(Vector3D blockPos) {
 
         return Registries.BLOCK.getKey(
                 MinecraftClient.getInstance().world.getBlockState(blockpos).getBlock()
-        ).toString();
+        ).get().getValue().toString();
     }
 
     @Override
@@ -115,7 +115,7 @@ public String getLookingAtBlock() {
         if (hitResult.getType() == HitResult.Type.BLOCK && MinecraftClient.getInstance().world != null) {
             return Registries.BLOCK.getKey(
                     MinecraftClient.getInstance().world.getBlockState(((BlockHitResult) hitResult).getBlockPos()).getBlock()
-            ).toString();
+            ).get().getValue().toTranslationKey();
         }
         return null;
     }