BETA 16.1

Minecraft-Ships · Oct 16, 2023 · f1b075f · f1b075f
1 parent e38e2de
commit f1b075f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 5 deletions.
diff --git a/CoreToFolia b/CoreToFolia
diff --git a/CoreToSponge b/CoreToSponge
diff --git a/ShipsForCore b/ShipsForCore
diff --git a/TranslateCore b/TranslateCore
diff --git a/buildGradle/build.gradle b/buildGradle/build.gradle
@@ -25,7 +25,11 @@ tasks.register("buildPaper") {
     dependsOn("CoreToFolia:build")
     dependsOn("ShipsForCore:build")
     doLast {
-        combine("CoreToFolia", (zos) -> { })
+        combine("CoreToFolia", (zos) -> {
+            var yaml = Files.lines(file("buildGradle/paper-plugin.yml").toPath()).collect(Collectors.joining("\n")).replaceAll("%version%", version)
+            zos.putNextEntry(new ZipEntry("paper-plugin.yml"))
+            zos.write(yaml.getBytes(Charset.forName("UTF-8")))
+        })
     }
 }
 
@@ -36,6 +40,9 @@ ext.combine = { path, adder ->
     var name = path.substring("CoreTo".length())
 
     var output = file('standalone/Ships' + name + ".jar")
+    if (output.exists()) {
+        output.delete();
+    }
 
     output.parentFile.mkdirs()
     output.createNewFile();
@@ -53,6 +60,16 @@ ext.combine = { path, adder ->
                 }
                 return
             }
+            if (entry.getName().equals("META-INF/translate-core.properties")) {
+                System.err.println("Found translate-core entry in module of " + file.path)
+                return;
+            }
+            if (entry.getName().equals("paper-plugin.yml")) {
+                return
+            }
+            if (entry.getName().equals("META-INF/sponge_plugins.json")) {
+                return
+            }
             entered.add(entry.getName())
             var newEntry = new ZipEntry(entry.getName());
             zos.putNextEntry(newEntry);

diff --git a/buildGradle/paper-plugin.yml b/buildGradle/paper-plugin.yml
@@ -0,0 +1,11 @@
+name: 'Ships'
+version: '%version%'
+api-version: '1.19'
+main: 'org.core.implementation.folia.platform.plugin.boot.TranslateCoreBoot'
+authors:
+  - mosemister
+dependencies:
+  server:
+    vault:
+      load: AFTER
+      required: false
+1 −2		build.gradle
+14 −1		src/main/java/org/core/implementation/folia/entity/living/human/player/live/BLivePlayer.java
+4 −3		src/main/java/org/core/implementation/folia/platform/BukkitPlatform.java
+15 −1		src/main/java/org/core/implementation/folia/platform/PlatformConsole.java
+62 −70		src/main/java/org/core/implementation/folia/platform/plugin/boot/TranslateCoreBoot.java
+1 −1		src/main/java/org/ships/plugin/ShipsPlugin.java
+8 −0		src/main/java/org/ships/vessel/common/loader/shipsvessel/ShipsFileLoader.java
+2 −0		src/main/java/org/ships/vessel/common/types/typical/airship/Airship.java
+2 −0		src/main/java/org/ships/vessel/common/types/typical/marsship/Marsship.java
+2 −0		src/main/java/org/ships/vessel/common/types/typical/plane/Plane.java
+2 −0		src/main/java/org/ships/vessel/common/types/typical/submarine/Submarine.java
+4 −0		src/main/java/org/ships/vessel/common/types/typical/watership/WaterShip.java
+2 −0		src/main/java/org/core/entity/living/human/player/LivePlayer.java
+20 −0		src/main/java/org/core/utils/Else.java