diff --git a/build.gradle b/build.gradle index 3729c60..03efe47 100644 --- a/build.gradle +++ b/build.gradle @@ -86,6 +86,12 @@ task sourcesJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource } +gradle.taskGraph.whenReady {taskGraph -> + if (taskGraph.hasTask(build)) { /* when run remapJar, build, runClient, or runServer task */ + autoIncrementBuildNumber() + } +} + jar { from "LICENSE" } diff --git a/gradle.properties b/gradle.properties index 3411590..3b60cea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.16.4 yarn_mappings=1.16.4+build.9 loader_version=0.10.8 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.1 maven_group=dev.pfaff archives_base_name=thinksame diff --git a/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java b/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java index d10b98c..bbfead9 100644 --- a/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java +++ b/src/main/java/dev/pfaff/thinksame/mixin/MouseMixin.java @@ -10,6 +10,9 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; // TODO: modify injection to not overwrite whole method. @Mixin(Mouse.class) @@ -36,9 +39,10 @@ public abstract class MouseMixin { @Shadow private boolean rightButtonClicked; - @SuppressWarnings("OverwriteAuthorRequired") - @Overwrite - private void onMouseButton(long window, int button, int action, int mods) { + @Inject(method = "onMouseButton", at = @At("HEAD"), cancellable = true) + private void onMouseButton(long window, int button, int action, int mods, CallbackInfo ci) { + ci.cancel(); + if (window == this.client.getWindow().getHandle()) { boolean bl = action == 1; // if (MinecraftClient.IS_SYSTEM_MAC && button == 0) { diff --git a/version.properties b/version.properties index 762d270..23e183e 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -#Fri Jan 08 17:57:39 EST 2021 -VERSION_BUILD=1 +#Fri Jan 08 22:27:14 EST 2021 +VERSION_BUILD=3