rework customSticky mixin

Author: TexBlock

CHANGELOG.md

@@ -1,2 +1,2 @@
 ## Changelog
-- fix `releaseTarget`
+- rework `customSticky` mixin

gradle.properties

@@ -10,7 +10,7 @@ loom.platform = neoforge
 
 # Mod Properties
 	upstream_version = 1.4.147
-	mod_version = 0.1.4
+	mod_version = 0.1.5
 	maven_group = org.thinkingstudio.bedsheet
 	archives_base_name = bedsheet
 

src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java

@@ -11,7 +11,10 @@
 @Mixin(PieceGeneratorSupplier.class)
 public interface PieceGeneratorSupplier_plopMixin
 {
-    @Redirect(method = "method_39845", at = @At(
+    // method_39845 is intermediary name
+    // lambda$simple$0 is mojmap name
+    // NeoForge NOT HAVE intermediary name!
+    @Redirect(method = {"method_39845", "lambda$simple$0"}, at = @At(
             value = "INVOKE",
             target = "java/util/function/Predicate.test(Ljava/lang/Object;)Z"
     ), remap = false)

src/main/java/carpet/mixins/PistonStructureResolver_customStickyMixin.java

@@ -17,19 +17,19 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.piston.PistonStructureResolver;
 import net.minecraft.world.level.block.state.BlockState;
-import org.thinkingstudio.bedsheet.util.PistonStructureResolverHooks;
 
 @Mixin(PistonStructureResolver.class)
 public class PistonStructureResolver_customStickyMixin {
 
     @Shadow @Final private Level level;
     @Shadow @Final private Direction pushDirection;
 
-    // NeoForge patched, see PistonStructureResolverHelper
+    // NeoForge patched, use state.canStickTo(BlockState)
 //    @Shadow private static boolean canStickToEachOther(BlockState blockState, BlockState blockState2) {
 //        throw new AssertionError();
 //    }
 //
+    // NeoForge patched, inject IBlockExtension.isStickyBlock(BlockState)
 //    @Inject(
 //        method = "isSticky",
 //        cancellable = true,
@@ -73,7 +73,7 @@ private boolean onAddBlockLineCanStickToEachOther(BlockState state, BlockState b
             return behaviourInterface.isStickyToNeighbor(level, pos_addBlockLine, state, behindPos_addBlockLine, behindState, pushDirection.getOpposite(), pushDirection);
         }
 
-        return PistonStructureResolverHooks.isAdjacentBlockStuck(state, behindState);
+        return state.canStickTo(behindState);
     }
 
     // fields that are needed because @Redirects cannot capture locals
@@ -106,6 +106,6 @@ private boolean onAddBranchingBlocksCanStickToEachOther(BlockState neighborState
             return behaviourInterface.isStickyToNeighbor(level, pos, state, neighborPos_addBranchingBlocks, neighborState, dir_addBranchingBlocks, pushDirection);
         }
 
-        return PistonStructureResolverHooks.isAdjacentBlockStuck(neighborState, state);
+        return neighborState.canStickTo(state);
     }
 }

src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java

@@ -11,13 +11,12 @@
 
 @Mixin(ReloadCommand.class)
 public class ReloadCommand_reloadAppsMixin {
-    // method_13530(Lcom/mojang/brigadier/context/CommandContext;)I = lambda$register$3(Lcom/mojang/brigadier/context/CommandContext;)I
+    // method_13530(Lcom/mojang/brigadier/context/CommandContext;)I
     // internal of register.
-    // dev & compile use intermediary name, runtime use mojmap name
-    @Inject(method = {
-            "method_13530(Lcom/mojang/brigadier/context/CommandContext;)I", // dev & compile
-            "lambda$register$3(Lcom/mojang/brigadier/context/CommandContext;)I" // runtime
-    }, at = @At("TAIL"), remap = false)
+    // method_13530 is intermediary name
+    // lambda$register$3 is mojmap name
+    // NeoForge NOT HAVE intermediary name!
+    @Inject(method = {"method_13530", "lambda$register$3"}, at = @At("TAIL"), remap = false)
     private static void onReload(CommandContext<CommandSourceStack> context, CallbackInfoReturnable<Integer> cir)
     {
         // can't fetch here the reference to the server

src/main/java/org/thinkingstudio/bedsheet/mixins/IBlockExtensionMixin.java

@@ -0,0 +1,25 @@
+package org.thinkingstudio.bedsheet.mixins;
+
+import carpet.fakes.BlockPistonBehaviourInterface;
+import net.minecraft.world.level.block.state.BlockState;
+import net.neoforged.neoforge.common.extensions.IBlockExtension;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(IBlockExtension.class)
+public interface IBlockExtensionMixin {
+    @Inject(
+            method = "isStickyBlock",
+            cancellable = true,
+            at = @At(
+                    value = "HEAD"
+            )
+    )
+    private void isSticky(BlockState state, CallbackInfoReturnable<Boolean> cir) {
+        if (state.getBlock() instanceof BlockPistonBehaviourInterface behaviourInterface){
+            cir.setReturnValue(behaviourInterface.isSticky(state));
+        }
+    }
+}

src/main/java/org/thinkingstudio/bedsheet/util/PistonStructureResolverHooks.java

@@ -14,6 +14,7 @@ description = '''
 Carpet unofficial NeoForge port.
 '''
 logoFile = "icon.png"
+displayTest = "IGNORE_SERVER_VERSION"
 
 [[dependencies.bedsheet]]
 modId = "neoforge"
@@ -30,4 +31,7 @@ ordering = "NONE"
 side = "BOTH"
 
 [[mixins]]
-config = "carpet.mixins.json"
+config = "carpet.mixins.json"
+
+[[mixins]]
+config = "bedsheet.mixins.json"

src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "package": "org.thinkingstudio.bedsheet.mixins",
+  "compatibilityLevel": "JAVA_21",
+  "mixins": [
+    "IBlockExtensionMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}