diff options
| author | syeyoung <42869671+cyoung06@users.noreply.github.com> | 2020-11-26 15:33:58 +0900 |
|---|---|---|
| committer | syeyoung <42869671+cyoung06@users.noreply.github.com> | 2020-11-26 15:33:58 +0900 |
| commit | 2baa6dc4a59db422415bfad996e11619093788c6 (patch) | |
| tree | 69bc29301e5f3a9c155a8b795d16e3c283efc655 /src/main/java/kr/syeyoung | |
| parent | f1a9ef20465071fd32d662edc22e4dc228ba28aa (diff) | |
| download | Skyblock-Dungeons-Guide-2baa6dc4a59db422415bfad996e11619093788c6.tar.gz Skyblock-Dungeons-Guide-2baa6dc4a59db422415bfad996e11619093788c6.tar.bz2 Skyblock-Dungeons-Guide-2baa6dc4a59db422415bfad996e11619093788c6.zip | |
add set stuff, done
Diffstat (limited to 'src/main/java/kr/syeyoung')
3 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java b/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java index bce2b573..b563fcfc 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/EventListener.java @@ -5,6 +5,7 @@ import kr.syeyoung.dungeonsguide.dungeon.data.DungeonRoomInfo; import kr.syeyoung.dungeonsguide.dungeon.doorfinder.DungeonDoor; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.roomedit.EditingContext; +import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonAddSet; import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonOffsetPointEdit; import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonParameterEdit; import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit; @@ -123,6 +124,8 @@ public class EventListener { if (valueEdit != null) { valueEdit.renderWorld(renderWorldLastEvent.partialTicks); } + } else if (guiScreen instanceof GuiDungeonAddSet) { + ((GuiDungeonAddSet) guiScreen).onWorldRender(renderWorldLastEvent.partialTicks); } } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java index b6275865..a0496b47 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java @@ -36,8 +36,8 @@ public class GuiDungeonAddSet extends GuiScreen { for (OffsetPoint pos:getBlockPoses()) { RenderUtils.highlightBlock(pos.getBlockPos(EditingContext.getEditingContext().getRoom()), new Color(0,255,255,50), partialTicks); } - RenderUtils.highlightBlock(start.getBlockPos(EditingContext.getEditingContext().getRoom()), new Color(255,0,0,50), partialTicks); - RenderUtils.highlightBlock(end.getBlockPos(EditingContext.getEditingContext().getRoom()), new Color(0,255,0,50), partialTicks); + RenderUtils.highlightBlock(start.getBlockPos(EditingContext.getEditingContext().getRoom()), new Color(255,0,0,100), partialTicks); + RenderUtils.highlightBlock(end.getBlockPos(EditingContext.getEditingContext().getRoom()), new Color(0,255,0,100), partialTicks); } public List<OffsetPoint> getBlockPoses() { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java index 58229623..cf617143 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java @@ -156,6 +156,10 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP } public void addAll(List<OffsetPoint> blockPoses) { + ((OffsetPointSet)parameter.getNewData()).getOffsetPointList().addAll(blockPoses); + for (OffsetPoint blockPose : blockPoses) { + MParameters.add(new MOffsetPoint(this, blockPose)); + } } public static class Generator implements ValueEditCreator<ValueEditOffsetPointSet> { |