guiVersion of project, rewriting code for maximum clarity

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/misc.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/DndApplication.iml" filepath="$PROJECT_DIR$/.idea/DndApplication.iml" />
+      <module fileurl="file://$PROJECT_DIR$/dndBuilder/dndBuilder.iml" filepath="$PROJECT_DIR$/dndBuilder/dndBuilder.iml" />
     </modules>
   </component>
 </project>

1410_DND/src2/UImanager.java

@@ -1,76 +0,0 @@
-public class UImanager {
-
-    private JFrame gui;
-    private PanelHolder guiPanels;
-    private int currentPanel;
-
-    public UImanager (PanelHolder guiPanels) {
-
-        this.gui = new JFrame("D&D Character Builder");
-            this.guiPanels = guiPanels;
-
-            if (returningUser()) {
-
-                this.currentPanel = 0;
-
-            } else {
-
-                this.currentPanel = 1;
-
-            }
-
-        frameSetup();
-
-
-    }
-
-    // TODO: Need to implement.
-    private void frameSetup() {
-
-
-
-    }
-
-    // TODO: Need to implement.
-    private boolean returningUser() {
-
-        return false;
-
-    }
-
-    private JPanel getNextPanel() {
-        
-        switch (currentPanel) {
-
-            case: 1
-                    return guiPanels.getRacePanel();
-            case: 2
-                    return guiPanels.getClassPanel();
-            case: 3
-                    return guiPanels.getAbilityScorePanel();
-            case: 4
-                    return guiPanels.getDescriptionPanel();
-            case: 5
-                    return guiPanels.getEquipmentPanel();
-            case: 6
-                    return guiPanels.getLoadMenuPanel();
-            case: 7
-                    return guiPanels.getFinalizePanel();
-            default:
-                    return guiPanels.getMainMenuPanel();
-
-        }
-
-    }
-
-    private void clearAndReset(JPanel nextPanel) {
-
-        gui.removeAll();
-        gui.addComponent(nextPanel);
-
-        gui.repaint();
-        gui.revalidate();
-
-    }
-
-}

dndBuilder/dndBuilder.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

dndBuilder/src/AbilityScores/Charisma.java

