Changeset 4d8825f in lost-haven

Timestamp:

Feb 22, 2021, 2:07:11 AM (4 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

3d64884

Parents:

b2d7893

Message:

Add logic to make text files readable from inside a JAR

Files:

• main/LostHavenRPG.java (modified) (3 diffs)
• main/Map.java (modified) (1 diff)
• main/Utils.java (added)
• makefile (modified) (2 diffs)

main/LostHavenRPG.java

@@ -385 +385 @@
     creatureMap = new HashMap<CreatureType, Creature>();
     try {
-      BufferedReader in = new BufferedReader(new FileReader("creatures.txt"));
+      BufferedReader in = Utils.loadTextFile("creatures.txt");
       while (in.ready()) {
         Creature cr = Creature.loadTemplate(in);
@@ -405 +405 @@
     spawnPoints = new LinkedList<SpawnPoint>();
     try {
-      BufferedReader in = new BufferedReader(new FileReader("spawnPoints.txt"));
+      BufferedReader in = Utils.loadTextFile("spawnPoints.txt");
       while (in.ready()) {
         Creature type = creatureMap.get(CreatureType.valueOf(in.readLine()));
@@ -440 +440 @@
       imgBow[6] = ImageIO.read(getClass().getResource("/images/projectiles/bowWW.png"));
       imgBow[7] = ImageIO.read(getClass().getResource("/images/projectiles/bowNW.png"));
-      BufferedReader in = new BufferedReader(new FileReader("items.txt"));
+      BufferedReader in = Utils.loadTextFile("items.txt");
       while (in.ready()) {
         Item item;

main/Map.java

@@ -68 +68 @@
           }
         }
-        BufferedReader in = new BufferedReader(new FileReader(structFile));
+        BufferedReader in = Utils.loadTextFile(structFile);
         String str;
         while ((str = in.readLine()) != null) {

makefile

@@ -1 +1 @@
 GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Listable.class gamegui/Member.class gamegui/MultiTextbox.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Textbox.class gamegui/Window.class
 
-MAIN_DEPS = main/Action.class main/AreaOfEffect.class main/ArtifactPoint.class main/AttackType.class main/Attribute.class main/AuxState.class main/ChangeDamage.class main/Confuse.class main/Creature.class main/CreatureType.class main/Damage.class main/Direction.class main/Disable.class main/GameState.class main/Effect.class main/EffectType.class main/EquippedWeapon.class main/Gem.class main/Item.class main/ItemDrop.class main/ItemType.class main/Land.class main/LandType.class main/Location.class main/LostHavenRPG.class main/ManaDrain.class main/Map.class main/MapElement.class main/Model.class main/MoveSpeed.class main/Penetrate.class main/Player.class main/Point.class main/ProjectileSpeed.class main/RespawnPoint.class main/Skill.class main/SpawnPoint.class main/Structure.class main/StructureType.class main/TargetType.class main/TimedEffect.class main/Weapon.class
+MAIN_DEPS = main/Action.class main/AreaOfEffect.class main/ArtifactPoint.class main/AttackType.class main/Attribute.class main/AuxState.class main/ChangeDamage.class main/Confuse.class main/Creature.class main/CreatureType.class main/Damage.class main/Direction.class main/Disable.class main/GameState.class main/Effect.class main/EffectType.class main/EquippedWeapon.class main/Gem.class main/Item.class main/ItemDrop.class main/ItemType.class main/Land.class main/LandType.class main/Location.class main/LostHavenRPG.class main/ManaDrain.class main/Map.class main/MapElement.class main/Model.class main/MoveSpeed.class main/Penetrate.class main/Player.class main/Point.class main/ProjectileSpeed.class main/RespawnPoint.class main/Skill.class main/SpawnPoint.class main/Structure.class main/StructureType.class main/TargetType.class main/TimedEffect.class main/Utils.class main/Weapon.class
 
 GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
@@ -9 +9 @@
 
 IMAGE_FILE_DEPS = images/*.png images/*/*.png images/*/*/*.png
-MAP_FIL_DEPS =
+DATA_FILE_DEPS = creatures.txt items.txt spawnPoints.txt structInfo2.txt
 
 CLASS_DEPS = $(MAIN_DEPS) $(GAMEGUI_DEPS)
-FILE_DEPS = $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
+FILE_DEPS = $(IMAGE_FILE_DEPS) $(DATA_FILE_DEPS)
 
 LostHaven: $(CLASS_DEPS) $(FILE_DEPS)