Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Nyan-Work#45 #2

Merged
merged 5 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand All @@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down