@@ -1,4 +1,4 @@
-package dnd;
+package AbilityScores;
 
 public class Charisma extends Stats {
 

dndBuilder/src/AbilityScores/Constitution.java

@@ -1,4 +1,4 @@
-package dnd;
+package AbilityScores;
 
 public class Constitution extends Stats {
 

dndBuilder/src/AbilityScores/Dexterity.java

@@ -1,4 +1,4 @@
-package dnd;
+package AbilityScores;
 
 public class Dexterity extends Stats {
 

dndBuilder/src/AbilityScores/Intelligence.java

@@ -1,4 +1,4 @@
-package dnd;
+package AbilityScores;
 
 public class Intelligence extends Stats{
 

dndBuilder/src/AbilityScores/Stats.java

@@ -1,4 +1,4 @@
-package dnd;
+package AbilityScores;
 
 public abstract class Stats {
 

dndBuilder/src/AbilityScores/Strength.java

@@ -1,4 +1,4 @@
-package dnd;
+package AbilityScores;
 
 public class Strength extends Stats {
 

dndBuilder/src/AbilityScores/Wisdom.java

@@ -1,4 +1,4 @@
-package dnd;
+package AbilityScores;
 
 public class Wisdom extends Stats {
 

dndBuilder/src/Classes/ClassTemplate.java

@@ -1,4 +1,4 @@
-package dnd;
+package Classes;
 
 public interface ClassTemplate {
 

dndBuilder/src/Classes/Cleric.java

@@ -1,4 +1,4 @@
-package dnd;
+package Classes;
 
 public class Cleric implements ClassTemplate {
 

dndBuilder/src/Classes/Fighter.java

@@ -1,4 +1,4 @@
-package dnd;
+package Classes;
 
 public class Fighter implements ClassTemplate {
 

dndBuilder/src/Classes/Wizard.java

@@ -1,4 +1,4 @@
-package dnd;
+package Classes;
 
 public class Wizard implements ClassTemplate {
 

dndBuilder/src/DndCharacterBuilder.java

@@ -1,3 +1,8 @@
+import GUI.*;
+import Races.*;
+import Classes.*;
+import AbilityScores.*;
+
 public class DndCharacterBuilder {
 
     public static void main(String[] args) {

dndBuilder/src/GUI/PanelHolder.java

@@ -1,4 +1,7 @@
-public static class PanelHolder {
+package GUI;
+
+import javax.swing.*;
+public class PanelHolder {
 
     private JPanel mainMenuPanel;
     private JPanel racePanel;
@@ -70,59 +73,74 @@ public static class PanelHolder {
 
     }
 
-    // TODO: Need to implement.
+    /* TODO: Need to implement.
+
+            LEFT-SIDE: Two large buttons, split with a horizontal line. One is to create a new DnD character, the other is to create a
+            random character.
+
+            RIGHT-SIDE: One extra-large button to load an existing character.
+
+     */
     private JPanel createMainMenuPanel() {
 
-
+        return new JPanel();
 
     }
 
-    // TODO: Need to implement.
+    /* TODO: Need to implement.
+
+            LEFT-SIDE: Should appear with a random portrait of the default race, human. Below this
+            portrait, a button for the user to upload their own portrait.
+
+            RIGHT-SIDE: Should appear with a scrollable list of the user's available races. A tooltip is on each race, and expands to
+            describe the race, their proficiencies, languages, and ability score improvements.
+
+     */
     private JPanel createRaceSelectPanel() {
 
-
+        return new JPanel();
 
     }
 
     // TODO: Need to implement.
     private JPanel createClassSelectPanel() {
 
-
+        return new JPanel();
 
     }
 
     // TODO: Need to implement.
     private JPanel createAbilityScoreSelectPanel() {
 
-
+        return new JPanel();
 
     }
 
     // TODO: Need to implement.
     private JPanel createDescriptionPanel() {
 
-
+        return new JPanel();
 
     }
 
     // TODO: Need to implement.
     private JPanel createEquipmentSelectPanel() {
 
-
+        return new JPanel();
 
     }
 
     // TODO: Need to implement.
     private JPanel createFinalizePanel() {
 
-
+        return new JPanel();
 
     }
 
     // TODO: Need to implement.
     private JPanel createLoadMenu() {
 
-
+        return new JPanel();
 
     }
 

dndBuilder/src/GUI/UImanager.java

@@ -0,0 +1,69 @@
+package GUI;
+
+import javax.swing.*;
+
+public class UImanager {
+
+    private final JFrame gui;
+    private final PanelHolder guiPanels;
+    private int currentPanel;
+
+    public UImanager (PanelHolder guiPanels) {
+
+        this.gui = new JFrame("D&D Character Builder");
+            this.guiPanels = guiPanels;
+
+            if (returningUser()) {
+
+                this.currentPanel = 0;
+
+            } else {
+
+                this.currentPanel = 1;
+
+            }
+
+        frameSetup();
+
+    }
+
+    // TODO: Need to implement.
+    private void frameSetup() {
+
+
+
+    }
+
+    // TODO: Need to implement.
+    private boolean returningUser() {
+
+        return false;
+
+    }
+
+    private JPanel getNextPanel() {
+
+        return switch (currentPanel) {
+            case 1 -> guiPanels.getRacePanel();
+            case 2 -> guiPanels.getClassPanel();
+            case 3 -> guiPanels.getAbilityScorePanel();
+            case 4 -> guiPanels.getDescriptionPanel();
+            case 5 -> guiPanels.getEquipmentPanel();
+            case 6 -> guiPanels.getLoadMenuPanel();
+            case 7 -> guiPanels.getFinalizePanel();
+            default -> guiPanels.getMainMenuPanel();
+        };
+
+    }
+
+    private void clearAndReset(JPanel nextPanel) {
+
+        gui.removeAll();
+        gui.add(nextPanel);
+
+        gui.repaint();
+        gui.revalidate();
+
+    }
+
+}

dndBuilder/src/Races/Dragonborn.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class Dragonborn implements Race{
     private String[] traits;

dndBuilder/src/Races/Dwarf.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class Dwarf implements Race{
     private String[] traits;

dndBuilder/src/Races/Elf.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class Elf implements Race{
     private String[] traits;

dndBuilder/src/Races/Gnome.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class Gnome implements Race{
     private String[] traits;

dndBuilder/src/Races/HalfElf.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class HalfElf implements Race{
     private String[] traits;

dndBuilder/src/Races/HalfOrc.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class HalfOrc implements Race{
     private String[] traits;

dndBuilder/src/Races/Halfling.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class Halfling implements Race{
     private String[] traits;

dndBuilder/src/Races/Human.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class Human implements Race {
 

dndBuilder/src/Races/Race.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 import java.util.ArrayList;
 

dndBuilder/src/Races/Tiefling.java

@@ -1,4 +1,4 @@
-package dnd;
+package Races;
 
 public class Tiefling implements Race{
     private String[] traits;