From 2967c021e578fe168ef80faad93f59fadb0aa284 Mon Sep 17 00:00:00 2001 From: Disy920 Date: Mon, 20 Mar 2023 21:00:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E5=B4=A9=E6=9C=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../mixin/block/MixinAbstractSignBlock.java | 4 ---- .../zly2006/carpetslsaddition/mixin/block/MixinBlock.java | 1 - .../carpetslsaddition/mixin/carpet/MixinFakePlayer.java | 2 +- .../carpetslsaddition/mixin/entity/MixinPlayerEntity.java | 6 ++---- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2ce93b1..907acc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties mod_version = 0.5.1 maven_group = com.github.zly2006 - archives_base_name = Carpet-SLS-Addition + archives_base_name = carpet-sls-addition # Dependencies fabric_version=0.76.0+1.19.4 diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinAbstractSignBlock.java b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinAbstractSignBlock.java index ac71a72..0dbe2b6 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinAbstractSignBlock.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinAbstractSignBlock.java @@ -2,18 +2,14 @@ package com.github.zly2006.carpetslsaddition.mixin.block; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.ChestBlockEntity; import net.minecraft.block.entity.SignBlockEntity; -import net.minecraft.entity.InventoryOwner; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinBlock.java b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinBlock.java index 08b3ba9..a1fcf52 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinBlock.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/block/MixinBlock.java @@ -1,6 +1,5 @@ package com.github.zly2006.carpetslsaddition.mixin.block; -import carpet.patches.EntityPlayerMPFake; import com.github.zly2006.carpetslsaddition.PlayerAccess; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/carpet/MixinFakePlayer.java b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/carpet/MixinFakePlayer.java index 1e239af..a1b8bb6 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/carpet/MixinFakePlayer.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/carpet/MixinFakePlayer.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import java.util.Optional; import java.util.UUID; -@Mixin(value = EntityPlayerMPFake.class, remap = false) +@Mixin(value = EntityPlayerMPFake.class) public class MixinFakePlayer { @Redirect(method = "createFake", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/UserCache;findByName(Ljava/lang/String;)Ljava/util/Optional;")) private static Optional onCreate(UserCache instance, String name) { diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java index dfdd492..dd6b9ce 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/mixin/entity/MixinPlayerEntity.java @@ -7,9 +7,6 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.GameMode; -import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -29,6 +26,7 @@ public abstract class MixinPlayerEntity implements PlayerAccess { return compound != null && compound.contains(ITEM_NAME) && compound.getString(ITEM_NAME).equals(OBSIDIAN_PICKAXE); } + @Inject(method = "getBlockBreakingSpeed", at = @At("HEAD"), cancellable = true) private void onGetBlockBreakingSpeed(BlockState block, CallbackInfoReturnable cir) { if (holdingObsidianPickaxe() && block.isOf(Blocks.OBSIDIAN)) { @@ -36,11 +34,11 @@ public abstract class MixinPlayerEntity implements PlayerAccess { } } + @Inject(method = "canHarvest", at = @At("HEAD"), cancellable = true) private void onGetCanMine(BlockState state, CallbackInfoReturnable cir) { if (holdingObsidianPickaxe() && state.isOf(Blocks.OBSIDIAN)) { cir.setReturnValue(true); } } - }