Merge pull request #301 from Dans-Plugins/release/v1.13.0

dmccoystephenson · web-flow · commit c103457748b1 · 2024-05-27T01:42:25.000-06:00
Release/v1.13.0
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -0,0 +1,3 @@
+FROM maven:3.8-eclipse-temurin-21-alpine
+
+WORKDIR /workspaces/Medieval-Roleplay-Engine
diff --git a/.devcontainer/start_dev_container.bat b/.devcontainer/start_dev_container.bat
@@ -0,0 +1,2 @@
+docker build . -t mre-dev-container
+docker run -it -v %cd%\..\:/workspaces/Medieval-Roleplay-Engine mre-dev-container /bin/bash
diff --git a/.devcontainer/start_dev_container.sh b/.devcontainer/start_dev_container.sh
@@ -0,0 +1,2 @@
+docker build . -t mre-dev-container
+docker run -it -v $(pwd)/../:/workspaces/Medieval-Roleplay-Engine mre-dev-container /bin/bash
diff --git a/.testcontainer/README.md b/.testcontainer/README.md
@@ -0,0 +1,5 @@
+# Test Container
+The test container builds a minecraft server and the plugin to test it. It is used to test the plugin in a real environment.
+
+## Modifying ops.json
+The ops.json file is used to give players operator permissions. This file is located in the server directory. To make a player an operator, add their username & UUID to the file.
diff --git a/.testcontainer/ops.json b/.testcontainer/ops.json
@@ -0,0 +1,8 @@
+[
+  {
+    "uuid": "0a9fa342-3139-49d7-8acb-fcf4d9c1f0ef",
+    "name": "DanTheTechMan",
+    "level": 4,
+    "bypassesPlayerLimit": false
+  }
+]
diff --git a/.testcontainer/post-create.sh b/.testcontainer/post-create.sh
@@ -0,0 +1,22 @@
+echo "Running 'post-create.sh' script..."
+if [ -z "$(ls -A /testmcserver)" ]; then
+    echo "Setting up server..."
+    # Copy server JAR
+    cp /testmcserver-build/spigot-1.20.6.jar /testmcserver/spigot-1.20.6.jar
+
+    # Create plugins directory
+    mkdir /testmcserver/plugins
+
+    # Install MedievalRoleplayEngine
+    cp /mre-build/target/Medieval-Roleplay-Engine-*.jar /testmcserver/plugins
+
+    # Copy config files
+    cp /resources/ops.json /testmcserver
+
+    # Accept EULA
+    cd /testmcserver && echo "eula=true" > eula.txt
+else
+    echo "Server is already set up."
+fi
+
+java -jar /testmcserver/spigot-1.20.6.jar
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "disabled"
+}
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,24 @@
+FROM maven:3.8-eclipse-temurin-21-alpine
+
+# Install dependencies g`
+RUN apk add --no-cache git wget
+
+# Build server
+WORKDIR /testmcserver-build
+RUN wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+RUN git config --global --unset core.autocrlf || :
+RUN java -jar BuildTools.jar --rev 1.20.6
+
+# Build plugin
+WORKDIR /mre-build
+COPY . .
+RUN mvn package
+
+# Copy resources and make post-create.sh executable
+COPY ./.testcontainer /resources
+RUN chmod +x /resources/post-create.sh
+
+# Run server
+WORKDIR /testmcserver
+EXPOSE 25565
+ENTRYPOINT /resources/post-create.sh
diff --git a/compose.yml b/compose.yml
@@ -0,0 +1,7 @@
+services:
+  testmcserver:
+    build: .
+    image: mre-test-mc-server
+    container_name: mre-test-mc-server
+    ports:
+      - "25565:25565"
diff --git a/down.bat b/down.bat
@@ -0,0 +1 @@
+docker compose down --remove-orphans
diff --git a/down.sh b/down.sh
@@ -0,0 +1 @@
+docker compose down --remove-orphans
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>dansplugins</groupId>
   <artifactId>Medieval-Roleplay-Engine</artifactId>
-  <version>1.12.0</version>
+  <version>1.13.0</version>
   <packaging>jar</packaging>
 
   <name>Medieval Roleplay Engine</name>
