diff --git a/build.gradle b/build.gradle index b4791f1..b5703b6 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ repositories { ivy { url = "https://github.com/Better-than-Adventure" patternLayout { - artifact "[organisation]/releases/download/v[revision]/[module].jar" + artifact("[organisation]/releases/download/v[revision]/[module].jar") m2compatible = true } metadataSources { artifact() } @@ -35,7 +35,7 @@ repositories { ivy { url = "https://github.com/Turnip-Labs" patternLayout { - artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar" + artifact("[organisation]/releases/download/v[revision]/[module]-[revision].jar") m2compatible = true } metadataSources { artifact() } @@ -43,7 +43,7 @@ repositories { ivy { url = "https://github.com/Turnip-Labs" patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" + artifact("[organisation]/releases/download/[revision]/[module]-[revision].jar") m2compatible = true } metadataSources { artifact() } @@ -51,7 +51,7 @@ repositories { ivy { url = "https://github.com/Turnip-Labs" patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar" + artifact("[organisation]/releases/download/[revision]/[module]-bta-[revision].jar") m2compatible = true } metadataSources { artifact() } @@ -59,7 +59,7 @@ repositories { ivy { url = "https://piston-data.mojang.com" patternLayout { - artifact "v1/[organisation]/[revision]/[module].jar" + artifact("v1/[organisation]/[revision]/[module].jar") m2compatible = true } metadataSources { artifact() } @@ -67,7 +67,7 @@ repositories { ivy { url = "https://github.com/MartinSVK12" patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" + artifact("[organisation]/releases/download/[revision]/[module]-[revision].jar") m2compatible = true } metadataSources { artifact() } @@ -75,24 +75,25 @@ repositories { } dependencies { - minecraft "bta-download-repo:bta:${project.bta_version}" - mappings loom.layered() {} + minecraft("bta-download-repo:bta:${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}" + modRuntimeOnly("objects:client:43db9b498cb67058d2e12d394e6507722e71bb45") // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar + modImplementation("fabric-loader:fabric-loader:${project.loader_version}") - modImplementation "ModMenu:ModMenu:2.0.0" + 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 group: 'com.google.code.gson', name: 'gson', version: '2.8.9' + 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:33.0.0-jre") + implementation("com.google.code.gson:gson: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 { @@ -102,7 +103,7 @@ java { } tasks.withType(JavaCompile).configureEach { - options.release.set 8 + options.release.set(8) } jar { @@ -112,7 +113,7 @@ jar { } processResources { - inputs.property "version", version + inputs.property("version", version) filesMatching("fabric.mod.json") { expand "version": version diff --git a/gradle.properties b/gradle.properties index 2f86a95..65b0354 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,16 @@ org.gradle.jvmargs=-Xmx2G # BTA -bta_version=1.7.7.0_02 +bta_version=7.1 -# Loader -loader_version=0.14.19-babric.1-bta +# Loader & Mod Menu +loader_version=0.15.6-babric.4-bta +mod_menu_version=2.0.5 + +# HalpLibe +halplibe_version=3.5.2 # Mod -mod_version=1.0.0 +mod_version=1.0.1 mod_group=apollointhehouse mod_name=NoBurnout diff --git a/src/main/java/apollointhehouse/noburnout/mixin/BlockRedstoneTorchMixin.java b/src/main/java/apollointhehouse/noburnout/mixin/BlockRedstoneTorchMixin.java index 8877d46..98bb4c3 100644 --- a/src/main/java/apollointhehouse/noburnout/mixin/BlockRedstoneTorchMixin.java +++ b/src/main/java/apollointhehouse/noburnout/mixin/BlockRedstoneTorchMixin.java @@ -3,6 +3,7 @@ import net.minecraft.core.block.Block; import net.minecraft.core.block.BlockRedstoneTorch; import net.minecraft.core.world.World; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; @@ -14,6 +15,7 @@ public abstract class BlockRedstoneTorchMixin { @Shadow protected abstract boolean isPoweredByBlock(World world, int i, int j, int k); + @Final @Shadow private boolean torchActive; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 4d4432d..ddc8d52 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -6,7 +6,7 @@ "name": "NoBurnout", "description": "This mod removes redstone torch burnout.", "authors": [ - "Turnip Labs" + "Apollointhehouse" ], "contact": { "homepage": "https://github.com/Apollointhehouse/NoBurnout",