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 00000000..2962206b Binary files /dev/null and b/src/main/resources/assets/bloodmagic/structures/HallChest1.nbt differ