From 75aa91678c2dfdf844ecfcbb68bcf9389028ca4e Mon Sep 17 00:00:00 2001 From: syeyoung <42869671+cyoung06@users.noreply.github.com> Date: Thu, 10 Dec 2020 22:46:37 +0900 Subject: secretz --- .../roomedit/elements/MOffsetPoint.java | 64 ---------------------- .../roomedit/elements/MParameter.java | 6 +- .../dungeonsguide/roomedit/elements/MValue.java | 64 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MOffsetPoint.java create mode 100644 src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java (limited to 'src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements') diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MOffsetPoint.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MOffsetPoint.java deleted file mode 100644 index 3143f42a..00000000 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MOffsetPoint.java +++ /dev/null @@ -1,64 +0,0 @@ -package kr.syeyoung.dungeonsguide.roomedit.elements; - -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; -import kr.syeyoung.dungeonsguide.roomedit.EditingContext; -import kr.syeyoung.dungeonsguide.roomedit.MPanel; -import kr.syeyoung.dungeonsguide.roomedit.Parameter; -import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonOffsetPointEdit; -import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonParameterEdit; -import kr.syeyoung.dungeonsguide.roomedit.panes.ProcessorParameterEditPane; -import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditOffsetPointSet; -import lombok.Getter; -import lombok.Setter; -import net.minecraft.client.gui.Gui; - -import java.awt.*; - -public class MOffsetPoint extends MPanel { - @Getter - private OffsetPoint data; - private ValueEditOffsetPointSet valueEditOffsetPointSet; - private MLabel dataLab; - - @Getter @Setter - private Color hover = Color.gray; - - - public MOffsetPoint(ValueEditOffsetPointSet valueEditOffsetPointSet, final OffsetPoint parameter) { - this.valueEditOffsetPointSet = valueEditOffsetPointSet; - this.add(this.dataLab = new MLabel() { - @Override - public String getText() { - return data != null ?data.toString() :"-empty-"; - } - }); - this.dataLab.setAlignment(MLabel.Alignment.RIGHT); - - this.data = parameter; - } - - @Override - public void render(int absMousex, int absMousey, int relMousex0, int relMousey0, float partialTicks, Rectangle scissor) { - if (hover != null && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMousex0, relMousey0)) { - Gui.drawRect(0,0,bounds.width, bounds.height, hover.getRGB()); - } - } - - @Override - public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) { - if (this.bounds.x > -20 && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMouseX, relMouseY)) { - EditingContext.getEditingContext().openGui(new GuiDungeonOffsetPointEdit(valueEditOffsetPointSet, data)); - } - } - - @Override - public void resize(int parentWidth, int parentHeight) { - this.setSize(new Dimension(parentWidth, bounds.height)); - dataLab.setBounds(new Rectangle(0,0,parentWidth, bounds.height)); - } - - @Override - public void onBoundsUpdate() { - dataLab.setBounds(new Rectangle(0,0,bounds.width, bounds.height)); - } -} diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java index be6c4303..fef77a25 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java @@ -4,7 +4,7 @@ import kr.syeyoung.dungeonsguide.roomedit.EditingContext; import kr.syeyoung.dungeonsguide.roomedit.MPanel; import kr.syeyoung.dungeonsguide.roomedit.Parameter; import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonParameterEdit; -import kr.syeyoung.dungeonsguide.roomedit.panes.ProcessorParameterEditPane; +import kr.syeyoung.dungeonsguide.roomedit.panes.DynamicEditor; import lombok.Getter; import lombok.Setter; import net.minecraft.client.gui.Gui; @@ -20,9 +20,9 @@ public class MParameter extends MPanel { @Getter @Setter private Parameter parameter; - private ProcessorParameterEditPane processorParameterEditPane; + private DynamicEditor processorParameterEditPane; - public MParameter(final Parameter parameter, ProcessorParameterEditPane processorParameterEditPane) { + public MParameter(final Parameter parameter, DynamicEditor processorParameterEditPane) { this.processorParameterEditPane = processorParameterEditPane; this.add(this.label = new MLabel() { @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java new file mode 100644 index 00000000..9c733fd6 --- /dev/null +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MValue.java @@ -0,0 +1,64 @@ +package kr.syeyoung.dungeonsguide.roomedit.elements; + +import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; +import kr.syeyoung.dungeonsguide.roomedit.EditingContext; +import kr.syeyoung.dungeonsguide.roomedit.MPanel; +import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonValueEdit; +import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditOffsetPointSet; +import lombok.Getter; +import lombok.Setter; +import net.minecraft.client.gui.Gui; +import scala.actors.threadpool.Arrays; + +import java.awt.*; +import java.util.ArrayList; +import java.util.List; +public class MValue extends MPanel { + @Getter + private T data; + private ValueEditOffsetPointSet valueEditOffsetPointSet; + private MLabel dataLab; + + @Getter @Setter + private Color hover = Color.gray; + + private List addons; + + public MValue(final T parameter, List addons) { + this.addons = addons; + this.add(this.dataLab = new MLabel() { + @Override + public String getText() { + return data != null ?data.toString() :"-empty-"; + } + }); + this.dataLab.setAlignment(MLabel.Alignment.RIGHT); + + this.data = parameter; + } + + @Override + public void render(int absMousex, int absMousey, int relMousex0, int relMousey0, float partialTicks, Rectangle scissor) { + if (hover != null && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMousex0, relMousey0)) { + Gui.drawRect(0,0,bounds.width, bounds.height, hover.getRGB()); + } + } + + @Override + public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) { + if (this.bounds.x > -20 && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMouseX, relMouseY)) { + EditingContext.getEditingContext().openGui(new GuiDungeonValueEdit(data, addons)); + } + } + + @Override + public void resize(int parentWidth, int parentHeight) { + this.setSize(new Dimension(parentWidth, bounds.height)); + dataLab.setBounds(new Rectangle(0,0,parentWidth, bounds.height)); + } + + @Override + public void onBoundsUpdate() { + dataLab.setBounds(new Rectangle(0,0,bounds.width, bounds.height)); + } +} -- cgit