Merge pull request #1 from nakira974/branches/dev

Merge Branches/dev into Trunk

.gitignore

@@ -1,6 +1,6 @@
-/1.20.1/private/vanilla/.map/world/
-/1.20.1/private/vanilla/.map/world_nether/
-/1.20.1/private/vanilla/.map/world_the_end/
+/1.20.1/private/spigot/.map/world/
+/1.20.1/private/spigot/.map/world_nether/
+/1.20.1/private/spigot/.map/world_the_end/
 /1.20.1/public/anarchy.lavalawsless.com/.map/world/
 /1.20.1/public/anarchy.lavalawsless.com/.map/world_nether/
 /1.20.1/public/anarchy.lavalawsless.com/.map/world_the_end/

1.20.1/private/spigot/.properties/ops.json

@@ -0,0 +1,14 @@
+[
+  {
+    "uuid": "2bb0ac70-c45a-4dfd-8f0b-93cac6210ae0",
+    "name": "nakira0x4D",
+    "level": 4,
+    "bypassesPlayerLimit": false
+  },
+  {
+    "uuid": "78347df6-90c7-4233-9922-b4d91af0b4b9",
+    "name": "Weefle",
+    "level": 4,
+    "bypassesPlayerLimit": false
+  }
+]

1.20.1/private/spigot/whitelist.json → 1.20.1/private/spigot/.properties/whitelist.json

@@ -2,5 +2,9 @@
 {
     "uuid": "2bb0ac70-c45a-4dfd-8f0b-93cac6210ae0",
     "name": "nakiradu77"
+  },
+  {
+    "uuid": "78347df6-90c7-4233-9922-b4d91af0b4b9",
+    "name": "Weefle"
   }
 ]

1.20.1/private/spigot/Dockerfile

@@ -4,32 +4,35 @@ FROM openjdk:19-jdk-alpine
 # Define the working directory
 WORKDIR /spigot-server
 
+# Expose the necessary port
+EXPOSE 25567
+
 # Download BuildTools.jar to build spigot server
 ADD https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar /temp/
 
 # Install git & build spigot server
 RUN apk add --no-cache git \
     && java -jar /temp/BuildTools.jar --rev latest \
-    && mv ./spigot-*.jar spigot.jar \
 
 
-# Expose the necessary port
-EXPOSE 25566
-
-# Copy over server properties
+# Copy over server properties and world data
 COPY ./server.properties /spigot-server/
-COPY ./whitelist.json /spigot-server/
-COPY ops.json /spigot-server/
+COPY .properties/blacklist.json /spigot-server/
+COPY .properties/ops.json /spigot-server/
+
 
-# Copy map folders
 COPY ./.map/world /spigot-server/world
 COPY ./.map/world_nether /spigot-server/world_nether
 COPY ./.map/world_the_end /spigot-server/world_the_end
 
+
+# Copy EULA
+COPY .properties/eula.txt /spigot-server/
+
 # Accept Minecraft EULA
 RUN echo "eula=true" > eula.txt
 
-RUN apk add screen
+RUN cd /spigot-server
 
 # Start the Spigot server
-ENTRYPOINT screen -S MinecraftServer -dm java -Xmx1024M -Xms512M -jar /tmp/spigot-1.20.1.jar nogui
+ENTRYPOINT ["java", "-Xmx1024M", "-Xms1024M", "-jar", "/tmp/spigot-1.20.1.jar", "nogui"]

1.20.1/private/vanilla/Dockerfile

@@ -8,9 +8,9 @@ WORKDIR /minecraft-server
 EXPOSE 25565
 
 # COPY MAP FOLDERS
-COPY .map/world /minecraft-server
-COPY .map/world_nether /minecraft-server
-COPY .map/world_the_end /minecraft-server
+COPY ../spigot/.map/world /minecraft-server
+COPY ../spigot/.map/world_nether /minecraft-server
+COPY ../spigot/.map/world_the_end /minecraft-server
 
 # SERVER PROPERTIES
 COPY server.properties /minecraft-server

1.20.1/public/anarchy.lavalawsless.com/.properties/ops.json

@@ -0,0 +1,14 @@
+[
+  {
+    "uuid": "2bb0ac70-c45a-4dfd-8f0b-93cac6210ae0",
+    "name": "nakira0x4D",
+    "level": 4,
+    "bypassesPlayerLimit": false
+  },
+  {
+    "uuid": "78347df6-90c7-4233-9922-b4d91af0b4b9",
+    "name": "Weefle",
+    "level": 4,
+    "bypassesPlayerLimit": false
+  }
+]

1.20.1/public/anarchy.lavalawsless.com/server.properties → 1.20.1/public/anarchy.lavalawsless.com/.properties/server.properties

@@ -9,7 +9,7 @@ server-ip=
 
 # Server Port
 # The port on which your server will listen for incoming connections.
