From b5ed3761766602c546b0e6307c68311f3de76e53 Mon Sep 17 00:00:00 2001
From: officereso <qrs01@snowtx.com>
Date: Fri, 24 May 2019 21:30:20 -0500
Subject: [PATCH] Cleaned up some access can be private warnings in Main.java
 and more code cleanup.

Signed-off-by: officereso <qrs01@snowtx.com>
---
 .idea/dictionaries/freeman.xml |  1 +
 src/project/Main.java          | 39 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.idea/dictionaries/freeman.xml b/.idea/dictionaries/freeman.xml
index 55d1ea5..97d3855 100644
--- a/.idea/dictionaries/freeman.xml
+++ b/.idea/dictionaries/freeman.xml
@@ -2,6 +2,7 @@
   <dictionary name="freeman">
     <words>
       <w>alekkai</w>
+      <w>btns</w>
     </words>
   </dictionary>
 </component>
\ No newline at end of file
diff --git a/src/project/Main.java b/src/project/Main.java
index 6e1d379..ffa8967 100644
--- a/src/project/Main.java
+++ b/src/project/Main.java
@@ -9,12 +9,29 @@ import java.awt.*;
 public class Main extends Applet {
     private static boolean start = false;
     private Rectangle startBtn = new Rectangle(100,100,340,600);
-    public static int score = 0;
+    private static int score = 0;
     private Rectangle lBtn = new Rectangle(480, 240, 150, 80);
     private static int Px = 150;
     private Rectangle rBtn = new Rectangle(660, 240, 150, 80);
 
-    public static void npcLocomotion(Graphics g) {
+    public void paint(Graphics g) {
+        Expo.drawHeading(g, "Quentin Snow and Alekkai", "Final Project");
+        if (start && !NPC1.ended && !NPC2.ended && !NPC3.ended && !NPC4.ended && !NPC5.ended && !NPC6.ended) {
+            Draw.begin(g, score);
+            playerLocomotion(g);
+            npcLocomotion(g);
+
+        }
+        if (!start) {
+            Draw.startScreen(g);
+        }
+
+        if (NPC1.ended || NPC2.ended || NPC3.ended || NPC4.ended || NPC5.ended || NPC6.ended) {
+            Draw.end(g);
+        }
+    }
+
+    private static void npcLocomotion(Graphics g) {
         if (score > 3) {
             new NPC1(g, Px);
         }
@@ -36,7 +53,7 @@ public class Main extends Applet {
     }
 
 
-    public static void playerLocomotion(Graphics g) {
+    private static void playerLocomotion(Graphics g) {
         project.Sprites.player.make(g, Px, 427);
         if (Px <= 107 || Px >= 375) {
             Draw.end(g);
@@ -44,22 +61,6 @@ public class Main extends Applet {
         }
     }
 
-    public void paint(Graphics g) {
-        Expo.drawHeading(g, "Quentin Snow and Alekkai", "Final Project");
-        if (start && !NPC1.ended && !NPC2.ended && !NPC3.ended && !NPC4.ended && !NPC5.ended && !NPC6.ended) {
-            Draw.begin(g, score);
-            playerLocomotion(g);
-            npcLocomotion(g);
-
-        }
-        if (!start) {
-            Draw.startScreen(g);
-        }
-
-        if (NPC1.ended || NPC2.ended || NPC3.ended || NPC4.ended || NPC5.ended || NPC6.ended) {
-            Draw.end(g);
-        }
-    }
 
     public boolean mouseDown(Event e, int x, int y){
         if (startBtn.inside(x,y)){