From 3e3f0a394deb6a33678a81615ada6b3ce2ac80f6 Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 14 Mar 2023 21:18:06 +0100 Subject: [PATCH] Bump to 1.19.4 --- build.gradle.kts | 2 +- gradle.properties | 10 ++--- .../quickmath/mixin/MathHelperMixin.java | 42 ++----------------- 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fa71b1b..beb03d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,5 +12,5 @@ dependencies { // Dev env modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") - modLocalRuntime("com.terraformersmc:modmenu:5.0.2") + modLocalRuntime("com.terraformersmc:modmenu:6.1.0-rc.1") } diff --git a/gradle.properties b/gradle.properties index 0350684..17cf4bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # https://fabricmc.net/develop/ -minecraft_version=1.19.3 -yarn_mappings=build.5 -loader_version=0.14.12 +minecraft_version=1.19.4 +yarn_mappings=build.1 +loader_version=0.14.17 maven_group=io.gitlab.jfronny archives_base_name=quickmath @@ -13,5 +13,5 @@ curseforge_id=400837 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu -fabric_version=0.70.0+1.19.3 -libjf_version=3.4.1 +fabric_version=0.75.3+1.19.4 +libjf_version=3.6.0 diff --git a/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin.java b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin.java index b3d509b..6e6b83e 100644 --- a/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin.java @@ -1,15 +1,9 @@ package io.gitlab.jfronny.quickmath.mixin; -import io.gitlab.jfronny.quickmath.MathUtil; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.random.*; -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.ModifyVariable; +import net.minecraft.util.math.random.Random; +import org.spongepowered.asm.mixin.*; +import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(MathHelper.class) @@ -18,11 +12,6 @@ public abstract class MathHelperMixin { @Shadow public static int floor(double value) { return 0; } @Shadow public static double nextDouble(Random random, double min, double max) { return 0; } - @Overwrite - public static int fastFloor(double d) { - return (int)(d / 32) * 32; - } - @Overwrite public static long lfloor(double d) { return (long) (Math.floor(d / 4) * 4); @@ -62,29 +51,4 @@ public abstract class MathHelperMixin { private static void adjustRandomDouble(CallbackInfoReturnable ci) { ci.setReturnValue((double) floor(ci.getReturnValue())); } - - @Overwrite - public static double average(long[] array) { - long[] var3 = array; - - long min = Long.MAX_VALUE; - long max = Long.MIN_VALUE; - - int var4 = array.length; - - for(int var5 = 0; var5 < var4; ++var5) { - long m = var3[var5]; - if (m > max) - max = m; - if (m < min) - min = m; - } - - return nextDouble(RANDOM, min, max); - } - - @Overwrite - public static long clamp(long value, long min, long max) { - return MathUtil.boxedInvert(Math.max(Math.min(value, max), min), max, min); - } }