diff options
author | syeyoung <cyong06@naver.com> | 2021-08-11 16:24:46 +0900 |
---|---|---|
committer | syeyoung <cyong06@naver.com> | 2021-08-11 16:24:46 +0900 |
commit | 3cc57a96a3ba4c512c006516fc9a8f5374f8198e (patch) | |
tree | 2461edf244f3e0672d0ff6776579ed5df660f1e3 /src/main | |
parent | 21ec99c3e45e4557e228d026c148207b1227c14b (diff) | |
download | Skyblock-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')
5 files changed, 8 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); } } } diff --git a/src/main/resources/roomdata/b2df250c-4af2-4201-963c-0ee1cb6bd3de.roomdata b/src/main/resources/roomdata/b2df250c-4af2-4201-963c-0ee1cb6bd3de.roomdata Binary files differnew file mode 100644 index 00000000..d302623d --- /dev/null +++ b/src/main/resources/roomdata/b2df250c-4af2-4201-963c-0ee1cb6bd3de.roomdata diff --git a/src/main/resources/roomdata/datas.txt b/src/main/resources/roomdata/datas.txt index b261ccf5..a4e2082f 100644 --- a/src/main/resources/roomdata/datas.txt +++ b/src/main/resources/roomdata/datas.txt @@ -98,6 +98,7 @@ roomdata/05ba6123-3468-4ec3-8e32-0553a8e5d3b2.roomdata roomdata/63634341-8ef3-4197-aafa-17f5875dd307.roomdata roomdata/a0c57185-4e1a-4fdd-979d-6ed0957e78fb.roomdata roomdata/43c74bd0-77f6-4a2b-8edb-c227a72abf0f.roomdata +roomdata/b2df250c-4af2-4201-963c-0ee1cb6bd3de.roomdata roomdata/25956a46-7094-4a9e-b5d9-c9f8291ffef4.roomdata roomdata/7a594650-2a42-46e5-81a6-9b7d198e9c1c.roomdata roomdata/c6ebcdb2-4ea8-4387-b997-031bd56f7e3b.roomdata |