From 214bed9a1335baaa0832a16a500556c26ec71008 Mon Sep 17 00:00:00 2001 From: RaffaeleMorganti Date: Tue, 22 Nov 2022 09:55:26 +0100 Subject: [PATCH] move userInput to method arguments and add some final --- .../java/com/github/dtschust/zork/Zork.java | 53 +++++++++---------- .../github/dtschust/zork/ZorkCondition.java | 2 - .../dtschust/zork/ZorkConditionHas.java | 1 - .../dtschust/zork/ZorkConditionStatus.java | 1 - .../dtschust/zork/{parser => }/ZorkGame.java | 2 +- .../com/github/dtschust/zork/ZorkTrigger.java | 6 +-- .../dtschust/zork/parser/ZorkReader.java | 3 +- .../builders/ZorkContainerParseStrategy.java | 5 +- .../ZorkTriggerListParseStrategy.java | 2 - .../com/github/dtschust/zork/repl/Action.java | 2 +- .../dtschust/zork/repl/ActionDispatcher.java | 2 +- .../dtschust/zork/repl/actions/AddAction.java | 2 +- .../zork/repl/actions/AttackAction.java | 2 +- .../zork/repl/actions/DeleteAction.java | 2 +- .../zork/repl/actions/DropItemAction.java | 2 +- .../zork/repl/actions/GameOverAction.java | 2 +- .../zork/repl/actions/InventoryAction.java | 2 +- .../zork/repl/actions/MoveAction.java | 2 +- .../zork/repl/actions/OpenAction.java | 2 +- .../dtschust/zork/repl/actions/PutAction.java | 2 +- .../zork/repl/actions/ReadAction.java | 2 +- .../zork/repl/actions/TakeAction.java | 2 +- .../zork/repl/actions/TurnOnAction.java | 2 +- .../zork/repl/actions/UpdateAction.java | 2 +- .../zork/types/HasPrintsAndActions.java | 2 +- .../dtschust/zork/types/ZorkContainer.java | 4 +- .../dtschust/zork/types/ZorkCreature.java | 2 +- .../github/dtschust/zork/types/ZorkItem.java | 6 ++- .../github/dtschust/zork/types/ZorkRoom.java | 4 +- 29 files changed, 59 insertions(+), 64 deletions(-) rename src/main/java/com/github/dtschust/zork/{parser => }/ZorkGame.java (95%) diff --git a/src/main/java/com/github/dtschust/zork/Zork.java b/src/main/java/com/github/dtschust/zork/Zork.java index f9ea8ff..f4ce3ed 100644 --- a/src/main/java/com/github/dtschust/zork/Zork.java +++ b/src/main/java/com/github/dtschust/zork/Zork.java @@ -5,7 +5,6 @@ package com.github.dtschust.zork; -import com.github.dtschust.zork.parser.ZorkGame; import com.github.dtschust.zork.parser.ZorkReader; import com.github.dtschust.zork.repl.ActionDispatcher; import com.github.dtschust.zork.types.ZorkContainer; @@ -19,9 +18,8 @@ import static com.github.dtschust.zork.Zork.Type.*; /* And away we go*/ public class Zork { public enum Type {ROOM, ITEM, CONTAINER, CREATURE} - public String userInput; - public ZorkGame game; + ZorkGame game; Scanner source = new Scanner(System.in); public Zork(String filename) { @@ -36,16 +34,15 @@ public class Zork { /* There is no stopping in Zork, until we're done!!*/ while (game.isRunning()) { - userInput = source.nextLine(); + String userInput = source.nextLine(); /*Now that we have the user command, check the input*/ - if (!executeTriggers()) { + if (!executeTriggers(userInput)) { /* If we haven't skipped, perform the user action*/ d.dispatch(userInput); /* Clear the user input, and check the triggers again (various states have changed, gnomes need to be found!*/ - userInput = ""; - executeTriggers(); + executeTriggers(""); } } @@ -64,81 +61,81 @@ public class Zork { } /* Check triggers */ - public boolean executeTriggers() { + public boolean executeTriggers(String input) { /*Variable initialization*/ boolean skip; /*Check Room triggers*/ - skip = doTriggersRoom(); + skip = doTriggersRoom(input); /* Check items in the containers in the room */ - skip = skip || doTriggersItemsInContainersInRoom(); + skip = skip || doTriggersItemsInContainersInRoom(input); /* Check all containers in the room*/ - skip = skip || doTriggersContainersInRoom(); + skip = skip || doTriggersContainersInRoom(input); /* Check all creatures in the room */ - skip = skip || doTriggersCreaturesInRoom(); + skip = skip || doTriggersCreaturesInRoom(input); /* Check items in inventory */ - skip = skip || doTriggersItemsInInventory(); + skip = skip || doTriggersItemsInInventory(input); /* Check items in room */ - skip = skip || doTriggersItemsInRoom(); + skip = skip || doTriggersItemsInRoom(input); return skip; } - private boolean doTriggersContainersInRoom() { + private boolean doTriggersContainersInRoom(String input) { boolean skip = false; for (String key : game.getCurrentRoom().container) { - skip = skip || doZorkTriggers(game.get(CONTAINER, key)); + skip = skip || doZorkTriggers(game.get(CONTAINER, key), input); } return skip; } - private boolean doTriggersItemsInContainersInRoom() { + private boolean doTriggersItemsInContainersInRoom(String input) { boolean skip = false; for (String key : game.getCurrentRoom().container) { ZorkContainer tempContainer = (ZorkContainer) game.get(CONTAINER, key); for (String key2 : tempContainer.item) { - skip = skip || doZorkTriggers(game.get(ITEM, key2)); + skip = skip || doZorkTriggers(game.get(ITEM, key2), input); } } return skip; } - private boolean doTriggersItemsInRoom() { + private boolean doTriggersItemsInRoom(String input) { boolean skip = false; for (String key : game.getCurrentRoom().item) { - skip = skip || doZorkTriggers(game.get(ITEM, key)); + skip = skip || doZorkTriggers(game.get(ITEM, key), input); } return skip; } - private boolean doTriggersItemsInInventory() { + private boolean doTriggersItemsInInventory(String input) { boolean skip = false; for (String key : game.inventory) { - skip = skip || doZorkTriggers(game.get(ITEM, key)); + skip = skip || doZorkTriggers(game.get(ITEM, key), input); } return skip; } - private boolean doTriggersCreaturesInRoom() { + private boolean doTriggersCreaturesInRoom(String input) { boolean skip = false; for (String key : game.getCurrentRoom().creature) { - skip = skip || doZorkTriggers(game.get(CREATURE, key)); + skip = skip || doZorkTriggers(game.get(CREATURE, key), input); } return skip; } - private boolean doTriggersRoom() { - return doZorkTriggers(game.getCurrentRoom()); + private boolean doTriggersRoom(String input) { + return doZorkTriggers(game.getCurrentRoom(), input); } - private boolean doZorkTriggers(ZorkObject zorkObject) { + private boolean doZorkTriggers(ZorkObject zorkObject, String input) { boolean skip = false; Iterator iterator = zorkObject.trigger.iterator(); while (iterator.hasNext()) { ZorkTrigger tempTrigger = iterator.next(); - if (tempTrigger.evaluate(this)) { + if (tempTrigger.evaluate(game, input)) { for (String print : tempTrigger.print) { System.out.println(print); } diff --git a/src/main/java/com/github/dtschust/zork/ZorkCondition.java b/src/main/java/com/github/dtschust/zork/ZorkCondition.java index 4d446f4..3b22297 100644 --- a/src/main/java/com/github/dtschust/zork/ZorkCondition.java +++ b/src/main/java/com/github/dtschust/zork/ZorkCondition.java @@ -1,7 +1,5 @@ package com.github.dtschust.zork; -import com.github.dtschust.zork.parser.ZorkGame; - /* Generic condition*/ public abstract class ZorkCondition { public final String object; diff --git a/src/main/java/com/github/dtschust/zork/ZorkConditionHas.java b/src/main/java/com/github/dtschust/zork/ZorkConditionHas.java index 7afe584..c9ffdf2 100644 --- a/src/main/java/com/github/dtschust/zork/ZorkConditionHas.java +++ b/src/main/java/com/github/dtschust/zork/ZorkConditionHas.java @@ -1,6 +1,5 @@ package com.github.dtschust.zork; -import com.github.dtschust.zork.parser.ZorkGame; import com.github.dtschust.zork.types.ZorkContainer; import com.github.dtschust.zork.types.ZorkRoom; diff --git a/src/main/java/com/github/dtschust/zork/ZorkConditionStatus.java b/src/main/java/com/github/dtschust/zork/ZorkConditionStatus.java index 92d43db..b6c32cd 100644 --- a/src/main/java/com/github/dtschust/zork/ZorkConditionStatus.java +++ b/src/main/java/com/github/dtschust/zork/ZorkConditionStatus.java @@ -1,6 +1,5 @@ package com.github.dtschust.zork; -import com.github.dtschust.zork.parser.ZorkGame; import com.github.dtschust.zork.types.ZorkObject; /* Status conditions*/ diff --git a/src/main/java/com/github/dtschust/zork/parser/ZorkGame.java b/src/main/java/com/github/dtschust/zork/ZorkGame.java similarity index 95% rename from src/main/java/com/github/dtschust/zork/parser/ZorkGame.java rename to src/main/java/com/github/dtschust/zork/ZorkGame.java index c5a3988..02f11be 100644 --- a/src/main/java/com/github/dtschust/zork/parser/ZorkGame.java +++ b/src/main/java/com/github/dtschust/zork/ZorkGame.java @@ -1,4 +1,4 @@ -package com.github.dtschust.zork.parser; +package com.github.dtschust.zork; import com.github.dtschust.zork.Zork.Type; import com.github.dtschust.zork.types.*; diff --git a/src/main/java/com/github/dtschust/zork/ZorkTrigger.java b/src/main/java/com/github/dtschust/zork/ZorkTrigger.java index 1d3d37c..436667b 100644 --- a/src/main/java/com/github/dtschust/zork/ZorkTrigger.java +++ b/src/main/java/com/github/dtschust/zork/ZorkTrigger.java @@ -27,10 +27,10 @@ public class ZorkTrigger { this.type = type; } - public boolean evaluate(Zork zork) { - if (!commands.stream().allMatch(c -> c.matchesInput(zork.userInput))) { + public boolean evaluate(ZorkGame game, String input) { + if (!commands.stream().allMatch(c -> c.matchesInput(input))) { return false; } - return conditions.stream().allMatch(c -> c.evaluate(zork.game)); + return conditions.stream().allMatch(c -> c.evaluate(game)); } } diff --git a/src/main/java/com/github/dtschust/zork/parser/ZorkReader.java b/src/main/java/com/github/dtschust/zork/parser/ZorkReader.java index d6d7224..803aa9a 100644 --- a/src/main/java/com/github/dtschust/zork/parser/ZorkReader.java +++ b/src/main/java/com/github/dtschust/zork/parser/ZorkReader.java @@ -1,6 +1,7 @@ package com.github.dtschust.zork.parser; import com.github.dtschust.zork.ZorkCondition; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.ZorkTrigger; import com.github.dtschust.zork.parser.builders.Parsers; import com.github.dtschust.zork.parser.dom.Elements; @@ -208,7 +209,7 @@ public class ZorkReader { } } } catch (Exception e) { - e.printStackTrace(); + // e.printStackTrace(); System.out.println("Invalid XML file, exiting"); System.exit(-1); } diff --git a/src/main/java/com/github/dtschust/zork/parser/builders/ZorkContainerParseStrategy.java b/src/main/java/com/github/dtschust/zork/parser/builders/ZorkContainerParseStrategy.java index 7e3dc00..79d344c 100644 --- a/src/main/java/com/github/dtschust/zork/parser/builders/ZorkContainerParseStrategy.java +++ b/src/main/java/com/github/dtschust/zork/parser/builders/ZorkContainerParseStrategy.java @@ -30,11 +30,8 @@ public class ZorkContainerParseStrategy implements ZorkParseStrategy accepts = Elements.innerTextByTagName(element, "accept"); - // If a container has an accepts attribute, then it is always open - final boolean open = !accepts.isEmpty(); - final List items = Elements.innerTextByTagName(element, "item"); - return new ZorkContainer(name, description, open, status, items, accepts, triggers); + return new ZorkContainer(name, description, status, items, accepts, triggers); } } diff --git a/src/main/java/com/github/dtschust/zork/parser/builders/ZorkTriggerListParseStrategy.java b/src/main/java/com/github/dtschust/zork/parser/builders/ZorkTriggerListParseStrategy.java index 336c9c2..6e81326 100644 --- a/src/main/java/com/github/dtschust/zork/parser/builders/ZorkTriggerListParseStrategy.java +++ b/src/main/java/com/github/dtschust/zork/parser/builders/ZorkTriggerListParseStrategy.java @@ -27,8 +27,6 @@ public class ZorkTriggerListParseStrategy implements ZorkParseStrategy conditions = Elements.byTagName(trigger, "condition").stream() .map(conditionStrategy::parse) .collect(Collectors.toList()); diff --git a/src/main/java/com/github/dtschust/zork/repl/Action.java b/src/main/java/com/github/dtschust/zork/repl/Action.java index ed9fd1c..2751b62 100644 --- a/src/main/java/com/github/dtschust/zork/repl/Action.java +++ b/src/main/java/com/github/dtschust/zork/repl/Action.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import java.util.List; diff --git a/src/main/java/com/github/dtschust/zork/repl/ActionDispatcher.java b/src/main/java/com/github/dtschust/zork/repl/ActionDispatcher.java index 1ee6177..e3d574d 100644 --- a/src/main/java/com/github/dtschust/zork/repl/ActionDispatcher.java +++ b/src/main/java/com/github/dtschust/zork/repl/ActionDispatcher.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.actions.*; import java.util.Arrays; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/AddAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/AddAction.java index a8f4a71..14e20b3 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/AddAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/AddAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.Zork.Type; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.HasSetOfCollectable; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/AttackAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/AttackAction.java index faa9663..9cd7c52 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/AttackAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/AttackAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkCreature; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/DeleteAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/DeleteAction.java index 6ee5b18..32c0e4d 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/DeleteAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/DeleteAction.java @@ -1,7 +1,7 @@ package com.github.dtschust.zork.repl.actions; import com.github.dtschust.zork.Zork.Type; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.HasSetOfCollectable; import com.github.dtschust.zork.types.ZorkObject; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/DropItemAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/DropItemAction.java index 509c9e0..119aa93 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/DropItemAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/DropItemAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkRoom; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/GameOverAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/GameOverAction.java index 25b07d2..294dd5e 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/GameOverAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/GameOverAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import java.util.List; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/InventoryAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/InventoryAction.java index d9f4a32..34fc1b2 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/InventoryAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/InventoryAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import java.util.List; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java index 81753ad..b43503d 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/MoveAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import java.util.List; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/OpenAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/OpenAction.java index 9fc2b00..2a905c3 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/OpenAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/OpenAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkContainer; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/PutAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/PutAction.java index 32060cb..162eb0d 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/PutAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/PutAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkContainer; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/ReadAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/ReadAction.java index 0781734..1a0144c 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/ReadAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/ReadAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkItem; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/TakeAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/TakeAction.java index b0c87b8..bfac122 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/TakeAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/TakeAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkContainer; import com.github.dtschust.zork.types.ZorkRoom; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/TurnOnAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/TurnOnAction.java index 6f6af66..f1b343a 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/TurnOnAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/TurnOnAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkItem; diff --git a/src/main/java/com/github/dtschust/zork/repl/actions/UpdateAction.java b/src/main/java/com/github/dtschust/zork/repl/actions/UpdateAction.java index 63d367e..79afd77 100644 --- a/src/main/java/com/github/dtschust/zork/repl/actions/UpdateAction.java +++ b/src/main/java/com/github/dtschust/zork/repl/actions/UpdateAction.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.repl.actions; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.Action; import com.github.dtschust.zork.types.ZorkMap; import com.github.dtschust.zork.types.ZorkObject; diff --git a/src/main/java/com/github/dtschust/zork/types/HasPrintsAndActions.java b/src/main/java/com/github/dtschust/zork/types/HasPrintsAndActions.java index b3a422f..9c4e430 100644 --- a/src/main/java/com/github/dtschust/zork/types/HasPrintsAndActions.java +++ b/src/main/java/com/github/dtschust/zork/types/HasPrintsAndActions.java @@ -1,6 +1,6 @@ package com.github.dtschust.zork.types; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import com.github.dtschust.zork.repl.ActionDispatcher; import java.util.List; diff --git a/src/main/java/com/github/dtschust/zork/types/ZorkContainer.java b/src/main/java/com/github/dtschust/zork/types/ZorkContainer.java index bafae0f..56c9395 100644 --- a/src/main/java/com/github/dtschust/zork/types/ZorkContainer.java +++ b/src/main/java/com/github/dtschust/zork/types/ZorkContainer.java @@ -15,13 +15,13 @@ public class ZorkContainer extends ZorkObject implements HasSetOfCollectable { public ZorkContainer(final String name, final String description, - final boolean open, final String status, final Collection items, final Collection accepts, final Collection triggers) { super(name, description, status, triggers); - this.open = open; + // If a container has an accepts attribute, then it is always open + this.open = !accepts.isEmpty(); this.item = new HashSet<>(items); this.accepts = new ArrayList<>(accepts); } diff --git a/src/main/java/com/github/dtschust/zork/types/ZorkCreature.java b/src/main/java/com/github/dtschust/zork/types/ZorkCreature.java index 082237a..7231396 100644 --- a/src/main/java/com/github/dtschust/zork/types/ZorkCreature.java +++ b/src/main/java/com/github/dtschust/zork/types/ZorkCreature.java @@ -1,7 +1,7 @@ package com.github.dtschust.zork.types; import com.github.dtschust.zork.ZorkCondition; -import com.github.dtschust.zork.parser.ZorkGame; +import com.github.dtschust.zork.ZorkGame; import java.util.*; diff --git a/src/main/java/com/github/dtschust/zork/types/ZorkItem.java b/src/main/java/com/github/dtschust/zork/types/ZorkItem.java index 622f26f..e87452b 100644 --- a/src/main/java/com/github/dtschust/zork/types/ZorkItem.java +++ b/src/main/java/com/github/dtschust/zork/types/ZorkItem.java @@ -10,7 +10,11 @@ public class ZorkItem extends ZorkObject implements HasPrintsAndActions { private final List turnOnPrint; private final List turnOnAction; - public ZorkItem(String name, String description, String writing, List turnOnPrint, List turnOnAction) { + public ZorkItem(final String name, + final String description, + final String writing, + final List turnOnPrint, + final List turnOnAction) { super(name, description); this.writing = writing; this.turnOnPrint = new ArrayList<>(turnOnPrint); diff --git a/src/main/java/com/github/dtschust/zork/types/ZorkRoom.java b/src/main/java/com/github/dtschust/zork/types/ZorkRoom.java index 39d88e9..8bfffa2 100644 --- a/src/main/java/com/github/dtschust/zork/types/ZorkRoom.java +++ b/src/main/java/com/github/dtschust/zork/types/ZorkRoom.java @@ -15,7 +15,9 @@ public class ZorkRoom extends ZorkObject implements HasSetOfCollectable { public final Set item = new HashSet<>(); public final Set creature = new HashSet<>(); - public ZorkRoom(String name, String description, String type) { + public ZorkRoom(final String name, + final String description, + final String type) { super(name, description); this.type = type; }