1.3.1

Dueris · Dec 28, 2024 · 03122e4 · 03122e4
1 parent 7e90498
commit 03122e4
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -34,8 +34,8 @@ jobs:
         if: "!contains(github.event.head_commit.message, '--skip') && !contains(github.event.head_commit.commit.message, '--skip')"
         uses: softprops/action-gh-release@v1
         with:
-          name: Latest v1.3.0 dev
-          tag_name: mc1.21/0-v1.3.0
+          name: Latest v1.3.1 dev
+          tag_name: mc1.21/0-v1.3.1
           body: \"changes\"=${{ github.event.head_commit.message }}
           token: ${{ secrets.GIT_TOKEN }}
           files: build/libs/*.jar

diff --git a/API-DOCS.md b/API-DOCS.md
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("io.github.Dueris:OriginsPaper:mc1.21~0-v1.3.0")
+    implementation("io.github.Dueris:OriginsPaper:mc1.21~0-v1.3.1")
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,10 +10,10 @@ plugins {
     `maven-publish`
     id("io.papermc.paperweight.userdev") version "1.7.7" apply true
     id("com.gradleup.shadow") version "9.0.0-beta4" apply true
-    id("io.github.dueris.eclipse.gradle") version "1.2.2" apply true
+    id("io.github.dueris.eclipse.gradle") version "1.2.3" apply true
 }
 
-version = "v1.3.0"
+version = "v1.3.1"
 val apoli = "2.12.0-alpha.14+mc.1.21.1"
 val calio = "1.14.0-alpha.8+mc.1.21.x"
 val mcMajor = "21"

diff --git a/depends/eclipse-2.0.0-all.jar → depends/eclipse-2.0.3-SNAPSHOT-all.jar b/depends/eclipse-2.0.0-all.jar → depends/eclipse-2.0.3-SNAPSHOT-all.jar
diff --git a/origins/build.gradle.kts b/origins/build.gradle.kts
@@ -4,7 +4,7 @@ description = "A full, but unofficial, port of Calio/Apoli/Origins to PaperMC se
 dependencies {
     implementation("com.github.DavidNiessen:JsonConfigAPI:1.0")
     compileOnly("org.mineskin:java-client-jsoup:2.0.0-SNAPSHOT")
-    compileOnly(files("../depends/eclipse-2.0.0-all.jar"))
+    compileOnly(files("../depends/eclipse-2.0.3-SNAPSHOT-all.jar"))
     compileOnly("org.mineskin:java-client:2.0.0-SNAPSHOT")
     project("calio")
 }

diff --git a/origins/src/main/java/io/github/dueris/originspaper/Bootstrap.java b/origins/src/main/java/io/github/dueris/originspaper/Bootstrap.java
@@ -9,8 +9,8 @@ public class Bootstrap implements BootstrapInitializer {
 	private static final Logger log = LogManager.getLogger(Bootstrap.class);
 
 	@Override
-	public void onInitializeBootstrap() {
+	public void onInitializeBootstrap(BootstrapContext bootstrapContext) {
 		// Eclipse entrypoint.
-		OriginsPaper.initialize();
+		OriginsPaper.initialize(bootstrapContext);
 	}
 }
diff --git a/origins/src/main/java/io/github/dueris/originspaper/OriginsPaper.java b/origins/src/main/java/io/github/dueris/originspaper/OriginsPaper.java
@@ -5,6 +5,7 @@
 import com.google.gson.JsonPrimitive;
 import io.github.dueris.calio.CraftCalio;
 import io.github.dueris.calio.util.IdentifierAlias;
+import io.github.dueris.eclipse.api.entrypoint.BootstrapInitializer;
 import io.github.dueris.eclipse.api.mod.ModContainer;
 import io.github.dueris.eclipse.loader.EclipseLauncher;
 import io.github.dueris.originspaper.action.type.BiEntityActionTypes;
@@ -61,7 +62,7 @@ public class OriginsPaper {
 	public static MinecraftServer server;
 	public static Path jarFile;
 	public static ModContainer modContainer;
-	public static String version = "v1.3.0";
+	public static String version = "v1.3.1";
 	public static OriginsPaper.ServerConfig config;
 
 	public static @NotNull ResourceLocation identifier(String path) {
@@ -76,17 +77,16 @@ public static OriginsPlugin getPlugin() {
 		return OriginsPlugin.plugin;
 	}
 
-	public static void initialize() {
-		ModContainer container = EclipseLauncher.INSTANCE.modEngine().container("origins").orElseThrow();
-		jarFile = container.resource().path().toAbsolutePath().normalize(); // Normalize path to complete.
-		modContainer = container;
+	public static void initialize(BootstrapInitializer.@NotNull BootstrapContext bootstrapContext) {
+		jarFile = bootstrapContext.getModSource();
+		modContainer = bootstrapContext.getModContainer();
 		PluginInstances.init();
 
 		CraftCalio.initialize();
 
 		final JsonConfigAPI jsonConfigAPI = new JsonConfigAPI(true);
-		File serverJson = new File(jarFile.getParent().resolve("Origins").toFile(), "origins_server.json");
-		String parentPath = jarFile.getParent().resolve("Origins").toFile().getAbsolutePath() + File.separator;
+		File serverJson = new File(bootstrapContext.getDataDirectory().toFile(), "origins_server.json");
+		String parentPath = bootstrapContext.getDataDirectory().toFile().getAbsolutePath() + File.separator;
 
 		jsonConfigAPI.registerConfig(
 			new OriginsPaper.ServerConfig(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ repositories { @@
     }
     dependencies {
-        implementation("io.github.Dueris:OriginsPaper:mc1.21~0-v1.3.0")
+        implementation("io.github.Dueris:OriginsPaper:mc1.21~0-v1.3.1")
     }
     ```
@@ Expand Down @@