From 7652ac418961ce3beb1907ce945526359686340e Mon Sep 17 00:00:00 2001 From: rootEnginear Date: Sun, 14 Apr 2024 21:02:04 +0700 Subject: [PATCH 1/3] =?UTF-8?q?chore:=207.1=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 13 ++-- gradle.properties | 9 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../rootenginear/playground/Playground.java | 13 +++- src/main/resources/fabric.mod.json | 64 +++++++++++-------- 5 files changed, 64 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index fc61d64..e3bb56d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'babric-loom' version '1.1.+' + id 'babric-loom' version '1.4.+' id 'java' } @@ -83,20 +83,21 @@ dependencies { // Helper library // If you do not need Halplibe you can comment this line out or delete this line - // modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}" + modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}" - modImplementation "ModMenu:ModMenu:2.0.3" + modImplementation "ModMenu:ModMenu:${project.mod_menu_version}" implementation "org.slf4j:slf4j-api:1.8.0-beta4" implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" - implementation 'com.google.guava:guava:30.0-jre' + implementation 'com.google.guava:guava:33.0.0-jre' implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' - var log4jVersion = "2.20.0" implementation("org.apache.logging.log4j:log4j-core:${log4jVersion}") implementation("org.apache.logging.log4j:log4j-api:${log4jVersion}") implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}") + + include(implementation("org.apache.commons:commons-lang3:3.12.0")) } java { @@ -105,7 +106,7 @@ java { withSourcesJar() } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { options.release.set 8 } diff --git a/gradle.properties b/gradle.properties index cd5e06b..545c5ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,14 @@ org.gradle.jvmargs=-Xmx4G # BTA -bta_version=7.1-pre1 +bta_version=7.1 -# Loader -loader_version=0.14.19-babric.2-bta +# Loader & Mod Menu +loader_version=0.15.6-babric.4-bta +mod_menu_version=2.0.5 # HalpLibe -# halplibe_version=3.0.0 +halplibe_version=3.5.2 # Mod mod_version=1.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/rootenginear/playground/Playground.java b/src/main/java/rootenginear/playground/Playground.java index 660347b..1806404 100644 --- a/src/main/java/rootenginear/playground/Playground.java +++ b/src/main/java/rootenginear/playground/Playground.java @@ -3,8 +3,10 @@ import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import turniplabs.halplibe.util.GameStartEntrypoint; +import turniplabs.halplibe.util.RecipeEntrypoint; -public class Playground implements ModInitializer { +public class Playground implements ModInitializer, GameStartEntrypoint, RecipeEntrypoint { public static final String MOD_ID = "playground"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); @@ -12,4 +14,13 @@ public class Playground implements ModInitializer { public void onInitialize() { LOGGER.info("Playground initialized."); } + + @Override + public void beforeGameStart() {} + + @Override + public void afterGameStart() {} + + @Override + public void onRecipesReady() {} } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 4d34a7b..d5da76a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,29 +1,43 @@ { - "schemaVersion": 1, - "id": "playground", - "version": "${version}", - "name": "Playground", - "description": "This is the beginning of awesome mods!", - "authors": [ - "rootEnginear" - ], + "schemaVersion": 1, + "id": "playground", + "version": "${version}", + "name": "Playground", + "description": "This is the beginning of awesome mods!", + "authors": [ + "rootEnginear" + ], "icon": "icon.png", - "contact": { - "homepage": "https://github.com/rootEnginear/bta-rootenginear-mods", - "sources": "https://github.com/rootEnginear/bta-rootenginear-mods", - "issues": "https://github.com/rootEnginear/bta-rootenginear-mods/issues" - }, - "license": "CC0-1.0", - "environment": "*", - "entrypoints": { - "main": [ + "contact": { + "homepage": "https://github.com/rootEnginear/bta-rootenginear-mods", + "sources": "https://github.com/rootEnginear/bta-rootenginear-mods", + "issues": "https://github.com/rootEnginear/bta-rootenginear-mods/issues" + }, + "license": "CC0-1.0", + "environment": "*", + "entrypoints": { + "main": [ "rootenginear.playground.Playground" - ] - }, - "mixins": [ - "playground.mixins.json" - ], - "depends": { - "fabricloader": ">=0.13.3" - } + ], + "beforeGameStart": [ + "rootenginear.playground.Playground" + ], + "afterGameStart": [ + "rootenginear.playground.Playground" + ], + "recipesReady": [ + "rootenginear.playground.Playground" + ] + }, + "mixins": [ + "playground.mixins.json" + ], + "depends": { + "minecraft": "7.1", + "fabricloader": ">=0.15.5", + "halplibe": ">=3.5.2" + }, + "suggests": { + "modmenu-bta": ">=2.0.5" + } } From 92ee53f1897ec48d29ddf21f375eb7064dea7866 Mon Sep 17 00:00:00 2001 From: rootEnginear Date: Sun, 14 Apr 2024 22:34:01 +0700 Subject: [PATCH 2/3] fix: suggest modmenu # Conflicts: # src/main/resources/fabric.mod.json --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d5da76a..e5e8816 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -38,6 +38,6 @@ "halplibe": ">=3.5.2" }, "suggests": { - "modmenu-bta": ">=2.0.5" + "modmenu": ">=2.0.5" } } From cdd57702c3593b26fd2be405e40baf1126070ce1 Mon Sep 17 00:00:00 2001 From: rootEnginear Date: Tue, 16 Apr 2024 06:14:32 +0700 Subject: [PATCH 3/3] fix: halplibe req in readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dfd3d79..01d1f54 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ This is the beginning of awesome mods! > **Important** -> Required [Babric](https://github.com/Turnip-Labs/babric-instance-repo/releases) to run the mod. +> - Required [Babric](https://github.com/Turnip-Labs/babric-instance-repo/releases) to run the mod. +> - Required [HalpLibe](https://github.com/Turnip-Labs/bta-halplibe/releases) in BTA version 7.1 and later. ## Features