From 56665b007f8b98358b22aa6b3f6ca2737d70123a Mon Sep 17 00:00:00 2001 From: Triibu Nupsik Date: Sun, 25 May 2025 23:25:44 +0300 Subject: [PATCH 1/3] Replaced usage of a deprecated feature. Removed unused imports --- .../java/ru/nern/notsoshadowextras/NSSECommands.java | 4 ++-- .../mixin/additions/BlockItemMixin.java | 1 - .../crash_fix/MinecraftServerMixin_CrashFix.java | 9 --------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/ru/nern/notsoshadowextras/NSSECommands.java b/src/main/java/ru/nern/notsoshadowextras/NSSECommands.java index e147356..ce04395 100644 --- a/src/main/java/ru/nern/notsoshadowextras/NSSECommands.java +++ b/src/main/java/ru/nern/notsoshadowextras/NSSECommands.java @@ -61,7 +61,7 @@ public static int blockEntityExists(ServerCommandSource source, BlockPos pos) { Text.literal("Block entity does not exist at this position"), false); }else{ source.sendFeedback(() -> - Text.literal(String.format("Block entity does exist. Type: %s", blockEntity.getType().getRegistryEntry().getIdAsString())), false); + Text.literal(String.format("Block entity does exist. Type: %s", Registries.BLOCK_ENTITY_TYPE.getId(blockEntity.getType()))), false); } return 1; @@ -90,7 +90,7 @@ public static void swapAtPos(ServerWorld world, Identifier id, BlockPos pos) thr }); if(blockEntity.isEmpty()) throw UNKNOWN_TYPE.create(); if(current != null) world.removeBlockEntity(pos); - System.out.println("ADDING BLLOCK ENTITY: " + blockEntity.get()); + System.out.println("ADDING BLOCK ENTITY: " + blockEntity.get()); world.addBlockEntity(blockEntity.get()); } diff --git a/src/main/java/ru/nern/notsoshadowextras/mixin/additions/BlockItemMixin.java b/src/main/java/ru/nern/notsoshadowextras/mixin/additions/BlockItemMixin.java index d84f530..2268918 100644 --- a/src/main/java/ru/nern/notsoshadowextras/mixin/additions/BlockItemMixin.java +++ b/src/main/java/ru/nern/notsoshadowextras/mixin/additions/BlockItemMixin.java @@ -1,6 +1,5 @@ package ru.nern.notsoshadowextras.mixin.additions; -import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntity; import net.minecraft.component.DataComponentTypes; import net.minecraft.item.BlockItem; diff --git a/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/crash_fix/MinecraftServerMixin_CrashFix.java b/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/crash_fix/MinecraftServerMixin_CrashFix.java index 9a7868e..59a9fe4 100644 --- a/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/crash_fix/MinecraftServerMixin_CrashFix.java +++ b/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/crash_fix/MinecraftServerMixin_CrashFix.java @@ -2,25 +2,16 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import com.mojang.datafixers.DataFix; -import net.minecraft.datafixer.fix.ChunkDeleteLightFix; -import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; import net.minecraft.util.crash.CrashException; import org.slf4j.Logger; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import ru.nern.notsoshadowextras.NSSE; import ru.nern.notsoshadowextras.NSSEUtils; -import ru.nern.notsoshadowextras.crash_fix.UpdateSuppressionReason; import java.util.function.BooleanSupplier; From 19c08b2ed86f1938cb4a299433dc0cd1d4eb4fdd Mon Sep 17 00:00:00 2001 From: Triibu Nupsik <57480159+TriibuNupsik@users.noreply.github.com> Date: Sun, 25 May 2025 23:34:39 +0300 Subject: [PATCH 2/3] Fixed linux build action not working --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a0a1f8..c5ca1c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,16 +15,17 @@ jobs: 21, # Current Java LTS & minimum supported by Minecraft ] # and run on both Linux and Windows - os: [ubuntu-20.04, windows-2022] + os: [ubuntu-latest, windows-2022] runs-on: ${{ matrix.os }} steps: - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v3 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: temurin java-version: ${{ matrix.java }} - name: make gradle wrapper executable if: ${{ runner.os != 'Windows' }} From 449f46dcd907b7fbcc878d3c3c26f6958cc26d47 Mon Sep 17 00:00:00 2001 From: Triibu Nupsik Date: Mon, 26 May 2025 17:22:33 +0300 Subject: [PATCH 3/3] Fixed a crash when enabling HideStackTrace while not in a dev environment. By removing `remap = false` from ServerCrashSafePLMixin_HideST, because Logger is a part of Minecraft's codebase --- .../mixin/update_suppression/ServerCrashSafePLMixin_HideST.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/ServerCrashSafePLMixin_HideST.java b/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/ServerCrashSafePLMixin_HideST.java index 65801a1..deb56d7 100644 --- a/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/ServerCrashSafePLMixin_HideST.java +++ b/src/main/java/ru/nern/notsoshadowextras/mixin/update_suppression/ServerCrashSafePLMixin_HideST.java @@ -9,7 +9,7 @@ @Mixin(ServerCrashSafePacketListener.class) public interface ServerCrashSafePLMixin_HideST { @WrapWithCondition(method = "onPacketException", - at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"), remap = false) + at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V")) private boolean notsoshadowextras$hideStackTrace(Logger instance, String string, Object o, Object o2) { return false; }