diff --git a/build.gradle b/build.gradle index e3bb56d..84e164f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,30 @@ plugins { - id 'babric-loom' version '1.4.+' + id 'fabric-loom' version '1.7.bta' id 'java' } +import org.gradle.internal.os.OperatingSystem + +project.ext.lwjglVersion = "3.3.4" + +switch (OperatingSystem.current()) { + case OperatingSystem.LINUX: + project.ext.lwjglNatives = "natives-linux" + break + case OperatingSystem.WINDOWS: + project.ext.lwjglNatives = "natives-windows" + break + case OperatingSystem.MAC_OS: + project.ext.lwjglNatives = "natives-macos" +} + group = project.mod_group archivesBaseName = project.mod_name version = project.mod_version loom { - gluedMinecraftJar() noIntermediateMappings() - customMinecraftManifest.set("https://github.com/Turnip-Labs/bta-manifest-repo/releases/download/v${project.bta_version}/${project.bta_version}.json") + customMinecraftMetadata.set("https://downloads.betterthanadventure.net/bta-client/${project.bta_channel}/v${project.bta_version}/manifest.json") } repositories { @@ -24,6 +38,14 @@ repositories { name = 'Fabric' url = 'https://maven.fabricmc.net/' } + maven { + name = 'SignalumMavenInfrastructure' + url = 'https://maven.thesignalumproject.net/infrastructure' + } + maven { + name = 'SignalumMavenReleases' + url = 'https://maven.thesignalumproject.net/releases' + } ivy { url = "https://github.com/Better-than-Adventure" patternLayout { @@ -33,25 +55,17 @@ repositories { metadataSources { artifact() } } ivy { - url = "https://github.com/Turnip-Labs" + url = "https://downloads.betterthanadventure.net/bta-client/${project.bta_channel}/" patternLayout { - artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar" + artifact "/v[revision]/client.jar" m2compatible = true } metadataSources { artifact() } } ivy { - url = "https://github.com/Turnip-Labs" + url = "https://downloads.betterthanadventure.net/bta-server/${project.bta_channel}/" patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" - m2compatible = true - } - metadataSources { artifact() } - } - ivy { - url = "https://github.com/Turnip-Labs" - patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar" + artifact "/v[revision]/server.jar" m2compatible = true } metadataSources { artifact() } @@ -64,28 +78,21 @@ repositories { } metadataSources { artifact() } } - ivy { - url = "https://github.com/MartinSVK12" - patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" - m2compatible = true - } - metadataSources { artifact() } - } + } dependencies { - minecraft "bta-download-repo:bta:${project.bta_version}" + minecraft "::${project.bta_version}" mappings loom.layered() {} modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar - modImplementation "fabric-loader:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // 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}" + implementation("turniplabs:halplibe:${project.halplibe_version}") - modImplementation "ModMenu:ModMenu:${project.mod_menu_version}" + modImplementation("turniplabs:modmenu-bta:${project.mod_menu_version}") implementation "org.slf4j:slf4j-api:1.8.0-beta4" implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" @@ -98,6 +105,22 @@ dependencies { implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}") include(implementation("org.apache.commons:commons-lang3:3.12.0")) + + modImplementation("com.github.zarzelcow:legacy-lwjgl3:1.0.4") + implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion") + + runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives" + implementation "org.lwjgl:lwjgl:$lwjglVersion" + implementation "org.lwjgl:lwjgl-assimp:$lwjglVersion" + implementation "org.lwjgl:lwjgl-glfw:$lwjglVersion" + implementation "org.lwjgl:lwjgl-openal:$lwjglVersion" + implementation "org.lwjgl:lwjgl-opengl:$lwjglVersion" + implementation "org.lwjgl:lwjgl-stb:$lwjglVersion" } java { @@ -116,6 +139,11 @@ jar { } } +configurations.configureEach { + // Removes LWJGL2 dependencies + exclude group: "org.lwjgl.lwjgl" +} + processResources { inputs.property "version", version diff --git a/gradle.properties b/gradle.properties index 7a303bf..b5a2bbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,17 @@ org.gradle.jvmargs=-Xmx2G # BTA -bta_version=7.2-pre1 +bta_version=7.3 +bta_channel=release -# Loader & Mod Menu -loader_version=0.15.6-babric.6-bta -mod_menu_version=2.0.5 +# Loader +loader_version=0.15.6-bta.7 # HalpLibe -halplibe_version=4.0.6 +mod_menu_version=3.0.0 +halplibe_version=5.1.2 # Mod -mod_version=1.0.0 +mod_version=2.0.0 mod_group=watermelonmojito mod_name=melonbreak diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b8..0d18421 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-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 46d2434..8b12c9d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,17 +1,21 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - maven { - name = 'Jitpack' - url = 'https://jitpack.io' - } - maven { - name = 'Babric' - url = 'https://maven.glass-launcher.net/babric' - } - } -} \ No newline at end of file + repositories { + gradlePluginPortal() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + maven { + name = 'Jitpack' + url = 'https://jitpack.io' + } + maven { + name = 'Babric' + url = 'https://maven.glass-launcher.net/babric' + } + maven { + name = 'SignalumMavenInfrastructure' + url = 'https://maven.thesignalumproject.net/infrastructure' + } + } +} diff --git a/src/main/java/watermelonmojito/melonbreak/MelonBreak.java b/src/main/java/watermelonmojito/melonbreak/MelonBreak.java index 46f2e2a..7a4ae28 100644 --- a/src/main/java/watermelonmojito/melonbreak/MelonBreak.java +++ b/src/main/java/watermelonmojito/melonbreak/MelonBreak.java @@ -8,11 +8,11 @@ public class MelonBreak implements ModInitializer, GameStartEntrypoint, RecipeEntrypoint { - public static final String MOD_ID = "examplemod"; + public static final String MOD_ID = "melonbreak"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); @Override public void onInitialize() { - LOGGER.info("ExampleMod initialized."); + LOGGER.info("Melon Break initialized."); } @Override diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2a61ca9..c293919 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -6,7 +6,8 @@ "name": "MelonBreak", "description": "Removes Block Break Cooldown", "authors": [ - "WatermelonMojito" + "WatermelonMojito", + "LukeisStuff" ], "contact": { "homepage": "", @@ -35,10 +36,9 @@ "melonbreak.mixins.json" ], - "depends": { - "minecraft": "~7.2-beta", - "fabricloader": ">=0.15.5" - }, + "depends": { + "fabricloader": ">=0.15.5" + }, "suggests": { } } diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png index c64f12d..fe14aed 100644 Binary files a/src/main/resources/icon.png and b/src/main/resources/icon.png differ