diff --git a/gradle.properties b/gradle.properties index eace223..4ab5ce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ maven_group=de.jottyfan.minecraft archives_base_name=quickly # Dependencies -fabric_api_version=0.143.3+26.1 \ No newline at end of file +fabric_api_version=0.143.4+26.1 \ No newline at end of file diff --git a/src/main/java/de/jottyfan/minecraft/block/BlockDrill.java b/src/main/java/de/jottyfan/minecraft/block/BlockDrill.java index 9d671d2..f5c56b4 100644 --- a/src/main/java/de/jottyfan/minecraft/block/BlockDrill.java +++ b/src/main/java/de/jottyfan/minecraft/block/BlockDrill.java @@ -92,7 +92,7 @@ public class BlockDrill extends FallingBlock implements EntityBlock { loadings.put(QuicklyItems.CANOLABOTTLESTACK, 72); Item item = itemStack.getItem(); if (QuicklyItems.MAGNIFIER.equals(item)) { - if (!level.isClientSide() && player instanceof ServerPlayer serverPlayer) { + if (!level.isClientSide() && player instanceof ServerPlayer serverPlayer && player != null) { serverPlayer.connection.player.sendSystemMessage(Component.translatable("info.block.drillfuel", state.getValue(FUEL)), true); } } else if (loadings.containsKey(item)) { diff --git a/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java b/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java index 8bd7654..c72b0b7 100644 --- a/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java +++ b/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java @@ -56,7 +56,7 @@ public class Itemhoarder extends Block implements EntityBlock { @Override protected InteractionResult useItemOn(ItemStack itemStack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { - if (player instanceof ServerPlayer serverPlayer) { + if (player instanceof ServerPlayer serverPlayer && player != null) { if (QuicklyItems.MAGNIFIER.equals(itemStack.getItem())) { MutableComponent message = Component.empty(); BlockEntity blockEntity = level.getBlockEntity(pos); diff --git a/src/main/java/de/jottyfan/minecraft/block/Monsterhoarder.java b/src/main/java/de/jottyfan/minecraft/block/Monsterhoarder.java index 64ad1d6..b05e0b6 100644 --- a/src/main/java/de/jottyfan/minecraft/block/Monsterhoarder.java +++ b/src/main/java/de/jottyfan/minecraft/block/Monsterhoarder.java @@ -73,7 +73,7 @@ public class Monsterhoarder extends Block { int suckRadius = state.getValue(SUCKRADIUS); int burnTicks = state.getValue(BURNTICKS); Component message = Component.translatable("info.block.monsterhoarder", suckRadius, burnTicks); - if (player instanceof ServerPlayer serverPlayer) { + if (player instanceof ServerPlayer serverPlayer && player != null) { serverPlayer.connection.player.sendSystemMessage(message, true); } } diff --git a/src/main/java/de/jottyfan/minecraft/mixin/QuicklyMixin.java b/src/main/java/de/jottyfan/minecraft/mixin/QuicklyMixin.java deleted file mode 100644 index af03732..0000000 --- a/src/main/java/de/jottyfan/minecraft/mixin/QuicklyMixin.java +++ /dev/null @@ -1,34 +0,0 @@ -package de.jottyfan.minecraft.mixin; - -import java.util.Map; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import de.jottyfan.minecraft.block.QuicklyBlocks; -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.chunk.ChunkSectionLayer; -import net.minecraft.world.level.block.Block; - -/** - * - * @author jotty - * - */ -@Mixin(ItemBlockRenderTypes.class) -public class QuicklyMixin { - @Shadow - @Final - private static Map TYPE_BY_BLOCK; - - @Inject(method = "", at = @At("RETURN")) - private static void onStaticInit(CallbackInfo info) { - ChunkSectionLayer cutout = ChunkSectionLayer.CUTOUT; - TYPE_BY_BLOCK.put(QuicklyBlocks.CANOLAPLANT, cutout); - TYPE_BY_BLOCK.put(QuicklyBlocks.COTTONPLANT, cutout); - } -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ceaf845..781dccc 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -22,9 +22,6 @@ "de.jottyfan.minecraft.QuicklyClient" ] }, - "mixins": [ - "quickly.mixins.json" - ], "depends": { "fabricloader": ">=0.18.4", "minecraft": "~26.1-", diff --git a/src/main/resources/quickly.mixins.json b/src/main/resources/quickly.mixins.json deleted file mode 100644 index 7114247..0000000 --- a/src/main/resources/quickly.mixins.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "required": true, - "package": "de.jottyfan.minecraft.mixin", - "compatibilityLevel": "JAVA_25", - "mixins": [ - "QuicklyMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} \ No newline at end of file