diff --git a/src/main/java/com/plusls/carpet/mixin/rule/railNoBrokenByFluid/MixinFlowableFluid.java b/src/main/java/com/plusls/carpet/mixin/rule/railNoBrokenByFluid/MixinFlowableFluid.java index 2cd6f82..aa2617e 100644 --- a/src/main/java/com/plusls/carpet/mixin/rule/railNoBrokenByFluid/MixinFlowableFluid.java +++ b/src/main/java/com/plusls/carpet/mixin/rule/railNoBrokenByFluid/MixinFlowableFluid.java @@ -13,8 +13,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(FlowableFluid.class) -public abstract class MixinFlowableFluid extends Fluid { - @Inject(method = "canFill", at=@At(value = "RETURN"), cancellable = true) +public abstract class MixinFlowableFluid extends Fluid { + @Inject(method = "canFill", at = @At(value = "RETURN"), cancellable = true) private void checkRail(BlockView world, BlockPos pos, BlockState state, Fluid fluid, CallbackInfoReturnable cir) { if (PcaSettings.railNoBrokenByFluid && cir.getReturnValue() && state.getBlock() instanceof AbstractRailBlock) { cir.setReturnValue(false); diff --git a/src/main/java/com/plusls/carpet/mixin/rule/spawnBiome/MixinSpawnHelper.java b/src/main/java/com/plusls/carpet/mixin/rule/spawnBiome/MixinSpawnHelper.java index 06bf31c..ab1a2c8 100755 --- a/src/main/java/com/plusls/carpet/mixin/rule/spawnBiome/MixinSpawnHelper.java +++ b/src/main/java/com/plusls/carpet/mixin/rule/spawnBiome/MixinSpawnHelper.java @@ -19,7 +19,7 @@ @Mixin(SpawnHelper.class) public class MixinSpawnHelper { @Redirect(method = "method_29950", - at=@At(value = "INVOKE", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/gen/chunk/ChunkGenerator;getEntitySpawnList(Lnet/minecraft/world/biome/Biome;Lnet/minecraft/world/gen/StructureAccessor;Lnet/minecraft/entity/SpawnGroup;Lnet/minecraft/util/math/BlockPos;)Ljava/util/List;")) private static List modifyBiome(ChunkGenerator chunkGenerator, Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos) { if (PcaSettings.spawnBiome != PcaSettings.PCA_SPAWN_BIOME.DEFAULT) { diff --git a/src/main/resources/assets/pca/lang/zh_cn.json b/src/main/resources/assets/pca/lang/zh_cn.json index cd42004..d746c19 100644 --- a/src/main/resources/assets/pca/lang/zh_cn.json +++ b/src/main/resources/assets/pca/lang/zh_cn.json @@ -10,40 +10,30 @@ "rule.pcaSyncPlayerEntity.extra.2": "OPS:地毯 mod 召唤出的 bot 的数据可以被同步, op 可以同步所有玩家的数据", "rule.pcaSyncPlayerEntity.extra.3": "OPS_AND_SELF:地毯 mod 召唤出的 bot 和玩家自己的数据可以被同步,op 可以同步所有玩家的数据", "rule.pcaSyncPlayerEntity.extra.4": "EVERYONE:所有人的数据都可以被同步", - "rule.emptyShulkerBoxStack.name": "空潜影盒可堆叠", "rule.emptyShulkerBoxStack.desc": "空潜影盒可堆叠,但是不会改变比较器的输出", "rule.emptyShulkerBoxStack.extra.0": "空潜影盒可以在玩家的背包进行自动堆叠,同时玩家可以手动堆叠空潜影盒", "rule.emptyShulkerBoxStack.extra.1": "但是空潜影盒无法在容器中自动堆叠,比如箱子,漏斗", - "rule.shulkerRenewable.name": "潜影贝可再生", "rule.shulkerRenewable.desc": "潜影贝可再生,来自 1.17", - "rule.shulkerBoxQuickUnpack.name": "潜影盒快速拆包", "rule.shulkerBoxQuickUnpack.desc": "物品状态下的潜影盒在被摧毁时,盒中的物品会自动掉落,来自 1.17", - "rule.railNoBrokenByFluid.name": "铁轨不被液体破坏", "rule.railNoBrokenByFluid.desc": "铁轨不被液体破坏,来自 1.17", - "rule.useDyeOnShulkerBox.name": "潜影盒使用染料染色", "rule.useDyeOnShulkerBox.desc": "可以使用染料直接对地上的潜影盒染色,用水瓶可以洗掉潜影盒的颜色", - "rule.flippingTotemOfUndying.name": "不死图腾扳手", "rule.flippingTotemOfUndying.desc": "允许使用不死图腾调整方块朝向", "rule.flippingTotemOfUndying.extra.0": "不会产生方块更新", "rule.flippingTotemOfUndying.extra.1": "主手图腾副手为空则则会翻转方块", "rule.flippingTotemOfUndying.extra.2": "主手图腾副手不为空且为方块则放出的方块会被反转", - "rule.spawnYMax.name": "刷怪的最大 Y 值", "rule.spawnYMax.desc": "刷怪的最大 Y 值,会影响刷怪塔效率,114514 为默认", - "rule.spawnYMin.name": "刷怪的最小 Y 值", "rule.spawnYMin.desc": "刷怪的最小 Y 值,会影响刷怪塔效率,114514 为默认", - "rule.spawnBiome.name": "全局刷怪群系", "rule.spawnBiome.desc": "全局刷怪群系,会影响整个游戏,DEFAULT 为默认", - -"rule.pcaDebug.name": "PCA调试模式", + "rule.pcaDebug.name": "PCA调试模式", "rule.pcaDebug.desc": "打印更多调试信息" }