Update for 1.15.2

LXGaming · Mar 8, 2020 · c8cd087 · c8cd087
1 parent f93ffa1
commit c8cd087
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,11 +31,11 @@ targetCompatibility = 1.8
 
 group = "io.github.lxgaming"
 archivesBaseName = "Sledgehammer"
-version = "1.14.4-2.0.0"
+version = "1.15.2-2.0.0"
 
 minecraft {
     accessTransformer(file("src/main/resources/accesstransformer.cfg"))
-    mappings(channel: "stable", version: "58-1.14.4")
+    mappings(channel: "snapshot", version: "20200307-1.15.1")
     runs {
         client = {
             properties("forge.logging.markers": "SCAN,REGISTRIES,REGISTRYDUMP")
@@ -85,7 +85,7 @@ repositories {
 }
 
 dependencies {
-    minecraft("net.minecraftforge:forge:1.14.4-28.2.0")
+    minecraft("net.minecraftforge:forge:1.15.2-31.1.0")
     shadow("org.checkerframework:checker-qual:2.11.1")
     testCompile("org.junit.jupiter:junit-jupiter-engine:5.5.2")
     runtime("org.ow2.asm:asm-analysis:6.2")

diff --git a/.../java/io/github/lxgaming/sledgehammer/configuration/category/mixin/CoreMixinCategory.java b/.../java/io/github/lxgaming/sledgehammer/configuration/category/mixin/CoreMixinCategory.java
@@ -31,9 +31,9 @@ public class CoreMixinCategory {
     @Setting(value = "invalid-translation", comment = "If 'true', prevents crashes caused by invalid translations.")
     private boolean invalidTranslation = false;
 
-    @Mapping(value = "core.util.LazyLoadBaseMixin")
-    @Setting(value = "lazy-load-base-thread-safe", comment = "If 'true', makes LazyLoadBase Thread-safe.")
-    private boolean lazyLoadBaseThreadSafe = false;
+    @Mapping(value = "core.util.LazyValueMixin")
+    @Setting(value = "lazy-value-thread-safe", comment = "If 'true', makes LazyValue Thread-safe.")
+    private boolean lazyValueThreadSafe = false;
 
     @Mapping(value = "core.network.play.ServerPlayNetHandlerMixin_Sleep")
     @Setting(value = "leave-sleep", comment = "If 'true', allows players to exit the sleep screen.")
@@ -55,8 +55,8 @@ public boolean isInvalidTranslation() {
         return invalidTranslation;
     }
 
-    public boolean isLazyLoadBaseThreadSafe() {
-        return lazyLoadBaseThreadSafe;
+    public boolean isLazyValueThreadSafe() {
+        return lazyValueThreadSafe;
     }
 
     public boolean isLeaveSleep() {

diff --git a/src/main/java/io/github/lxgaming/sledgehammer/mixin/core/client/MinecraftMixin.java b/src/main/java/io/github/lxgaming/sledgehammer/mixin/core/client/MinecraftMixin.java
@@ -34,7 +34,7 @@ public abstract class MinecraftMixin {
     private static Logger LOGGER;
 
     @Inject(
-            method = "init",
+            method = "<init>",
             at = @At(
                     value = "RETURN"
             )

diff --git a/src/main/java/io/github/lxgaming/sledgehammer/mixin/core/client/MinecraftMixin_DropItem.java b/src/main/java/io/github/lxgaming/sledgehammer/mixin/core/client/MinecraftMixin_DropItem.java
@@ -18,7 +18,6 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.entity.item.ItemEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -30,14 +29,14 @@ public abstract class MinecraftMixin_DropItem {
             method = "processKeyBinds",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/entity/player/ClientPlayerEntity;dropItem(Z)Lnet/minecraft/entity/item/ItemEntity;"
+                    target = "Lnet/minecraft/client/entity/player/ClientPlayerEntity;func_225609_n_(Z)Z"
             )
     )
-    private ItemEntity onDropItem(ClientPlayerEntity player, boolean dropAll) {
+    private boolean onDropItem(ClientPlayerEntity player, boolean dropAll) {
         if (player.openContainer == null) {
-            return player.dropItem(dropAll);
+            return player.func_225609_n_(dropAll);
         }
 
-        return null;
+        return false;
     }
 }
diff --git a/...er/mixin/core/util/LazyLoadBaseMixin.java → ...ammer/mixin/core/util/LazyValueMixin.java b/...er/mixin/core/util/LazyLoadBaseMixin.java → ...ammer/mixin/core/util/LazyValueMixin.java
@@ -16,15 +16,15 @@
 
 package io.github.lxgaming.sledgehammer.mixin.core.util;
 
-import net.minecraft.util.LazyLoadBase;
+import net.minecraft.util.LazyValue;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
 import java.util.function.Supplier;
 
-@Mixin(value = LazyLoadBase.class)
-public abstract class LazyLoadBaseMixin<T> {
+@Mixin(value = LazyValue.class)
+public abstract class LazyValueMixin<T> {
 
     @Shadow
     private Supplier<T> supplier;

diff --git a/src/main/resources/mixins.sledgehammer.core.json b/src/main/resources/mixins.sledgehammer.core.json
@@ -11,7 +11,7 @@
     "network.play.ServerPlayNetHandlerMixin_Sleep",
     "util.text.TextFormattingMixin",
     "util.text.TranslationTextComponentMixin",
-    "util.LazyLoadBaseMixin"
+    "util.LazyValueMixin"
   ],
   "client": [
     "client.GameSettingsMixin",