feat: add rule noteBlockSuppressionReintroduced

Author: OptiJava

common.gradle

@@ -53,9 +53,6 @@ dependencies {
     // mods
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
     modImplementation("curse.maven:carpet-349239:${project.carpet_core_version}")
-
-    // MixinExtras
-    include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.2.2")))
 }
 
 

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx3g
 org.gradle.parallel=true
 
-loader_version=0.14.22
+loader_version=0.15.6
 
 mod_version=1.6.0
 maven_group=io.github.optijava

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

@@ -196,4 +196,12 @@ public class OptCarpetSettings {
             validate = CustomItemDiscardTimeValidator.class
     )
     public static int customItemDiscardTime = -1;
+
+    //#if MC >= 12000
+    //$$ @Rule(
+    //$$         desc = "Reintroduce note block suppression(in version >= 1.20)",
+    //$$         category = RuleCategory.FEATURE
+    //$$ )
+    //$$ public static boolean noteBlockSuppressionReintroduced = false;
+    //#endif
 }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/noteBlockSuppressionReintroduced/RedstoneWireBlock_Mixin.java

@@ -0,0 +1,25 @@
+package io.github.optijava.opt_carpet_addition.mixins.rule.noteBlockSuppressionReintroduced;
+
+//#if MC >= 12000
+//$$ import net.minecraft.block.*;
+//$$ import org.spongepowered.asm.mixin.Mixin;
+//$$ import org.spongepowered.asm.mixin.injection.At;
+//$$ import org.spongepowered.asm.mixin.injection.Redirect;
+
+//$$ import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
+
+//$$ @Mixin(RedstoneWireBlock.class)
+//$$ public class RedstoneWireBlock_Mixin {
+//$$     @Redirect(
+//$$             method = "getRenderConnectionType(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Z)Lnet/minecraft/block/enums/WireConnection;",
+//$$             at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;getBlock()Lnet/minecraft/block/Block;")
+//$$     )
+//$$     private Block redirectGetBlock(BlockState instance) {
+//$$         if (OptCarpetSettings.noteBlockSuppressionReintroduced) {
+//$$             return (RedstoneWireBlock) (Object) this;
+//$$         } else {
+//$$             return instance.getBlock();
+//$$         }
+//$$     }
+//$$ }
+//#endif

src/main/resources/opt-carpet-addition.mixins.json

@@ -37,6 +37,9 @@
     "rule.optimizeFakePlayerSpawn.EntityPlayerMPFake_Mixin",
     "rule.optimizeFakePlayerSpawn.PlayerCommand_Mixin",
     "rule.removeAllCurseOfBindingArmorWhenPlayerDeadInWall.ServerPlayerEntity_Mixin",
+    //#if MC >= 12000
+    //$$ "rule.noteBlockSuppressionReintroduced.RedstoneWireBlock_Mixin",
+    //#endif
     "rule.customItemDiscardTime.ItemEntity_Mixin"
   ],
   "client": [