lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix reading dungeon files (#899)

Browse source 
Now requires new rooms to be registered in `resources/assets/bloodmagic/schematics/Schematics.json`. This *can* be overwritten by a resource pack, so adding new rooms is still possible. Also allows sub-folders, so sorting rooms is now possible (sort by themes maybe?)
This commit is contained in:
Nicholas Ignoffo 2016-08-31 20:32:31 -07:00
parent 5a44ac53e0
commit 58150ab075
3 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java
View file

@ -1,16 +1,17 @@
package WayofTime.bloodmagic.structures; package WayofTime.bloodmagic.structures;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.Writer; import java.io.Writer;
import java.net.URL;
import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.server.MinecraftServer; import com.google.common.base.Charsets;
import com.google.common.io.Resources;
import com.google.common.reflect.TypeToken;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -54,25 +55,20 @@ public class DungeonRoomLoader
public static void loadDungeons() public static void loadDungeons()
{ {
// String folder = "config/BloodMagic/schematics";
Gson gson = new GsonBuilder().setPrettyPrinting().registerTypeAdapter(EnumFacing.class, Adapters.adapter).create(); Gson gson = new GsonBuilder().setPrettyPrinting().registerTypeAdapter(EnumFacing.class, Adapters.adapter).create();
File file = new File(MinecraftServer.class.getResource("/assets/" + "BloodMagic" + "/schematics").getFile());
File[] files = file.listFiles();
BufferedReader br;
try try
{ {
for (File f : files) URL schematicURL = DungeonRoomLoader.class.getResource(resLocToResourcePath(new ResourceLocation("bloodmagic:Schematics")));
List<String> schematics = gson.fromJson(Resources.toString(schematicURL, Charsets.UTF_8), new TypeToken<List<String>>(){}.getType());
for (String schematicKey : schematics)
{ {
System.out.println("File: " + f); ResourceLocation schematic = new ResourceLocation(schematicKey);
br = new BufferedReader(new FileReader(f)); URL dungeonURL = DungeonRoomLoader.class.getResource(resLocToResourcePath(schematic));
DungeonRoom dungeonRoom = gson.fromJson(Resources.toString(dungeonURL, Charsets.UTF_8), DungeonRoom.class);
DungeonRoom room = gson.fromJson(br, DungeonRoom.class); DungeonRoomRegistry.registerDungeonRoom(dungeonRoom, Math.max(1, dungeonRoom.dungeonWeight));
DungeonRoomRegistry.registerDungeonRoom(room, Math.max(1, room.dungeonWeight));
} }
} catch (FileNotFoundException e) } catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -87,7 +83,7 @@ public class DungeonRoomLoader
try try
{ {
inputstream = MinecraftServer.class.getResourceAsStream("/assets/" + s + "/schematics/" + s1 + ".nbt"); inputstream = DungeonRoomLoader.class.getResourceAsStream("/assets/" + s + "/schematics/" + s1 + ".nbt");
// this.readTemplateFromStream(s1, inputstream); // this.readTemplateFromStream(s1, inputstream);
return; return;
} catch (Throwable var10) } catch (Throwable var10)
@ -98,4 +94,9 @@ public class DungeonRoomLoader
IOUtils.closeQuietly(inputstream); IOUtils.closeQuietly(inputstream);
} }
} }
public static String resLocToResourcePath(ResourceLocation resourceLocation)
{
return "/assets/" + resourceLocation.getResourceDomain() + "/schematics/" + resourceLocation.getResourcePath() + ".json";
}
} }

2
src/main/java/WayofTime/bloodmagic/structures/ModDungeons.java
View file

@ -23,6 +23,6 @@ public class ModDungeons
// //
// DungeonRoomLoader.saveDungeons(); // DungeonRoomLoader.saveDungeons();
// DungeonRoomLoader.loadDungeons(); DungeonRoomLoader.loadDungeons();
} }
} }

4
src/main/resources/assets/bloodmagic/schematics/Schematics.json Normal file
View file

@ -0,0 +1,4 @@
[
"bloodmagic:Corridor1",
"bloodmagic:HallChest1"
]