fixes i guess

.gitignore

@@ -22,6 +22,7 @@ hs_err_pid*
 # Maven
 log/
 target/
+target/*
 /target/
 
 # Inclusions

pom.xml

@@ -71,6 +71,7 @@
                 <mainClass>hugone.App</mainClass>
               </manifest>
             </archive>
+            <appendAssemblyId>false</appendAssemblyId>
             <descriptorRefs>
               <descriptorRef>jar-with-dependencies</descriptorRef>
             </descriptorRefs>

src/main/java/hugone/App.java

@@ -10,8 +10,6 @@
 import hugone.util.Utils;
 
 class App {
-  public static java.util.HashMap<String,Object> shit = new java.util.HashMap<String,Object>(); // stores temporary vars to be relayed to main class
-
   public static Story story;
   public static Player player;
 

src/main/java/hugone/Area.java

@@ -172,7 +172,6 @@ public Furniture(JSONObject data, Area area) throws JSONException {
     this.collide = data.has("collide") ? data.getBoolean("collide") : true;
     if (data.has("dialogue")) {
       this.dialogue = App.story.getDialogue(data.getString("dialogue"));
-      this.dialogue.setParent(area);
     }
 
     JSONArray location = data.getJSONArray("location"); // top left

src/main/java/hugone/Battle.java

@@ -34,8 +34,8 @@ class Battle implements Feature {
   private Iterator<Note> notes;
   private ArrayList<Note> renderedNotes;
   private Integer notedamage;
-  public int notespeed;
-  public int bpm;
+  private int notespeed;
+  private int bpm;
   private int beat;
 
   private BattleState state = BattleState.INTRO;;
@@ -245,17 +245,17 @@ public int getBeat() {
 
   public void reccieveKeyPress(KeyEvent e, KeyPress p) {
     if (this.introscene != null) this.introscene.reccieveKeyPress(e, p);
-    if (this.introcard != null)  this.introcard.reccieveKeyPress(e, p);
+    if (this.introcard  != null) this.introcard.reccieveKeyPress(e, p);
     if (!this.state.equals(BattleState.FIGHT)) return;
     for (Note n : new ArrayList<Note>(this.renderedNotes)) {
       if (Utils.keydirs.get(n.direction) != e.getKeyCode()) continue;
-      if (n instanceof HoldNote) {
+      if (n instanceof HoldNote h) {
         switch (p) {
           case KEYDOWN:
             if (Math.abs(n.getY()-this.getEndY()) > Constants.Battle.HITMARGIN && this.debouncebeat < 1) break;
             this.debouncebeat = 0;
           case KEYUP:
-            ((HoldNote)n).hit(p);
+            h.hit(p);
             return; // only one note per beat per column
         }
       } else {
@@ -279,124 +279,123 @@ public void close() {
   public String getNext() {
     return this.next;
   }
-}
-
-class Note {
-  public final Direction direction;
-  protected Battle parent;
-  protected Image image;
-  protected Point location;
-  protected boolean hit;
-  private long lasttime;
 
-  public Note(Battle p, Direction dir) {
-    this.parent = p;
-    this.direction = dir;
-    this.image = Utils.arrowimages.get(dir).scaleToWidth(p.getNoteSize());
-  }
+  class Note {
+    protected final Direction direction;
+    protected Battle parent;
+    protected Image image;
+    protected Point location;
+    protected boolean hit;
+    private long lasttime;
+
+    public Note(Battle p, Direction dir) {
+      this.parent = p;
+      this.direction = dir;
+      this.image = Utils.arrowimages.get(dir).scaleToWidth(p.getNoteSize());
+    }
 
-  public void spawn() {
-    this.hit = false;
-    this.location = new Point( this.parent.getSpawnX(this.direction), this.parent.getSpawnY() );
-    this.lasttime = System.currentTimeMillis();
-  }
+    public void spawn() {
+      this.hit = false;
+      this.location = new Point( this.parent.getSpawnX(this.direction), this.parent.getSpawnY() );
+      this.lasttime = System.currentTimeMillis();
+    }
 
-  public void beat() {
-    if (!this.hit && this.pastBound()) {
-      this.parent.miss();
-      this.hit = true;
+    public void beat() {
+      if (!this.hit && this.pastBound()) {
+        this.parent.miss();
+        this.hit = true;
+      }
     }
-  }
 
-  protected void moveDown() {
-    int dist = Math.round((System.currentTimeMillis()-this.lasttime)*this.parent.notespeed)/(60*1000/this.parent.bpm);
-    if (dist > Constants.Battle.MINNOTEMOVE) {
-      this.location.translate(0, dist);
-      this.lasttime = System.currentTimeMillis();
+    protected void moveDown() {
+      int dist = Math.round((System.currentTimeMillis()-this.lasttime)*this.parent.notespeed)/(60*1000/this.parent.bpm);
+      if (dist > Constants.Battle.MINNOTEMOVE) {
+        this.location.translate(0, dist);
+        this.lasttime = System.currentTimeMillis();
+      }
     }
-  }
 
-  public void render(Graphics2D g) {
-    if (this.hit) return;
-    this.moveDown();
+    public void render(Graphics2D g) {
+      if (this.hit) return;
+      this.moveDown();
 
-    this.image.draw(this.location.x, this.location.y, g);
-  }
+      this.image.draw(this.location.x, this.location.y, g);
+    }
 
-  public boolean update() { // when should i stop attempting to render this note?
-    return this.hit;
-  }
+    public boolean update() { // when should i stop attempting to render this note?
+      return this.hit;
+    }
 
-  public void hit() {
-    this.parent.hit(this.direction);
-    this.hit = true;
-  }
+    public void hit() {
+      this.parent.hit(this.direction);
+      this.hit = true;
+    }
 
-  public int getY() {
-    return this.location.y;
-  }
+    public int getY() {
+      return this.location.y;
+    }
 
-  protected boolean pastBound() {
-    return this.location.y > this.parent.getEndY();
-  }
-}
-
-class HoldNote extends Note {
-  private int notelength;
-  private Image tailimage;
-  private int keydownon;
-
-  public HoldNote(Battle p, Direction dir, int leng) {
-    super(p, dir);
-    this.notelength = leng;
-    this.tailimage = Utils.arrowtailimages.get(this.direction)
-      .scaleToWidth(this.parent.getNoteSize())
-      .stretchToHeight((int)(this.notelength*this.parent.getNoteSize()*1.2d));
+    protected boolean pastBound() {
+      return this.location.y > this.parent.getEndY();
+    }
   }
 
-  @Override
-  public void spawn() {
-    super.spawn();
-    this.keydownon = -1;
-  }
+  class HoldNote extends Note {
+    private int notelength;
+    private Image tailimage;
+    private int keydownon;
+
+    public HoldNote(Battle p, Direction dir, int leng) {
+      super(p, dir);
+      this.notelength = leng;
+      this.tailimage = Utils.arrowtailimages.get(this.direction)
+        .scaleToWidth(this.parent.getNoteSize())
+        .stretchToHeight((int)(this.notelength*this.parent.getNoteSize()*1.2d));
+    }
 
-  public void hit(KeyPress p) {
-    switch (p) {
-      case KEYDOWN:
-        if (this.keydownon >= 0) break;
-        this.keydownon = this.parent.getBeat();
-        System.out.println("Battle Beat: ["+super.parent.getBeat()+"]");
-        break;
-      case KEYUP:
-        if (this.keydownon >= 0 && super.parent.getBeat()-this.keydownon == this.notelength) {super.hit();}
-        System.out.println("Battle Beat: ["+super.parent.getBeat()+"] | Button held for: ["+(super.parent.getBeat()-this.keydownon)+"] | Note Length: ["+this.notelength+"] | Hold Difference: ["+((super.parent.getBeat()-this.keydownon) - this.notelength)+"] Valid: "+(super.parent.getBeat()-this.keydownon == this.notelength)+";");
-        this.keydownon = -1;
-        break;
+    @Override
+    public void spawn() {
+      super.spawn();
+      this.keydownon = -1;
     }
-  }
 
-  @Override
-  public void render(Graphics2D g) {
-    if (this.hit) return;
-    this.moveDown();
+    public void hit(KeyPress p) {
+      switch (p) {
+        case KEYDOWN:
+          if (this.keydownon >= 0) break;
+          this.keydownon = this.parent.getBeat();
+          System.out.println("Battle Beat: ["+super.parent.getBeat()+"]");
+          break;
+        case KEYUP:
+          if (this.keydownon >= 0 && super.parent.getBeat()-this.keydownon == this.notelength) {super.hit();}
+          System.out.println("Battle Beat: ["+super.parent.getBeat()+"] | Button held for: ["+(super.parent.getBeat()-this.keydownon)+"] | Note Length: ["+this.notelength+"] | Hold Difference: ["+((super.parent.getBeat()-this.keydownon) - this.notelength)+"] Valid: "+(super.parent.getBeat()-this.keydownon == this.notelength)+";");
+          this.keydownon = -1;
+          break;
+      }
+    }
 
-    this.tailimage.draw(this.location.x, this.location.y - this.notelength*this.parent.getNoteSize(), g);
-    this.image.draw(this.location.x, this.location.y, g);
-  }
+    @Override
+    public void render(Graphics2D g) {
+      if (this.hit) return;
 
-  @Override
-  protected boolean pastBound() {
-    return this.keydownon < 0 ? super.pastBound() : this.location.y-this.parent.getNoteSize()*this.notelength > this.parent.getEndY();
-  }
-}
+      super.render(g);
+      this.tailimage.draw(this.location.x, this.location.y - this.notelength*this.parent.getNoteSize(), g);
+    }
 
-class DeathNote extends Note {
-  public DeathNote(Battle p) {
-    super(p, Direction.NONE);
+    @Override
+    protected boolean pastBound() {
+      return this.keydownon < 0 ? super.pastBound() : this.location.y-this.parent.getNoteSize()*this.notelength > this.parent.getEndY();
+    }
   }
 
-  @Override
-  public void hit() {
-    // L cant hit this bozo
+  class DeathNote extends Note {
+    public DeathNote(Battle p) {
+      super(p, Direction.NONE);
+    }
+
+    @Override
+    public void hit() {
+      // L cant hit this bozo
+    }
   }
 }

src/main/java/hugone/Dialogues.java

@@ -1,7 +1,6 @@
 package hugone;
 
 import java.awt.Graphics2D;
-import java.awt.RenderingHints;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 
@@ -15,12 +14,10 @@
 import hugone.util.Audio;
 import hugone.util.Image;
 
-@SuppressWarnings("unused")
 class Dialogues implements Feature {
   public String id;
   private ArrayList<Dialogue> dialogues = new ArrayList<Dialogue>();
   private int index;
-  private Area area;
 
   public Dialogues(String id) throws JSONException {
     JSONObject data = App.story.data.getJSONObject("dialogue").getJSONObject(id);
@@ -39,13 +36,7 @@ public Dialogues(String id) throws JSONException {
     this.index = 0;
   }
 
-  public void init() {
-
-  }
-
-  public void setParent(Area p) {
-    this.area = p;
-  }
+  public void init() {}
 
   public void reset() {
     this.index = 0;

src/main/java/hugone/Menu.java

@@ -12,8 +12,8 @@
 import hugone.util.Image;
 import hugone.util.Utils;
 
-@SuppressWarnings("unused")
 public class Menu implements Feature {
+    @SuppressWarnings("unused")
     private String id;
     private Image background;
     private Button[] buttons;

src/main/java/hugone/util/Video.java

@@ -2,23 +2,30 @@
 
 import uk.co.caprica.vlcj.player.component.EmbeddedMediaPlayerComponent;
 
-public class Video { // TODO: No idea why this doesn't render
+public class Video {
     private EmbeddedMediaPlayerComponent component;
+    private javax.swing.JFrame f;
+    private String filepath;
 
     public Video(String filepath, javax.swing.JFrame f) {
+        this.f = f;
+        this.filepath = filepath;
         this.component = new EmbeddedMediaPlayerComponent();
         this.component.setFocusable(false);
-        f.setVisible(true);
-        f.add(this.component);
-        this.component.mediaPlayer().media().startPaused(filepath);
-        this.component.mediaPlayer().controls().setRepeat(false);
+        this.component.setVisible(false);
     }
 
     public void play() {
-        this.component.mediaPlayer().controls().play();
+        this.f.add(this.component);
+        this.component.setVisible(true);
+        this.f.setVisible(true);
+        this.component.mediaPlayer().controls().setRepeat(false);
+        if (!this.component.mediaPlayer().media().play(this.filepath)) System.out.println("!WARNING! Video failed to play!");
     }
 
     public void stop() {
+        this.f.remove(this.component);
+        this.component.setVisible(false);
         this.component.mediaPlayer().controls().stop();
     }
 
@@ -31,6 +38,7 @@ public boolean isPlayed() {
     }
 
     public void close() {
+        this.stop();
         this.component.release();
     }
 }