em

xiewuzhiying · Sep 29, 2024 · bb3d6fb · bb3d6fb
1 parent 53e19b0
commit bb3d6fb
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 284 deletions.
diff --git a/...io/github/xiewuzhiying/vs_addition/mixin/create/placement_helper/MixinBlockBehaviour.java b/...io/github/xiewuzhiying/vs_addition/mixin/create/placement_helper/MixinBlockBehaviour.java
diff --git a/.../main/java/io/github/xiewuzhiying/vs_addition/mixin/minecraft/MixinVibrationListener.java b/.../main/java/io/github/xiewuzhiying/vs_addition/mixin/minecraft/MixinVibrationListener.java
diff --git a/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/minecraft/client/MixinParticle.java b/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/minecraft/client/MixinParticle.java
diff --git a/...on/src/main/java/io/github/xiewuzhiying/vs_addition/mixin/vs_clockwork/MixinDyedWing.java b/...on/src/main/java/io/github/xiewuzhiying/vs_addition/mixin/vs_clockwork/MixinDyedWing.java
@@ -37,13 +37,15 @@ public abstract class MixinDyedWing {
             cancellable = true
     )
     private void onUse(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit, CallbackInfoReturnable<InteractionResult> cir) {
-        IPlacementHelper placementHelper = null;
-        if(((DyedWing)(Object)this) instanceof WingBlock) {
+        final IPlacementHelper placementHelper;
+        if((DyedWing)(Object)this instanceof WingBlock) {
             placementHelper = PlacementHelpers.get(vs_addition$wingPlacementHelperId);
-        } else if(((DyedWing)(Object)this) instanceof FlapBlock) {
+        } else if((DyedWing)(Object)this instanceof FlapBlock) {
             placementHelper = PlacementHelpers.get(vs_addition$flapPlacementHelperId);
+        } else {
+            return;
         }
-        if (placementHelper != null && !player.isShiftKeyDown() && player.mayBuild()) {
+        if (!player.isShiftKeyDown() && player.mayBuild()) {
             ItemStack heldItem = player.getItemInHand(hand);
             if (placementHelper.matchesItem(heldItem)) {
                 placementHelper.getOffset(player, level, state, pos, hit)

diff --git a/.../xiewuzhiying/vs_addition/compats/create/placement_helper/TestFlapBlockPlacementHelper.kt b/.../xiewuzhiying/vs_addition/compats/create/placement_helper/TestFlapBlockPlacementHelper.kt
diff --git a/.../xiewuzhiying/vs_addition/compats/create/placement_helper/TestWingBlockPlacementHelper.kt b/.../xiewuzhiying/vs_addition/compats/create/placement_helper/TestWingBlockPlacementHelper.kt
diff --git a/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/stuff/PlacementHelper.kt b/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/stuff/PlacementHelper.kt
diff --git a/common/src/main/resources/vs_addition-common.mixins.json b/common/src/main/resources/vs_addition-common.mixins.json
@@ -64,7 +64,6 @@
     "ftbchunks.client.MixinFTBChunksClient",
     "journeymap.client.MixinMiniMap",
     "kontraption.client.MixinKontraptionClientTickHandler",
-    "minecraft.client.MixinParticle",
     "vs_clockwork.client.flap_bearing.MixinFlapBearingRenderer",
     "xaeros_minimap.client.MixinMinimapRenderer"
   ],

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -90,13 +90,13 @@ dependencies {
     modImplementation("maven.modrinth:createaddition:vV4bZmhm")
 
     // VoxelMap Updated
-    modImplementation("maven.modrinth:voxelmap-updated:1.20.1-1.12.13")
+    modCompileOnly("maven.modrinth:voxelmap-updated:1.20.1-1.12.13")
 
     // Sodium
-    modImplementation("maven.modrinth:sodium:mc1.20.1-0.5.11")
+    modCompileOnly("maven.modrinth:sodium:mc1.20.1-0.5.11")
 
     // Presence Footsteps
-    modImplementation("maven.modrinth:presence-footsteps:1.9.4+1.20.1")
+    modCompileOnly("maven.modrinth:presence-footsteps:1.9.4+1.20.1")
 }
 
 processResources {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -118,11 +118,11 @@ dependencies {
     modImplementation("maven.modrinth:net-music:1IkUTusQ")
 
     // Embeddium
-    modImplementation("maven.modrinth:embeddium:0.3.18+mc1.20.1")
-    modImplementation("maven.modrinth:embeddiumplus:1.20.1-v1.2.13")
+    modCompileOnly("maven.modrinth:embeddium:0.3.18+mc1.20.1")
+    modCompileOnly("maven.modrinth:embeddiumplus:1.20.1-v1.2.13")
 
     // Presence Footsteps
-    modImplementation files("jars/PresenceFootsteps-1.20.1-1.9.1-beta.1.jar")
+    modCompileOnly files("jars/PresenceFootsteps-1.20.1-1.9.1-beta.1.jar")
 }
 
 processResources {