Merge pull request #2 from wendavid552/exp/0.6

Fix Nyan-Work#45
SkyDynamic · Sep 24, 2024 · 7850c3f · 7850c3f
2 parents aa67a05 + 3a81cda
commit 7850c3f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -9,7 +9,7 @@ jobs:
     if: ${{ github.event_name == 'push' && !startsWith(github.event.ref, 'refs/tags/') && contains(github.event.head_commit.message, '[build skip]') == false }}
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -81,8 +81,7 @@ jobs:
           prerelease: true
           files: |
             LICENSE
-            fabricWrapper/build/libs/*.jar
-            fabricWrapper/build/tmp/submods/META-INF/jars/*.jar
+            versions/*/build/libs/!(*-@(dev|sources|shadow)).jar
           name: "[CI#${{ github.run_number }}]${{ steps.mod_info.outputs.mod_name }} ${{ steps.mod_info.outputs.mod_version }}.${{ steps.get_commit_count.outputs.commit_count }}+${{ steps.get_short_sha.outputs.short_sha }}"
           tag_name: "${{ github.ref_name }}.${{ github.run_number }}"
           target_commitish: ${{ github.event.ref }}

diff --git a/src/main/java/com/plusls/ommc/impl/feature/sortInventory/SortInventoryHelper.java b/src/main/java/com/plusls/ommc/impl/feature/sortInventory/SortInventoryHelper.java
@@ -431,8 +431,19 @@ public int compare(ItemStack a, ItemStack b) {
             //#else
             //$$ CustomData dataA = a.get(DataComponents.CUSTOM_DATA);
             //$$ CustomData dataB = b.get(DataComponents.CUSTOM_DATA);
-            //$$ CompoundTag tagA = dataA.copyTag();
-            //$$ CompoundTag tagB = dataB.copyTag();
+            //$$ CompoundTag tagA, tagB;
+            //$$ if (dataA != null) {
+            //$$     tagA = dataA.copyTag();
+            //$$ }
+            //$$ else{
+            //$$     tagA = null;
+            //$$ }
+            //$$ if (dataB != null) {
+            //$$     tagB = dataB.copyTag();
+            //$$ }
+            //$$ else{
+            //$$     tagB = null;
+            //$$ }
             //#endif
 
             if (ShulkerBoxItemHelper.isShulkerBoxBlockItem(a) && ShulkerBoxItemHelper.isShulkerBoxBlockItem(b) &&

diff --git a/.../java/com/plusls/ommc/mixin/feature/blockModelNoOffset/sodium/MixinBlockRenderer_0_5.java b/.../java/com/plusls/ommc/mixin/feature/blockModelNoOffset/sodium/MixinBlockRenderer_0_5.java
@@ -1,6 +1,5 @@
 package com.plusls.ommc.mixin.feature.blockModelNoOffset.sodium;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.plusls.ommc.impl.feature.blockModelNoOffset.BlockModelNoOffsetHelper;
 import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer;
 import net.minecraft.world.level.block.state.BlockState;
@@ -11,6 +10,7 @@
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;
 import top.hendrixshen.magiclib.libs.com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import top.hendrixshen.magiclib.libs.com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 
 @Dependencies(require = @Dependency(value = "sodium", versionPredicates = "~0.5"))
 @Pseudo
@@ -24,7 +24,8 @@ public class MixinBlockRenderer_0_5 {
                     target = "Lnet/minecraft/world/level/block/state/BlockState;hasOffsetFunction()Z",
                     ordinal = 0,
                     remap = true
-            )
+            ),
+            remap = false
     )
     private boolean blockModelNoOffset(BlockState blockState, Operation<Boolean> original) {
         if (BlockModelNoOffsetHelper.shouldNoOffset(blockState)) {

diff --git a/...ava/com/plusls/ommc/mixin/feature/disableMoveDownInScaffolding/MixinScaffoldingBlock.java b/...ava/com/plusls/ommc/mixin/feature/disableMoveDownInScaffolding/MixinScaffoldingBlock.java
@@ -36,7 +36,7 @@ public class MixinScaffoldingBlock {
     )
     private void setNormalOutlineShape(BlockState state, BlockGetter world, BlockPos pos,
                                        CollisionContext context, CallbackInfoReturnable<VoxelShape> cir) {
-        if (Configs.disableMoveDownInScaffolding.getBooleanValue() && context.isDescending() &&
+        if (context.isDescending() && Configs.disableMoveDownInScaffolding.getBooleanValue() &&
                 context.isAbove(Shapes.block(), pos, true) &&
                 cir.getReturnValue() != MixinScaffoldingBlock.STABLE_SHAPE) {