aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr
diff options
context:
space:
mode:
authorsyeyoung <42869671+cyoung06@users.noreply.github.com>2020-11-26 15:29:13 +0900
committersyeyoung <42869671+cyoung06@users.noreply.github.com>2020-11-26 15:29:13 +0900
commitf1a9ef20465071fd32d662edc22e4dc228ba28aa (patch)
tree1143ef1f501e2be6d582646dca0ed5115b5893b4 /src/main/java/kr
parent282a946c40e8678f13d4998aedd1f4065143a7c7 (diff)
downloadSkyblock-Dungeons-Guide-f1a9ef20465071fd32d662edc22e4dc228ba28aa.tar.gz
Skyblock-Dungeons-Guide-f1a9ef20465071fd32d662edc22e4dc228ba28aa.tar.bz2
Skyblock-Dungeons-Guide-f1a9ef20465071fd32d662edc22e4dc228ba28aa.zip
set edit stuff
Diffstat (limited to 'src/main/java/kr')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java169
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonOffsetPointEdit.java3
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java6
3 files changed, 176 insertions, 2 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java
new file mode 100644
index 00000000..b6275865
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java
@@ -0,0 +1,169 @@
+package kr.syeyoung.dungeonsguide.roomedit.gui;
+
+import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
+import kr.syeyoung.dungeonsguide.roomedit.EditingContext;
+import kr.syeyoung.dungeonsguide.roomedit.MPanel;
+import kr.syeyoung.dungeonsguide.roomedit.elements.*;
+import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditOffsetPointSet;
+import kr.syeyoung.dungeonsguide.utils.RenderUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.util.BlockPos;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GuiDungeonAddSet extends GuiScreen {
+
+ private MPanel mainPanel = new MPanel();
+
+ private ValueEditOffsetPointSet valueEditOffsetPointSet;
+
+ private MButton add;
+ private MButton back;
+
+
+ private OffsetPoint start;
+ private OffsetPoint end;
+
+ public void onWorldRender(float partialTicks) {
+ 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);
+ }
+
+ public List<OffsetPoint> getBlockPoses() {
+ int minX = Math.min(start.getX(), end.getX());
+ int minY = Math.min(start.getY(), end.getY());
+ int minZ = Math.min(start.getZ(), end.getZ());
+ int maxX = Math.max(start.getX(), end.getX());
+ int maxY = Math.max(start.getY(), end.getY());
+ int maxZ = Math.max(start.getZ(), end.getZ());
+
+ List<OffsetPoint> offsetPoints = new ArrayList<OffsetPoint>();
+ for (int z = minZ; z <= maxZ; z++) {
+ for (int x = minX; x <=maxX; x++) {
+ for (int y = maxY; y >= minY; y --) {
+ offsetPoints.add(new OffsetPoint(x,y,z));
+ }
+ }
+ }
+ return offsetPoints;
+ }
+
+ public void add() {
+ valueEditOffsetPointSet.addAll(getBlockPoses());
+ }
+
+ public GuiDungeonAddSet(final ValueEditOffsetPointSet processorParameterEditPane) {
+ this.valueEditOffsetPointSet = processorParameterEditPane;
+ mainPanel.setBackgroundColor(new Color(17, 17, 17, 179));
+ {
+ start = new OffsetPoint(EditingContext.getEditingContext().getRoom(), Minecraft.getMinecraft().thePlayer.getPosition());
+ end = new OffsetPoint(EditingContext.getEditingContext().getRoom(), Minecraft.getMinecraft().thePlayer.getPosition());
+ }
+ {
+ MOffsetPoint mOffsetPoint = new MOffsetPoint(null,start);
+ mOffsetPoint.setBounds(new Rectangle(0,0,150,20));
+ mainPanel.add(mOffsetPoint);
+ MOffsetPoint mOffsetPoint2 = new MOffsetPoint(null,end);
+ mOffsetPoint2.setBounds(new Rectangle(0,20,150,20));
+ mainPanel.add(mOffsetPoint2);
+ }
+ {
+ add = new MButton() {
+ @Override
+ public void resize(int parentWidth, int parentHeight) {
+ setBounds(new Rectangle(0,parentHeight - 20, parentWidth / 2, 20));
+ }
+ };
+ add.setText("Add");
+ add.setBackgroundColor(Color.red);
+ add.setOnActionPerformed(new Runnable() {
+ @Override
+ public void run() {
+ add();
+ EditingContext.getEditingContext().goBack();
+ }
+ });
+
+ back = new MButton(){
+ @Override
+ public void resize(int parentWidth, int parentHeight) {
+ setBounds(new Rectangle(parentWidth / 2,parentHeight - 20, parentWidth / 2, 20));
+ }
+ };
+ back.setText("Go back");
+ back.setBackgroundColor(Color.green);
+ back.setOnActionPerformed(new Runnable() {
+ @Override
+ public void run() {
+ EditingContext.getEditingContext().goBack();
+ }
+ });
+ mainPanel.add(add);
+ mainPanel.add(back);
+ }
+ }
+
+ @Override
+ public void initGui() {
+ super.initGui();
+ // update bounds
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+ mainPanel.setBounds(new Rectangle(10, Math.min((scaledResolution.getScaledHeight() - 300) / 2, scaledResolution.getScaledHeight()),200,300));
+ }
+
+ @Override
+ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+ ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+ GL11.glPushMatrix();
+ GlStateManager.pushAttrib();
+ mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks);
+ GlStateManager.popAttrib();
+ GL11.glPopMatrix();
+ }
+
+ @Override
+ public void keyTyped(char typedChar, int keyCode) throws IOException {
+ super.keyTyped(typedChar, keyCode);
+ mainPanel.keyTyped0(typedChar, keyCode);
+ }
+
+ @Override
+ public void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
+ super.mouseClicked(mouseX, mouseY, mouseButton);
+ mainPanel.mouseClicked0(mouseX, mouseY,mouseX,mouseY, mouseButton);
+ }
+
+ @Override
+ public void mouseReleased(int mouseX, int mouseY, int state) {
+ mainPanel.mouseReleased0(mouseX, mouseY,mouseX,mouseY, state);
+ }
+
+ @Override
+ public void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
+ mainPanel.mouseClickMove0(mouseX,mouseY,mouseX,mouseY,clickedMouseButton,timeSinceLastClick);
+ }
+
+ @Override
+ public void handleMouseInput() throws IOException {
+ super.handleMouseInput();
+
+ int i = Mouse.getEventX() * this.width / this.mc.displayWidth;
+ int j = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
+
+ int wheel = Mouse.getDWheel();
+ if (wheel != 0) {
+ mainPanel.mouseScrolled0(i, j,i,j, wheel);
+ }
+ }
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonOffsetPointEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonOffsetPointEdit.java
index ebdfffdf..ba96eb05 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonOffsetPointEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonOffsetPointEdit.java
@@ -86,7 +86,8 @@ public class GuiDungeonOffsetPointEdit extends GuiScreen {
delete.setOnActionPerformed(new Runnable() {
@Override
public void run() {
- valueEditOffsetPointSet.delete(offsetPoint);
+ if (valueEditOffsetPointSet != null)
+ valueEditOffsetPointSet.delete(offsetPoint);
EditingContext.getEditingContext().goBack();
}
});
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 b8d9feb8..58229623 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java
@@ -8,6 +8,7 @@ import kr.syeyoung.dungeonsguide.roomedit.Parameter;
import kr.syeyoung.dungeonsguide.roomedit.elements.MButton;
import kr.syeyoung.dungeonsguide.roomedit.elements.MOffsetPoint;
import kr.syeyoung.dungeonsguide.roomedit.elements.MParameter;
+import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonAddSet;
import kr.syeyoung.dungeonsguide.utils.RenderUtils;
import lombok.Getter;
import net.minecraft.client.Minecraft;
@@ -119,7 +120,7 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP
addSet.setOnActionPerformed(new Runnable() {
@Override
public void run() {
- //open gui
+ EditingContext.getEditingContext().openGui(new GuiDungeonAddSet(ValueEditOffsetPointSet.this));
}
});
add(add);
@@ -154,6 +155,9 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP
this.setBounds(new Rectangle(0,0,parentWidth, parentHeight));
}
+ public void addAll(List<OffsetPoint> blockPoses) {
+ }
+
public static class Generator implements ValueEditCreator<ValueEditOffsetPointSet> {
@Override