From 21fccee0df73dd9bbc1b3d554146ce58dc60886c Mon Sep 17 00:00:00 2001 From: punchready Date: Sun, 2 May 2021 00:19:01 +0200 Subject: [PATCH] fix: fix formatting --- .../gamelibrary/entities/EntityID.java | 1 - .../gamelibrary/events/EventBuilder.java | 24 ++++++++----------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java index a855563..a06fbe4 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java @@ -45,7 +45,6 @@ public class EntityID { return "["+type.toString()+":"+id+"]"; } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java index fff5c60..e4c629f 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java @@ -8,13 +8,10 @@ import uulm.teamname.marvelous.gamelibrary.entities.StoneType; import java.util.HashMap; /** - * A class made for building all sorts of {@link Event}s as nicely as possible. It works by taking - * .with[KEY]() functions and then building a specific event at the end + * A class made for building all sorts of {@link Event}s as nicely as possible. + * It works by taking .with[KEY]() functions and then building a specific event at the end. */ public class EventBuilder { - - // variable definitions (as in all possible keys) - /** The type of event that is being built */ private EventType type; // Keys used primarily in EntityEvents, but also in others @@ -38,7 +35,7 @@ public class EventBuilder { private String message; private int timeLeft; - // Keys used primarily in GamestateEvents + // Keys used primarily in GameStateEvents private Entity[] entities; private EntityID[] turnOrder; private EntityID activeCharacter; @@ -49,14 +46,13 @@ public class EventBuilder { private HashMap customContent; /** - * Creates an empty {@link EventBuilder} used for building {@link Event}s + * Creates a new {@link EventBuilder} used for building {@link Event}s */ public EventBuilder () { } - - // With for builder pattern style things + // with for builder pattern style things public EventBuilder withType(EventType type) { this.type = type; @@ -189,11 +185,11 @@ public class EventBuilder { /** * Builds an {@link EntityEvent} from the values given to the builder. - *
    - *
  • type is the {@link EventType} of the EntityEvent
  • - *
  • targetEntity is the target {@link Entity}
  • - *
  • targetField is the target field in the form of an {@link IntVector2}
  • - *
  • amount is the amount of something, like damage. It's an int.
  • + *
      + *
    • type is the {@link EventType} of the EntityEvent
    • + *
    • targetEntity is the target {@link Entity}
    • + *
    • targetField is the target field in the form of an {@link IntVector2}
    • + *
    • amount is the amount of something, like damage. It's an int.
    • *
    * @return a {@link EntityEvent} based on the builder. Caution: non-given fields are null! */