diff --git a/src/main/java/noppes/npcs/client/gui/hud/GuiHudEditor.java b/src/main/java/noppes/npcs/client/gui/hud/GuiHudEditor.java index d37651b61..f6e8e91e7 100644 --- a/src/main/java/noppes/npcs/client/gui/hud/GuiHudEditor.java +++ b/src/main/java/noppes/npcs/client/gui/hud/GuiHudEditor.java @@ -114,7 +114,7 @@ public class GuiHudEditor extends GuiScreen { hasRight = true; } else if (btn.id == COMPONENT_LABEL_ID) { // Update the label text. - btn.displayString = selectedComponent != null ? selectedComponent.getClass().getSimpleName() : "None"; + btn.displayString = selectedComponent != null ? selectedComponent.getClass().getSimpleName().replace("Component", "") : "None"; hasLabel = true; } } @@ -122,7 +122,7 @@ public class GuiHudEditor extends GuiScreen { buttonList.add(new GuiButton(CYCLE_LEFT_ID, groupX, cycleY, 20, 20, "<")); } if (!hasLabel) { - GuiButton labelBtn = new GuiButton(COMPONENT_LABEL_ID, groupX + 20, cycleY, 120, 20, selectedComponent != null ? selectedComponent.getClass().getSimpleName() : "None"); + GuiButton labelBtn = new GuiButton(COMPONENT_LABEL_ID, groupX + 20, cycleY, 120, 20, selectedComponent != null ? selectedComponent.getClass().getSimpleName().replace("Component", "") : "None"); labelBtn.enabled = false; buttonList.add(labelBtn); } diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java index 5ad6c4882..23636b87c 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java @@ -39,15 +39,13 @@ public class GuiSettings extends GuiCNPCInventory implements ITextfieldListener, this.addLabel(new GuiNpcLabel(1, "settings.chatBubbles", guiLeft + 8, guiTop + 14 + y)); this.addButton(new GuiNpcButton(1, guiLeft + 105, guiTop + 9 + y, 50, 20, new String[]{"gui.no", "gui.yes"}, ConfigClient.EnableChatBubbles?1:0)); + this.addLabel(new GuiNpcLabel(90,"settings.hud", guiLeft + 8 + 155, guiTop + 14 + y)); + this.addButton(new GuiNpcButton(90, guiLeft + 107 + 160, guiTop + 9 + y, 45, 20, "gui.edit")); + y += 22; this.addLabel(new GuiNpcLabel(2, "settings.dialogSound", guiLeft + 8, guiTop + 14 + y)); this.addButton(new GuiNpcButton(2, guiLeft + 105, guiTop + 9 + y, 50, 20, new String[]{"gui.no", "gui.yes"}, ConfigClient.DialogSound?1:0)); -// this.addLabel(new GuiNpcLabel(12,"settings.alignmentX", guiLeft + 8 + 155, guiTop + 14 + y)); -// this.addTextField(new GuiNpcTextField(12, this, this.fontRendererObj, guiLeft + 107 + 160, guiTop + 9 + y, 45, 20, ConfigClient.TrackingInfoX + "")); -// getTextField(12).integersOnly = true; -// getTextField(12).setMinMaxDefault(-2000, 2000, 0); - y += 22; this.addLabel(new GuiNpcLabel(10,"settings.dialogSpeed", guiLeft + 8, guiTop + 14 + y)); this.addTextField(new GuiNpcTextField(10, this, this.fontRendererObj, guiLeft + 107, guiTop + 9 + y, 45, 20, ConfigClient.DialogSpeed + "")); @@ -72,9 +70,6 @@ public class GuiSettings extends GuiCNPCInventory implements ITextfieldListener, y += 22; - this.addLabel(new GuiNpcLabel(90, "overlayer", guiLeft + 8, guiTop + 14 + y)); - this.addButton(new GuiNpcButton(90, guiLeft + 105, guiTop + 9 + y, "EDIT")); - y += 22; this.addButton(new GuiNpcButton(5, guiLeft + 8, guiTop + 9 + y, 150, 20, "settings.clearSkin")); this.addButton(new GuiNpcButton(4, guiLeft + 8 + 155, guiTop + 9 + y, 150, 20, "settings.clearTrack")); diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index c71329126..b4d7e3d37 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -219,6 +219,7 @@ settings.clearTrack=Clear Tracked Quest settings.confirmClearTrack=Are you sure you want to clear your tracked quest? settings.clearSkin=Clear Skin Cache settings.confirmClearSkin=Are you sure you want to clear your skin cache? +settings.hud=Hud Editor scale.shared=Shared filter.contains=Contains