Fix

AE2-UEL · Nov 8, 2024 · f868343 · f868343
1 parent 31bc579
commit f868343
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java
@@ -75,7 +75,7 @@ protected void addButtons() {
     }
 
     protected void addLabel() {
-        this.lockReason = new GuiImgLabel(this.fontRenderer, 190, 6 + 73 + 3, Settings.UNLOCK, LockCraftingMode.NONE);
+        this.lockReason = new GuiImgLabel(this.fontRenderer, guiLeft + 50, guiTop + 12, Settings.UNLOCK, LockCraftingMode.NONE);
         labelList.add(lockReason);
     }
 

diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgLabel.java b/src/main/java/appeng/client/gui/widgets/GuiImgLabel.java
@@ -32,7 +32,6 @@ public GuiImgLabel(FontRenderer fontRendererObj, final int x, final int y, final
 
     private final Enum labelSetting;
     private Enum currentValue;
-    //    private final int iconX;
     private static Map<GuiImgButton.EnumPair, LabelAppearance> appearances;
     private final FontRenderer fontRenderer;
 

diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java
@@ -1520,7 +1520,7 @@ public void updateRedstoneState() {
     /**
      * @return Null if {@linkplain #getCraftingLockedReason()} is not {@link LockCraftingMode#LOCK_UNTIL_RESULT}.
      */
-    @org.jetbrains.annotations.Nullable
+    @Nullable
     public IAEItemStack getUnlockStack() {
         return unlockStack;
     }

diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang
@@ -262,7 +262,7 @@ gui.appliedenergistics2.CraftingLock=Crafting is locked
 gui.appliedenergistics2.NoneLock=Crafting is unlocked
 gui.appliedenergistics2.HighRedstoneLock=Locked by redstone signal
 gui.appliedenergistics2.LowRedstoneLock=Locked by lack of redstone signal
-gui.appliedenergistics2.ResultLock=Waiting for %s (%d) to unlock
+gui.appliedenergistics2.ResultLock=Waiting for pattern output to unlock
 gui.appliedenergistics2.UntilPulseUnlock=Waiting for redstone pulse to unlock
 
 // GUI Tooltips

diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_cn.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.lang
@@ -260,6 +260,10 @@ gui.appliedenergistics2.Sticky=粘滞
 gui.appliedenergistics2.FluidTerminal=流体终端
 gui.appliedenergistics2.NoneLock=合成已解锁
 gui.appliedenergistics2.CraftingLock=合成已锁定
+gui.appliedenergistics2.LowRedstoneLock=由于缺少红石信号而锁定
+gui.appliedenergistics2.HighRedstoneLock=由于红石信号而锁定
+gui.appliedenergistics2.ResultLock=等待样板输出解锁
+gui.appliedenergistics2.UntilPulseUnlock=等待红石脉冲解锁
 
 // GUI Tooltips
 gui.tooltips.appliedenergistics2.Stash=存储物品