diff --git a/gradle.properties b/gradle.properties index e766155..82eb001 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ mod_name=Better Random # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=BSD 2 Clause # The mod version. See https://semver.org/ -mod_version=1.3.0 +mod_version=1.3.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/ru/dbotthepony/mc/prng/mixin/LevelMixin.java b/src/main/java/ru/dbotthepony/mc/prng/mixin/LevelMixin.java index 9dc18cc..8a9fbf4 100644 --- a/src/main/java/ru/dbotthepony/mc/prng/mixin/LevelMixin.java +++ b/src/main/java/ru/dbotthepony/mc/prng/mixin/LevelMixin.java @@ -11,13 +11,12 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; import ru.dbotthepony.mc.prng.BetterRandom; -@Mixin(Level.class) +@Mixin(value = Level.class, priority = 10000) // ensure this mixin is applied over other "regular" mixins public abstract class LevelMixin { @Shadow @Final private Thread thread; - @Final // ensure it is on top-level @Redirect( method = "", at = @At( diff --git a/src/main/java/ru/dbotthepony/mc/prng/mixin/RandomSourceMixin.java b/src/main/java/ru/dbotthepony/mc/prng/mixin/RandomSourceMixin.java index 14100ce..7a41528 100644 --- a/src/main/java/ru/dbotthepony/mc/prng/mixin/RandomSourceMixin.java +++ b/src/main/java/ru/dbotthepony/mc/prng/mixin/RandomSourceMixin.java @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.prng.mixin; import net.minecraft.util.RandomSource; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import ru.dbotthepony.mc.prng.GJRAND64RandomSource; @@ -8,11 +9,13 @@ import ru.dbotthepony.mc.prng.GJRAND64RandomSource; @Mixin(RandomSource.class) public interface RandomSourceMixin { @Overwrite + @Final static RandomSource create() { return new GJRAND64RandomSource(); } @Overwrite + @Final static RandomSource create(long seed) { return new GJRAND64RandomSource(seed); } diff --git a/src/main/java/ru/dbotthepony/mc/prng/mixin/WorldgenRandomMixin.java b/src/main/java/ru/dbotthepony/mc/prng/mixin/WorldgenRandomMixin.java index 8610786..bdd393a 100644 --- a/src/main/java/ru/dbotthepony/mc/prng/mixin/WorldgenRandomMixin.java +++ b/src/main/java/ru/dbotthepony/mc/prng/mixin/WorldgenRandomMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; import ru.dbotthepony.mc.prng.GJRAND64RandomSource; -@Mixin(WorldgenRandom.class) +@Mixin(value = WorldgenRandom.class, priority = 10000) // ensure this mixin is applied over other "regular" mixins public abstract class WorldgenRandomMixin { @Shadow private RandomSource randomSource;