20230921

Array/FarmArray.java

@@ -7,7 +7,7 @@ import org.poopki.duckdns.user_db.UserInfoArray;
 
 import java.util.*;
 
-public class FarmArray {
+public class FarmArray extends GroupArray{
 
 
     public Map<UUID, Farm> m_FarmArray;
@@ -18,6 +18,7 @@ public class FarmArray {
     int MAX_GROUP_NUM = 10;
     Plugin plugin;
     public FarmArray(UserInfoArray m_UIA, int num, Plugin plugin){
+        super(m_UIA,num,plugin);
         m_UserInfoArray = m_UIA;
         m_FarmArray = new HashMap<UUID, Farm>();
         m_GroupNameList = new HashMap<String, UUID>();
@@ -25,6 +26,7 @@ public class FarmArray {
         this.plugin = plugin;
     }
 
+
     public boolean CreateGroup(UUID GroupUUID, String Name, UUID PlayerUUID){
         if(m_GroupNameList.containsKey(Name)){
             return false; // Conflict

Array/Nation.java

@@ -38,6 +38,7 @@ public class Nation extends Group{
                 }
             }
         }.runTaskTimer(plugin,0,20);
+        InitResearchItem();
     }
 
     public void InitResearchItem(){

DB/DBConnect.java

@@ -5,7 +5,7 @@ import java.sql.*;
 
 public class DBConnect {
     private static final String DB_DRIVER_CLASS = "org.mariadb.jdbc.Driver";
-    private static final String DB_URL = "jdbc:mariadb://211.135.195.201:3307/";
+    private static final String DB_URL = "jdbc:mariadb://192.168.0.4:3307/";
     private static final String DB_USERNAME = "mc_dev";
     private static final String DB_PASSWORD = "!Rkdalsrn1027";
 

DB/DBUpdate.java

@@ -13,7 +13,7 @@ import java.util.UUID;
 
 public class DBUpdate {
     private  final String DB_DRIVER_CLASS = "org.mariadb.jdbc.Driver";
-    private   final String DB_URL = "jdbc:mariadb://211.135.195.201:3307/mc_dev";
+    private   final String DB_URL = "jdbc:mariadb://192.168.0.4:3307/mc_dev";
     private   final String DB_USERNAME = "mc_dev";
     private   final String DB_PASSWORD = "!Rkdalsrn1027";
     private  UserInfoArray m_InfoArrayInstance;

InfoGUI/ScoreboardEvent.java

@@ -53,7 +53,7 @@ public class ScoreboardEvent {
             Score score4 = score_obj.getScore("농장 이름: " + m_FarmArray.GetGroupName(m_InfoArrayInstance.getUserGroupUUID(player.getUniqueId(), "Farm")));
             score4.setScore(14);
         }
-
+/*
         if(ZERO_UUID.equals(m_InfoArrayInstance.getUserGroupUUID(player.getUniqueId(), "Nation"))) {
             Score score5 = score_obj.getScore("국가 이름: ----");
             score5.setScore(13);
@@ -71,7 +71,7 @@ public class ScoreboardEvent {
             Score score6 = score_obj.getScore("분대 이름: "+m_SquadArray.GetGroupName(m_InfoArrayInstance.getUserGroupUUID(player.getUniqueId(), "Squad")));
             score6.setScore(12);
         }
-
+*/
         player.setScoreboard(scoreboard);
     }
 }

Research/ResearchGUIEvent.java

@@ -17,7 +17,6 @@ import org.poopki.duckdns.user_db.UserInfoArray;
 public class ResearchGUIEvent implements Listener,CommandExecutor {
     AccountArray m_AccountArray;
     UserInfoArray m_UserInfoArray;
-
     NationArray m_NationArray;
     public ResearchGUIEvent(UserInfoArray m_UIA, NationArray NA){
         m_UserInfoArray = m_UIA;

TechTree/TechGUI.java

@@ -77,8 +77,6 @@ public class TechGUI implements Listener{
         inv.setItem(26, CustomStack.getInstance("techtree:mathematics_"+Integer.toString(m_NA.GetGroupTechTree(m_UIA.getUserGroupUUID(m_uuid,"Nation"),"mathematics"))).getItemStack());
         inv.setItem(35, CustomStack.getInstance("techtree:construction_"+Integer.toString(m_NA.GetGroupTechTree(m_UIA.getUserGroupUUID(m_uuid,"Nation"),"construction"))).getItemStack());
         inv.setItem(44, CustomStack.getInstance("techtree:horseback_"+Integer.toString(m_NA.GetGroupTechTree(m_UIA.getUserGroupUUID(m_uuid,"Nation"),"horseback"))).getItemStack());
-
-
     }
 
     public void open(Player player){