diff --git a/src/main/java/dansplugins/rpsystem/config/ConfigService.java b/src/main/java/dansplugins/rpsystem/config/ConfigService.java
@@ -77,7 +77,10 @@ public void handleVersionMismatch() {
         if (!getConfig().isInt("birdSpeed")) {
             getConfig().addDefault("birdSpeed", 20);
         }
-
+        if (!getConfig().isBoolean("logChat")) {
+            getConfig().addDefault("logChat", false);
+        }
+        
         deleteOldConfigOptionsIfPresent();
 
         getConfig().options().copyDefaults(true);
@@ -112,7 +115,8 @@ else if (option.equalsIgnoreCase("localChatRadius")
             }
             else if (option.equalsIgnoreCase("rightClickToViewCard")
                     || option.equalsIgnoreCase("chatFeaturesEnabled")
-                    || option.equalsIgnoreCase("debugMode")) {
+                    || option.equalsIgnoreCase("debugMode")
+                    || option.equalsIgnoreCase("logChat")) {
                 getConfig().set(option, Boolean.parseBoolean(value));
                 player.sendMessage(medievalRoleplayEngine.colorChecker.getColorByName(getString("positiveAlertColor")) + "Boolean set!");
             }
@@ -155,6 +159,7 @@ public void saveConfigDefaults() {
         getConfig().addDefault("chatFeaturesEnabled", true);
         getConfig().addDefault("debugMode", false);
         getConfig().addDefault("birdSpeed", 20);
+        getConfig().addDefault("logChat", true);
         getConfig().options().copyDefaults(true);
         medievalRoleplayEngine.saveConfig();
     }
@@ -178,7 +183,8 @@ public void sendPlayerConfigList(Player player) {
                 + ", positiveAlertColor: " + getConfig().getString("positiveAlertColor")
                 + ", neutralAlertColor: " + getConfig().getString("neutralAlertColor")
                 + ", negativeAlertColor: " + getConfig().getString("negativeAlertColor")
-                + ", birdSpeed: " + getConfig().getString("birdSpeed"));
+                + ", birdSpeed: " + getConfig().getString("birdSpeed")
+                + ", logChat:" + getConfig().getBoolean("logChat"));
     }
 
     public boolean hasBeenAltered() {
diff --git a/src/main/java/dansplugins/rpsystem/utils/Messenger.java b/src/main/java/dansplugins/rpsystem/utils/Messenger.java
@@ -41,6 +41,11 @@ public int sendRPMessageToPlayersWithinDistance(Player player, String message, i
                 }
             }
         }
+
+        if (medievalRoleplayEngine.configService.getBoolean("logChat")) {
+            logMessageToConsole("RP", player.getDisplayName(), message);
+        }
+
         return numPlayersWhoHeard;
     }
 
@@ -64,13 +69,19 @@ public int sendRPMessageToPlayersWithinDistanceExcludingTarget(Player player, St
                         if (!medievalRoleplayEngine.ephemeralData.getPlayersWhoHaveHiddenLocalChat().contains(potentialPlayer.getUniqueId())) {
                             numPlayersWhoHeard++;
                             potentialPlayer.sendMessage(message);
+
                         }
 
                     }
 
                 }
             }
         }
+
+        if (medievalRoleplayEngine.configService.getBoolean("logChat")) {
+            logMessageToConsole("RP", player.getDisplayName(), message);
+        }
+
         return numPlayersWhoHeard;
     }
 
@@ -97,6 +108,11 @@ public int sendOOCMessageToPlayersWithinDistance(Player player, String message,
                 }
             }
         }
+
+        if (medievalRoleplayEngine.configService.getBoolean("logChat")) {
+            logMessageToConsole("OOC", player.getDisplayName(), message);
+        }
+
         return numPlayersWhoHeard;
     }
 
@@ -109,4 +125,14 @@ public void sendCardInfoToPlayer(CharacterCard card, Player player) {
         player.sendMessage(medievalRoleplayEngine.colorChecker.getNeutralAlertColor() + "Gender: " + card.getGender());
         player.sendMessage(medievalRoleplayEngine.colorChecker.getNeutralAlertColor() + "Religion: " + card.getReligion());
     }
+
+    /**
+     * Log a message to the console to allow moderators to see what is being said in chat
+     * @param chat the type of chat (RP, OOC, etc.)
+     * @param playerName the name of the player who sent the message
+     * @param message the message that was sent
+     */
+    private void logMessageToConsole(String chat, String playerName, String message) {
+        medievalRoleplayEngine.getLogger().info("[" + chat + "] " + playerName + ": " + message);
+    }
 }
diff --git a/up.bat b/up.bat
@@ -0,0 +1 @@
+docker compose up --build -d
diff --git a/up.sh b/up.sh
@@ -0,0 +1 @@
+docker compose up --build -d

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+FROM maven:3.8-eclipse-temurin-21-alpine`
	`2`	`+`
	`3`	`+WORKDIR /workspaces/Medieval-Roleplay-Engine`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+docker build . -t mre-dev-container`
	`2`	`+docker run -it -v %cd%\..\:/workspaces/Medieval-Roleplay-Engine mre-dev-container /bin/bash`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+docker build . -t mre-dev-container`
	`2`	`+docker run -it -v $(pwd)/../:/workspaces/Medieval-Roleplay-Engine mre-dev-container /bin/bash`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "java.configuration.updateBuildConfiguration": "disabled"`
	`3`	`+}`