fix
This commit is contained in:
6 files changed
+6
-24
No files matched your search
+3
@@ -17,6 +17,9 @@ import java.nio.file.Path;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.Function;
|
||||
|
||||
/**
|
||||
* @author zly2006
|
||||
*/
|
||||
@Mixin(VanillaResourcePackProvider.class)
|
||||
public abstract class MixinVanillaResourcePackProvider {
|
||||
@Shadow protected abstract void forEachProfile(@Nullable Path namespacedPath, BiConsumer<String, Function<String, ResourcePackProfile>> consumer);
|
||||
|
||||
+1
-5
@@ -11,11 +11,7 @@ import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(EndermanEntity.PickUpBlockGoal.class)
|
||||
public class
|
||||
|
||||
|
||||
|
||||
MixinEndermanGoal {
|
||||
public class MixinEndermanGoal {
|
||||
@Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isIn(Lnet/minecraft/registry/tag/TagKey;)Z"))
|
||||
public boolean isHoldable(BlockState blockState, TagKey<Block> tagKey) {
|
||||
if (!SLSCarpetSettings.endermanCanPickUpMushroom) {
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package com.github.zly2006.carpetslsaddition.mixin.entity;
|
||||
|
||||
import com.github.zly2006.carpetslsaddition.util.access.PlayerAccess;
|
||||
import net.minecraft.entity.EquipmentSlot;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.stat.Stat;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
@@ -16,10 +13,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(PlayerEntity.class)
|
||||
public abstract class MixinPlayerEntity implements PlayerAccess {
|
||||
@Shadow public abstract ItemStack getEquippedStack(EquipmentSlot slot);
|
||||
|
||||
@Shadow public abstract void resetStat(Stat<?> stat);
|
||||
|
||||
@Shadow public abstract Text getName();
|
||||
|
||||
@Unique
|
||||
|
||||
@@ -2,17 +2,12 @@ package com.github.zly2006.carpetslsaddition.mixin.shulker;
|
||||
|
||||
import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
|
||||
import com.github.zly2006.carpetslsaddition.util.ShulkerBoxItemUtil;
|
||||
import me.fallenbreath.conditionalmixin.api.annotation.Condition;
|
||||
import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.screen.slot.Slot;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Restriction(
|
||||
conflict = @Condition("pca")
|
||||
)
|
||||
@Mixin(Slot.class)
|
||||
public class MixinSlot {
|
||||
@Redirect(
|
||||
|
||||
@@ -50,5 +50,6 @@
|
||||
"carpet.rule.maxUpdateQueueSize.extra.0": "如果设定了不超过0的值,将关闭该功能,更新机制继续依照Vanilla运行",
|
||||
"carpet.rule.maxUpdateQueueSize.extra.1": "否则,在单次更新数量超过设定最大容量后,服务器将抛出OutOfMemoryError,以达到快速更新抑制的效果",
|
||||
"carpet.rule.emptyShulkerBoxStack.extra.0": "空潜影盒可以在玩家的背包进行自动堆叠,同时玩家可以手动堆叠空潜影盒",
|
||||
"carpet.rule.emptyShulkerBoxStack.extra.1": "但是空潜影盒无法在容器中自动堆叠,比如箱子,漏斗"
|
||||
"carpet.rule.emptyShulkerBoxStack.extra.1": "但是空潜影盒无法在容器中自动堆叠,比如箱子,漏斗",
|
||||
"carpet.rule.elytraCraftable.desc": "使鞘翅在 1.20.6+ 可合成 (合成时不会消失)"
|
||||
}
|
||||
Reference in new issue
Block a user