From 5a44ac53e057259e9452d4cd384cf61cafc3b9fc Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 31 Aug 2016 21:05:29 -0400 Subject: [PATCH] Temporarily removed the dungeon stuff so that it doesn't crash. --- changelog.txt | 5 +++ .../item/sigil/ItemSigilDivination.java | 3 +- .../bloodmagic/structures/DungeonRoom.java | 1 + .../structures/DungeonRoomLoader.java | 35 ++++++++------- .../bloodmagic/structures/ModDungeons.java | 12 ++--- .../{-1930356124.json => Corridor1.json} | 1 + .../bloodmagic/schematics/HallChest1.json | 41 ++++++++++++++++++ .../bloodmagic/structures/HallChest1.nbt | Bin 0 -> 1973 bytes 8 files changed, 76 insertions(+), 22 deletions(-) rename src/main/resources/assets/bloodmagic/schematics/{-1930356124.json => Corridor1.json} (96%) create mode 100644 src/main/resources/assets/bloodmagic/schematics/HallChest1.json create mode 100644 src/main/resources/assets/bloodmagic/structures/HallChest1.nbt diff --git a/changelog.txt b/changelog.txt index 9c3c3bf2..03a6696e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +------------------------------------------------------ +Version 2.0.4-58 +------------------------------------------------------ +- Temporarily removed the dungeon stuff so that it doesn't crash. + ------------------------------------------------------ Version 2.0.4-57 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index 653e8c6c..8dbe5b5f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -12,11 +12,12 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IAltarReader; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.entity.mob.EntityMimic; +import WayofTime.bloodmagic.structures.DungeonTester; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NumeralHelper; diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index f7d7a495..ed72b577 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -17,6 +17,7 @@ import WayofTime.bloodmagic.api.ritual.AreaDescriptor; public class DungeonRoom { + public int dungeonWeight = 1; public Map structureMap = new HashMap(); public Map> doorMap = new HashMap>(); //Map of doors. The EnumFacing indicates what way this door faces. diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java index f21614fb..6f12b4dc 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java @@ -28,22 +28,27 @@ public class DungeonRoomLoader { for (DungeonRoom room : DungeonRoomRegistry.dungeonWeightMap.keySet()) { - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - String json = gson.toJson(room); + saveSingleDungeon(room); + } + } - Writer writer; - try - { - File file = new File("config/BloodMagic/schematics"); - file.mkdirs(); + public static void saveSingleDungeon(DungeonRoom room) + { + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + String json = gson.toJson(room); - writer = new FileWriter("config/BloodMagic/schematics/" + new Random().nextInt() + ".json"); - writer.write(json); - writer.close(); - } catch (IOException e) - { - e.printStackTrace(); - } + Writer writer; + try + { + File file = new File("config/BloodMagic/schematics"); + file.mkdirs(); + + writer = new FileWriter("config/BloodMagic/schematics/" + new Random().nextInt() + ".json"); + writer.write(json); + writer.close(); + } catch (IOException e) + { + e.printStackTrace(); } } @@ -65,7 +70,7 @@ public class DungeonRoomLoader br = new BufferedReader(new FileReader(f)); DungeonRoom room = gson.fromJson(br, DungeonRoom.class); - DungeonRoomRegistry.registerDungeonRoom(room, 1); + DungeonRoomRegistry.registerDungeonRoom(room, Math.max(1, room.dungeonWeight)); } } catch (FileNotFoundException e) { diff --git a/src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java b/src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java index 021d9464..20324407 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java +++ b/src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java @@ -4,25 +4,25 @@ public class ModDungeons { public static void init() { -// ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "Corridor1"); +// ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "HallChest1"); // // Map structureMap = new HashMap(); // structureMap.put(resource.toString(), new BlockPos(0, 0, 0)); // // Map> doorMap = new HashMap>(); // List descriptorList = new ArrayList(); -// descriptorList.add(new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 5, 3, 7)); +// descriptorList.add(new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 12, 5, 9)); // -// DungeonUtil.addRoom(doorMap, EnumFacing.NORTH, new BlockPos(3, 0, 0)); -// DungeonUtil.addRoom(doorMap, EnumFacing.SOUTH, new BlockPos(3, 0, 6)); -// DungeonUtil.addRoom(doorMap, EnumFacing.WEST, new BlockPos(0, 0, 3)); +// DungeonUtil.addRoom(doorMap, EnumFacing.EAST, new BlockPos(11, 0, 4)); +// DungeonUtil.addRoom(doorMap, EnumFacing.WEST, new BlockPos(0, 0, 4)); // // DungeonRoom room = new DungeonRoom(structureMap, doorMap, descriptorList); +// DungeonRoomLoader.saveSingleDungeon(room); // // DungeonRoomRegistry.registerDungeonRoom(room, 1); // // DungeonRoomLoader.saveDungeons(); - DungeonRoomLoader.loadDungeons(); +// DungeonRoomLoader.loadDungeons(); } } diff --git a/src/main/resources/assets/bloodmagic/schematics/-1930356124.json b/src/main/resources/assets/bloodmagic/schematics/Corridor1.json similarity index 96% rename from src/main/resources/assets/bloodmagic/schematics/-1930356124.json rename to src/main/resources/assets/bloodmagic/schematics/Corridor1.json index a5029314..7e60e3f4 100644 --- a/src/main/resources/assets/bloodmagic/schematics/-1930356124.json +++ b/src/main/resources/assets/bloodmagic/schematics/Corridor1.json @@ -1,4 +1,5 @@ { + "dungeonWeight": 4, "structureMap": { "bloodmagic:Corridor1": { "x": 0, diff --git a/src/main/resources/assets/bloodmagic/schematics/HallChest1.json b/src/main/resources/assets/bloodmagic/schematics/HallChest1.json new file mode 100644 index 00000000..43d78664 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/schematics/HallChest1.json @@ -0,0 +1,41 @@ +{ + "structureMap": { + "bloodmagic:HallChest1": { + "x": 0, + "y": 0, + "z": 0 + } + }, + "doorMap": { + "west": [ + { + "x": 0, + "y": 0, + "z": 4 + } + ], + "east": [ + { + "x": 11, + "y": 0, + "z": 4 + } + ] + }, + "descriptorList": [ + { + "minimumOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "maximumOffset": { + "x": 12, + "y": 5, + "z": 9 + }, + "blockPosCache": [], + "cache": true + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/structures/HallChest1.nbt b/src/main/resources/assets/bloodmagic/structures/HallChest1.nbt new file mode 100644 index 0000000000000000000000000000000000000000..2962206b74ba204604c89ee07357d2de296807ba GIT binary patch literal 1973 zcmZuxc~nzZ8V@mH(YmnMNVUKb4Mk~r7-B&{int6l;F*JSEEJM=3{8v)r7=JZfo#~p zkzi29CM<%Lnw-NSVr6UC5~Ly;lBi)36e#30=^>(1LtsJ(nHQazR@(Q+{o{T2e)sqN zmK#{=348OkKFi5@I^eCE-nr;}^|%xNlv%%Z?-hr&7a>=^!V+7l- zeRoLtCMG>mHQ>gHOw@)k4<09<9247Wh^#u>>RVR zZ=!?|L0S&o%8soWMXfg$d}h$8NtI1aKVa*@zd!g4+y(?lf+XMX@s=QN#;r-^rI}-S z`xb@Bem4VB-@wov>}{ES7E|{Q&Rf{h@BVY)cHqUhXwr7DcZfbhd@e}_x>p1Je0P+a#PiI~O(E-~tYfz6-Pc;et_Xe+0Hjs{2GqhN>rkC+-J@JGea8^Lt;aoySS z-7w#Tn~0gLO)^;XNHm|VAcp}dfPC>|pC80*v>+o1kh2vi*?H-fPHuaa!Pz!=%*n0~ zt)#PamI(nS%VnY6KK-H(<<)I_HT{&6eJjYlf?3EQW)MSW{TZ5JOflGXYdjJfLj?^C zyde~Z;o~J#c`Iia?dfPp_FKB)?;%9te3ouhLPLUk0Hnlg{!Sxzm!qL9mrLn~8+gB} z5a4#eO9E+!dw1!E^-c!$JL^$QF!1gckN?e<1+E2r0dvF$^hn~M7}JjR$VsLQ_Tsm# zgVzBrBg1hlT=yY1yI`G^>CJ!aFrS?PyFyAvY(%U2d1#b zLy%>Ls8~KjtMV(S!s&yphtrjjn6=WI&6|ahQ`k4c`T%J_UN|JTMey80lxd5>bX`pS z83_0~W3nMlO7|#-?*R@0 za??L+BdG6Rv0vXSH~Gm4RljG>69Qh4x7S?d&XAE0_YM{5Ab04xGkgJ3CK=?mJ;+3aCu1pm#IOUVj|&+91iCL9(2tg4`{U9|%;#v$M_qauIK zSm3~?=~^jqgn6MW-LLcI1NckegF7T6mb-GOa?0`e&uU-ibBCqa@D^y?)#ti?x$BQe zRn|qXm0E334^3(9{htb5x?X3xuKc!wx(R1yOkZmxYofqd0E*-rW2KI=AeJGRON@R< zSKa%ox^I_sXkU-ReEE*x(n8&Mi}CA`aLsRl@I2h1Jgu)nb!V&rpa-HZW?n1fL86+y zuS8WvjGA9oy6p0(^z9gVO0C^!IU)F$6WQsO17?Or| zKp}?KoMcA^=&JU%tYjwX4wmnBVNl@&6itGh015RmWpOn=SH*?k4;ijFb=j+0q&7@v zO)j&TQO}%23x~ZpYBSMh=*`vQFE|$+ohKhCQ%Vel1uKD)f_?oENKzq!J&Te}dC?<8( zHKZ2V)e8JavzHBFA>XT~pQwK_YBUsXF+w@(bFQOjDqCANbdC2yzuch?j_%3xA{2R_ z7A=(M&ENQ^shj>X6BzDIGUQwOZcFDo`((CU#eI>Et6l7mr{$XzyPh5*+b(zDo4oUazoIpO51>coP