aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorsyeyoung <cyong06@naver.com>2021-08-11 16:24:46 +0900
committersyeyoung <cyong06@naver.com>2021-08-11 16:24:46 +0900
commit3cc57a96a3ba4c512c006516fc9a8f5374f8198e (patch)
tree2461edf244f3e0672d0ff6776579ed5df660f1e3 /src/main/java
parent21ec99c3e45e4557e228d026c148207b1227c14b (diff)
downloadSkyblock-Dungeons-Guide-3cc57a96a3ba4c512c006516fc9a8f5374f8198e.tar.gz
Skyblock-Dungeons-Guide-3cc57a96a3ba4c512c006516fc9a8f5374f8198e.tar.bz2
Skyblock-Dungeons-Guide-3cc57a96a3ba4c512c006516fc9a8f5374f8198e.zip
- New room (Lava-pool-3)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java2
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java3
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java3
3 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
index 85fa3d3f..6e30de54 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
@@ -428,7 +428,7 @@ public class CommandDungeonsGuide extends CommandBase {
} else if (args[0].equals("createFakeRoom")&& Minecraft.getMinecraft().getSession().getPlayerID().replace("-", "").equals("e686fe0aab804a71ac7011dc8c2b534c")) {
// load schematic
- File f=new File(DungeonsGuide.getDungeonsGuide().getConfigDir(), "schematics/Pillars-9fa09d68-c483-4320-872e-9e07b049ee37-a92c0ec6-e125-451a-8518-56e68d9cb463.schematic");
+ File f=new File(DungeonsGuide.getDungeonsGuide().getConfigDir(), "schematics/new roonm-b2df250c-4af2-4201-963c-0ee1cb6bd3de-5efb1f0c-c05f-4064-bde7-cad0874fdf39.schematic");
NBTTagCompound compound;
try {
compound = CompressedStreamTools.readCompressed(new FileInputStream(f));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java
index 7b0aa34d..d719185d 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/ProcessorParameterEditPane.java
@@ -56,6 +56,7 @@ public class ProcessorParameterEditPane extends MPanel implements DynamicEditor
public void run() {
MParameter parameter;
parameters.add(parameter = new MParameter(new Parameter(UUID.randomUUID().toString(), null, null), ProcessorParameterEditPane.this));
+ parameter.setParent(ProcessorParameterEditPane.this);
parameter.setBounds(new Rectangle(0,0,getBounds().width, 20));
}
});
@@ -80,6 +81,7 @@ public class ProcessorParameterEditPane extends MPanel implements DynamicEditor
}
}
});
+ create.setParent(this); save.setParent(this);
}
{
for (Map.Entry<String, Object> en : dungeonRoom.getDungeonRoomInfo().getProperties().entrySet()) {
@@ -88,6 +90,7 @@ public class ProcessorParameterEditPane extends MPanel implements DynamicEditor
MParameter mParameter = new MParameter(new Parameter(en.getKey(), vec.cloneObj(en.getValue()), vec.cloneObj(en.getValue())), this);
mParameter.setBounds(new Rectangle(0,0,getBounds().width,20));
parameters.add(mParameter);
+ mParameter.setParent(this);
}
}
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java
index 15ef2c05..70b3e381 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/panes/SecretEditPane.java
@@ -58,6 +58,7 @@ public class SecretEditPane extends MPanel implements DynamicEditor {
MParameter parameter;
parameters.add(parameter = new MParameter(new Parameter(uid, data, data), SecretEditPane.this));
parameter.setBounds(new Rectangle(0,0,getBounds().width, 20));
+ parameter.setParent(SecretEditPane.this);
}
public void buildElements() {
@@ -93,6 +94,7 @@ public class SecretEditPane extends MPanel implements DynamicEditor {
}
}
});
+ create.setParent(this); save.setParent(this);
}
{
for (Map.Entry<String, DungeonMechanic> en : dungeonRoom.getDungeonRoomInfo().getMechanics().entrySet()) {
@@ -101,6 +103,7 @@ public class SecretEditPane extends MPanel implements DynamicEditor {
MParameter mParameter = new MParameter(new Parameter(en.getKey(), vec.cloneObj(en.getValue()), vec.cloneObj(en.getValue())), this);
mParameter.setBounds(new Rectangle(0,0,getBounds().width,20));
parameters.add(mParameter);
+ mParameter.setParent(this);
}
}
}