From c35c3cbb1daca6f42bc9dd521f9e02933f905d65 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Wed, 11 Jan 2023 21:51:03 -0500 Subject: [PATCH] Things --- .../client/gui/model/GuiCreationScreen.java | 6 +++++ .../npcs/client/gui/model/GuiModelScale.java | 23 ++++++++++--------- .../assets/customnpcs/lang/en_US.lang | 1 + 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 95470ae71..f0379e747 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -94,6 +94,8 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol private void showPlayerButtons() { int y = guiTop ; + addButton(new GuiNpcButton(9, guiLeft + 4, y += 22, 96, 20, "model.rotate")); + addButton(new GuiNpcButton(8, guiLeft + 4, y += 22, 96, 20, "model.scale")); addButton(new GuiNpcButton(4, guiLeft + 50, y += 22, 50, 20, "selectServer.edit")); @@ -289,6 +291,10 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol if(button.id == 8){ this.mc.displayGuiScreen(new GuiModelScale(this, playerdata, npc)); } + if(button.id == 9){ + // LOUIS ADD HERE + // this.mc.displayGuiScreen(new GuiModelScale(this, playerdata, npc)); + } if(button.id == 30){ playerdata.extra.setInteger("Age",button.getValue() == 1?-24000:0); playerdata.clearEntity(); diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java index b13824472..ac1cfcd01 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java @@ -15,6 +15,7 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{ private GuiScreen parent; private int type = 0; + private int offset = 10; private GuiNpcSlider scaleWidth; private GuiNpcSlider scaleHeight; @@ -58,7 +59,7 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{ drawSlider(y, playerdata.arms); y += 88; } - else{ + else { addButton(new GuiNpcButton(2, guiLeft + 110, y , 60, 20, "Edit")); y += 24; } @@ -75,21 +76,21 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{ } private void drawSlider(int y, ModelPartConfig config){ - y += 15; - addLabel(new GuiNpcLabel(10, "Width", guiLeft - 25, y + 5, 0xFFFFFF)); - scaleWidth = new GuiNpcSlider(this, 10, guiLeft + 50, y, config.scaleX - 0.5f); + y += 20; + addLabel(new GuiNpcLabel(10, "Width", guiLeft - 25 + offset, y + 5, 0xFFFFFF)); + scaleWidth = new GuiNpcSlider(this, 10, guiLeft + 50 + offset, y, config.scaleX - 0.5f); addSlider(scaleWidth); - addButton(new GuiNpcButton(170, guiLeft + 8, y, 40, 20, "Reset")); + addButton(new GuiNpcButton(170, guiLeft + 8 + offset, y, 40, 20, "Reset")); y += 22; - addLabel(new GuiNpcLabel(11, "Height", guiLeft - 25, y + 5, 0xFFFFFF)); - scaleHeight = new GuiNpcSlider(this, 11, guiLeft + 50, y, config.scaleY - 0.5f); + addLabel(new GuiNpcLabel(11, "Height", guiLeft - 25 + offset, y + 5, 0xFFFFFF)); + scaleHeight = new GuiNpcSlider(this, 11, guiLeft + 50 + offset, y, config.scaleY - 0.5f); addSlider(scaleHeight); - addButton(new GuiNpcButton(171, guiLeft + 8, y, 40, 20, "Reset")); + addButton(new GuiNpcButton(171, guiLeft + 8 + offset, y, 40, 20, "Reset")); y += 22; - addLabel(new GuiNpcLabel(12, "Depth", guiLeft - 25, y + 5, 0xFFFFFF)); - scaleDepth = new GuiNpcSlider(this, 12, guiLeft + 50, y, config.scaleZ - 0.5f); + addLabel(new GuiNpcLabel(12, "Depth", guiLeft - 25 + offset, y + 5, 0xFFFFFF)); + scaleDepth = new GuiNpcSlider(this, 12, guiLeft + 50 + offset, y, config.scaleZ - 0.5f); addSlider(scaleDepth); - addButton(new GuiNpcButton(172, guiLeft + 8, y, 40, 20, "Reset")); + addButton(new GuiNpcButton(172, guiLeft + 8 + offset, y, 40, 20, "Reset")); } diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 314cdc0cd..4a0265d84 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1006,6 +1006,7 @@ model.rleg=R. Leg model.legs=Legs model.scale=Scale model.animation=Animation +model.rotate=Rotate model.load=Model Load model.save=Model Save