-server-port=25567
+server-port=25565
 
 # Maximum number of players
 # The maximum number of players allowed on your server at the same time.
@@ -37,7 +37,7 @@ pvp=true
 
 # Enable Command Blocks
 # Set this to true if you want to enable the use of command blocks.
-enable-command-block=false
+enable-command-block=true
 
 # Enable Whitelist
 # Set this to true if you want to restrict access to your server to whitelisted players only.

1.20.1/public/anarchy.lavalawsless.com/Dockerfile

@@ -5,7 +5,7 @@ FROM openjdk:19-jdk-alpine
 WORKDIR /spigot-server
 
 # Expose the necessary port
-EXPOSE 25565
+EXPOSE 25567
 
 # Download BuildTools.jar to build spigot server
 ADD https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar /temp/
@@ -17,8 +17,8 @@ RUN apk add --no-cache git \
 
 # Copy over server properties and world data
 COPY ./server.properties /spigot-server/
-COPY blacklist.json /spigot-server/
-COPY ops.json /spigot-server/
+COPY .properties/blacklist.json /spigot-server/
+COPY .properties/ops.json /spigot-server/
 
 
 COPY ./.map/world /spigot-server/world
@@ -27,12 +27,12 @@ COPY ./.map/world_the_end /spigot-server/world_the_end
 
 
 # Copy EULA
-COPY ./eula.txt /spigot-server/
+COPY .properties/eula.txt /spigot-server/
 
 # Accept Minecraft EULA
 RUN echo "eula=true" > eula.txt
 
-RUN apk add screen
+RUN cd /spigot-server
 
 # Start the Spigot server
-ENTRYPOINT screen -S MinecraftServer -dm java -Xmx4096M -Xms512M -jar /tmp/spigot-1.20.1.jar nogui
+ENTRYPOINT ["java", "-Xmx1024M", "-Xms1024M", "-jar", "/tmp/spigot-1.20.1.jar", "nogui"]

docker-compose.yaml

@@ -22,27 +22,31 @@ services:
   test_spigot_1_20_1:
     build: ./1.20.1/private/spigot
     volumes:
-      - './1.20.1/private/spigot/.map/world:/minecraft-server/world'
-      - './1.20.1/private/spigot/.map/world_nether:/minecraft-server/world_nether'
-      - './1.20.1/private/spigot/.map/world_the_end:/minecraft-server/world_the_end'
-      - './1.20.1/private/spigot/whitelist.json:/minecraft-server/whitelist.json'
-      - './1.20.1/private/spigot/blacklist.json:/minecraft-server/blacklist.json'
-      - './1.20.1/private/spigot/ops.json:/minecraft-server/ops.json'
+      - './1.20.1/private/spigot/.map/world:/spigot-server/world'
+      - './1.20.1/private/spigot/.map/world_nether:/spigot-server/world_nether'
+      - './1.20.1/private/spigot/.map/world_the_end:/spigot-server/world_the_end'
+      - './1.20.1/private/spigot/.properties/whitelist.json:/spigot-server/whitelist.json'
+      #- './1.20.1/private/spigot/.properties/blacklist.json:/spigot-server/blacklist.json'
+      #- './1.20.1/private/spigot/.properties/ops.json:/spigot-server/ops.json'
     networks:
       - private
     ports:
-      - "25566:25566"
+      - "25567:25566"
+    stdin_open: true
+    tty: true
 
 # Public Spigot API server
   lavalawless_spigot_1_20_1:
     build: 1.20.1/public/anarchy.lavalawsless.com
     volumes:
-      - './1.20.1/public/anarchy.lavalawless.com/.map/world:/minecraft-server/world'
-      - './1.20.1/public/anarchy.lavalawless.com/.map/world_nether:/minecraft-server/world_nether'
-      - './1.20.1/public/anarchy.lavalawless.com/.map/world_the_end:/minecraft-server/world_the_end'
-      - './1.20.1/public/anarchy.lavalawless.com/blacklist.json:/minecraft-server/blacklist.json'
-      - './1.20.1/public/anarchy.lavalawless.com/ops.json:/minecraft-server/ops.json'
+      - './1.20.1/public/anarchy.lavalawless.com/.map/world:/spigot-server/world'
+      - './1.20.1/public/anarchy.lavalawless.com/.map/world_nether:/spigot-server/world_nether'
+      - './1.20.1/public/anarchy.lavalawless.com/.map/world_the_end:/spigot-server/world_the_end'
+      #- './1.20.1/public/anarchy.lavalawless.com/.properties/blacklist.json:/spigot-server/blacklist.json'
+      #- './1.20.1/public/anarchy.lavalawless.com/.properties/ops.json:/spigot-server/ops.json'
     networks:
       - public_1
     ports:
-      - "25565:25565"
+      - "25565:25565"
+    stdin_open: true
+    tty: true