update to 0.1.6

添加了 railNoBrokenByFluid
适配了新的 modmenu 的配置文件格式

README.md

@@ -17,6 +17,7 @@ fabric-api >= 0.28
 - [空潜影盒可堆叠](#空潜影盒可堆叠-emptyShulkerBoxStack)
 - [潜影贝可再生](#潜影贝可再生-shulkerRenewable)
 - [潜影盒快速拆包](#潜影盒快速拆包-shulkerBoxQuickUnpack)
+- [铁轨不被液体破坏](#铁轨不被液体破坏-railNoBrokenByFluid)
 - [潜影盒使用染料染色](#潜影盒使用染料染色-useDyeOnShulkerBox)
 - [不死图腾扳手](#不死图腾扳手-flippingTotemOfUndying)
 - [PCA调试模式](#PCA调试模式-pcaDebug)
@@ -88,14 +89,14 @@ Carpet 默认实现的潜影盒可堆叠只能让潜影盒在地面上堆叠，
 - 参考选项: `true`, `false`
 - 分类: `PCA`, `feature`, `experimental`
 
-### 潜影盒使用染料染色 (useDyeOnShulkerBox)
+### 铁轨不被液体破坏 (railNoBrokenByFluid)
 
-可以使用染料直接对地上的潜影盒染色，用水瓶右键洗去地上潜影盒的颜色
+1.17 引入了含水铁轨，考虑到改动可能会比较大，因此只引入了其不被液体破坏的特性
 
 - 类型: `boolean`
 - 默认值: `false`
 - 参考选项: `true`, `false`
-- 分类: `PCA`, `feature`
+- 分类: `PCA`, `feature`, `experimental`
 
 ### 潜影盒使用染料染色 (useDyeOnShulkerBox)
 
@@ -106,6 +107,7 @@ Carpet 默认实现的潜影盒可堆叠只能让潜影盒在地面上堆叠，
 - 参考选项: `true`, `false`
 - 分类: `PCA`, `feature`
 
+
 ### 不死图腾扳手 (flippingTotemOfUndying)
 
 允许使用不死图腾调整方块朝向，并且不会产生方块更新

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
 	carpet_core_version=1.4.24+v210120
 
 # Mod Properties
-	mod_version = 0.1.5
+	mod_version = 0.1.6
 	maven_group = net.fabricmc
 	archives_base_name = plusls-carpet-addition
 

src/main/java/com/plusls/carpet/PcaSettings.java

@@ -69,6 +69,12 @@ public enum PCA_SYNC_PLAYER_ENTITY_OPTIONS {
     )
     public static boolean shulkerBoxQuickUnpack = false;
 
+    @Rule(
+            desc = "Rail no broken by fluid; 1.17 feature (backported)",
+            category = {PCA, RuleCategory.FEATURE, RuleCategory.EXPERIMENTAL}
+    )
+    public static boolean railNoBrokenByFluid = false;
+
     @Rule(
             desc = "Dyes can be used on shulker boxes, empty potion will clean color",
             category = {PCA, RuleCategory.FEATURE}

src/main/java/com/plusls/carpet/mixin/rule/railNoBrokenByFluid/MixinFlowableFluid.java

@@ -0,0 +1,23 @@
+package com.plusls.carpet.mixin.rule.railNoBrokenByFluid;
+
+import com.plusls.carpet.PcaSettings;
+import net.minecraft.block.AbstractRailBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.fluid.FlowableFluid;
+import net.minecraft.fluid.Fluid;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+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)
+    private void checkRail(BlockView world, BlockPos pos, BlockState state, Fluid fluid, CallbackInfoReturnable<Boolean> cir) {
+        if (PcaSettings.railNoBrokenByFluid && cir.getReturnValue() && state.getBlock() instanceof AbstractRailBlock) {
+            cir.setReturnValue(false);
+        }
+    }
+}

src/main/resources/assets/pca/lang/zh_cn.json

@@ -22,6 +22,9 @@
   "rule.shulkerBoxQuickUnpack.name": "潜影盒快速拆包",
   "rule.shulkerBoxQuickUnpack.desc": "物品状态下的潜影盒在被摧毁时，盒中的物品会自动掉落，来自 1.17",
 
+  "rule.railNoBrokenByFluid.name": "铁轨不被液体破坏",
+  "rule.railNoBrokenByFluid.desc": "铁轨不被液体破坏，来自 1.17",
+
   "rule.useDyeOnShulkerBox.name": "潜影盒使用染料染色",
   "rule.useDyeOnShulkerBox.desc": "可以使用染料直接对地上的潜影盒染色，用水瓶可以洗掉潜影盒的颜色",
 

src/main/resources/fabric.mod.json

@@ -31,6 +31,8 @@
     "another-mod": "*"
   },
   "custom": {
-    "modmenu:parent": "carpet"
+    "modmenu": {
+      "parent": "carpet"
+    }
   }
 }

src/main/resources/pca.mixins.json

@@ -19,6 +19,7 @@
     "rule.pcaSyncProtocol.entity.MixinHorseBaseEntity",
     "rule.pcaSyncProtocol.entity.MixinMerchantEntity",
     "rule.pcaSyncProtocol.entity.MixinStorageMinecartEntity",
+    "rule.railNoBrokenByFluid.MixinFlowableFluid",
     "rule.shulkerBoxQuickUnpack.MixinItemEntity",
     "rule.shulkerRenewable.MixinShulkerEntity",
     "rule.useDyeOnShulkerBox.MixinDyeItem",