Tint Code Refactoring and some cleanup wo the lang file

This commit is contained in:
Kam committed 2024-02-29 22:06:21 -05:00
1 parent d75a054118
commit ea0b8ec5a4
8 files changed
+85 -84

No files matched your search

@@ -1,10 +1,8 @@
package noppes.npcs.client.gui;
import net.minecraft.client.gui.GuiButton;
import noppes.npcs.DataStats;
import noppes.npcs.client.gui.util.*;
import noppes.npcs.controllers.data.CustomTintData;
import noppes.npcs.controllers.data.DialogImage;
public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, ITextfieldListener {
private CustomTintData tintData;
@@ -22,35 +20,35 @@ public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, I
public void initGui() {
super.initGui();
int y = 30;
addLabel(new GuiNpcLabel(0, "tint.enablecustom", guiLeft + 5, guiTop + y + 5));
addButton(new GuiNpcButtonYesNo(0, guiLeft + 122, guiTop + y, 56, 20, tintData.isEnableCustomTint()));
addLabel(new GuiNpcLabel(0, "tint.enable", guiLeft + 5, guiTop + y + 5));
addButton(new GuiNpcButtonYesNo(0, guiLeft + 122, guiTop + y, 56, 20, tintData.isTintEnabled()));
y+=22;
if (tintData.isEnableCustomTint()) {
addLabel(new GuiNpcLabel(1, "tint.enablenpc", guiLeft + 5, guiTop + y + 5));
addButton(new GuiNpcButtonYesNo(1, guiLeft + 122, guiTop + y, 56, 20, tintData.isEnableNpcTint()));
if (tintData.isTintEnabled()) {
addLabel(new GuiNpcLabel(1, "tint.enablegeneral", guiLeft + 5, guiTop + y + 5));
addButton(new GuiNpcButtonYesNo(1, guiLeft + 122, guiTop + y, 56, 20, tintData.isGeneralTintEnabled()));
y+=22;
if(tintData.isEnableNpcTint()) {
String color = Integer.toHexString(tintData.getColorNpcTint());
if(tintData.isGeneralTintEnabled()) {
String color = Integer.toHexString(tintData.getGeneralTint());
while (color.length() < 6) color = 0 + color;
addLabel(new GuiNpcLabel(2, "tint.tint", guiLeft + 4, guiTop + y + 5));
addButton(new GuiNpcButton(2, guiLeft + 122, guiTop + y, 60, 20, color));
getButton(2).setTextColor(tintData.getColorNpcTint());
getButton(2).setTextColor(tintData.getGeneralTint());
y+=22;
addLabel(new GuiNpcLabel(3,"tint.alpha", guiLeft + 5, guiTop + y + 5));
addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 122, guiTop + y, 60, 20, tintData.getColorNpcTintAlpha() + ""));
addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 122, guiTop + y, 60, 20, tintData.getGeneralAlpha() + ""));
getTextField(3).integersOnly = true;
getTextField(3).setMinMaxDefault(1, 100, 40);
y+=22;
}
addLabel(new GuiNpcLabel(4, "tint.enablehurt", guiLeft + 5, guiTop + y + 5));
addButton(new GuiNpcButtonYesNo(4, guiLeft + 122, guiTop + y, 56, 20, tintData.isEnableHurtTint()));
addButton(new GuiNpcButtonYesNo(4, guiLeft + 122, guiTop + y, 56, 20, tintData.isHurtTintEnabled()));
y+=22;
if (tintData.isEnableHurtTint()) {
String color2 = Integer.toHexString(tintData.getColorHurtTint());
if (tintData.isHurtTintEnabled()) {
String color2 = Integer.toHexString(tintData.getHurtTint());
while (color2.length() < 6) color2 = 0 + color2;
addLabel(new GuiNpcLabel(5, "tint.hurt", guiLeft + 4, guiTop + y + 5));
addButton(new GuiNpcButton(5, guiLeft + 122, guiTop + y, 60, 20, color2));
getButton(5).setTextColor(tintData.getColorHurtTint());
getButton(5).setTextColor(tintData.getHurtTint());
}
}
addButton(new GuiNpcButton(66, guiLeft + 82, guiTop + 190, 98, 20, "gui.done"));
@@ -61,23 +59,23 @@ public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, I
int id = guibutton.id;
GuiNpcButton button = (GuiNpcButton) guibutton;
if (id == 0) {
tintData.setEnableCustomTint(((GuiNpcButtonYesNo) button).getBoolean());
tintData.setTintEnabled(((GuiNpcButtonYesNo) button).getBoolean());
initGui();
}
if (id == 1) {
tintData.setEnableNpcTint(((GuiNpcButtonYesNo) button).getBoolean());
tintData.setGeneralTintEnabled(((GuiNpcButtonYesNo) button).getBoolean());
initGui();
}
if (id == 4) {
tintData.setEnableHurtTint(((GuiNpcButtonYesNo) button).getBoolean());
tintData.setHurtTintEnabled(((GuiNpcButtonYesNo) button).getBoolean());
initGui();
}
if (button.id == 2) {
setSubGui(new SubGuiColorSelector(tintData.getColorNpcTint()));
setSubGui(new SubGuiColorSelector(tintData.getGeneralTint()));
lastColorClicked = 0;
}
if (button.id == 5) {
setSubGui(new SubGuiColorSelector(tintData.getColorHurtTint()));
setSubGui(new SubGuiColorSelector(tintData.getHurtTint()));
lastColorClicked = 1;
}
if (id == 66) {
@@ -88,9 +86,9 @@ public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, I
@Override
public void subGuiClosed(SubGuiInterface subgui) {
if (lastColorClicked == 0) {
tintData.setColorNpcTint(((SubGuiColorSelector) subgui).color);
tintData.setGeneralTint(((SubGuiColorSelector) subgui).color);
} else if (lastColorClicked == 1) {
tintData.setColorHurtTint(((SubGuiColorSelector) subgui).color);
tintData.setHurtTint(((SubGuiColorSelector) subgui).color);
}
initGui();
save();
@@ -99,7 +97,7 @@ public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, I
@Override
public void unFocused(GuiNpcTextField textfield) {
if(textfield.id==3){
tintData.setColorNpcTintAlpha(textfield.getInteger());
tintData.setGeneralAlpha(textfield.getInteger());
}
}
}