Merge branch 'main' into mc1.19.2/main

# Conflicts:
#	gradle.properties

Author: hlysine

CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.5.0 - 2024-05-21
+
+### Changed
+
+- Target Forge version for 1.20.1 is now 47.2.0
+- Target Create version for 1.20.1 is now 0.5.1.f-26
+- Improved translations for Simplified Chinese (thanks @PopSlime)
+
+### Fixed
+
+- Incompatibility with other mods causing clients to be kicked from server when a train station is placed
+  - This fix introduces breaking changes in the networking code of Power Loader. Update is required on both the client and server.
+
 ## 1.4.0 - 2024-01-27
 
 ### Added

README.md

@@ -14,15 +14,12 @@ A Create mod add-on adding immersive andesite and brass chunk loaders to Minecra
 
 > **Want more Create-esque QoL items? Check out [Create: Connected](https://modrinth.com/mod/create-connected)**
 
-## What's new in 1.4.0
+## What's new in 1.5.0
 
-**Config Overhaul**
+**Compatibility fix**
 
-The server config has been split into two sections for the andesite and brass chunk loaders, 
-allowing fine-grained control over the function of both chunk loaders in each use case.
-An example use case would be to create a chunk loader dedicated to train stations by disabling all other modes of function.
-
-**Important: the server config will reset upon updating to v1.4.0! Please reconfigure everything if you have applied custom configs before.**
+This version introduces changes to the networking code of Power Loader, which fix the issue where clients are kicked from server
+when a train station is placed. Note that you **must update Power Loader on both the client and server for this fix to work**. 
 
 ## Features
 

build.gradle

@@ -156,6 +156,9 @@ repositories {
         name = "ModMaven"
         url = "https://modmaven.dev"
     }
+    maven {
+        url "https://cursemaven.com"
+    }
 
     // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
@@ -184,6 +187,14 @@ dependencies {
     // at runtime, use the full JEI jar for Forge
     runtimeOnly(fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge:${jei_version}"))
 
+    // references to other mods to debug compatibility
+//    implementation fg.deobf("curse.maven:create-steam-n-rails-688231:5331300")
+//    implementation fg.deobf("curse.maven:botarium-704113:5118353")
+//    implementation fg.deobf("curse.maven:create-new-age-905861:5080957")
+//    implementation fg.deobf("curse.maven:cloth-config-348521:4973441")
+//    implementation fg.deobf("curse.maven:appleskin-248787:4770828")
+//    implementation fg.deobf("curse.maven:betterf3-401648:4863626")
+
     // Example mod dependency using a mod jar from ./libs with a flat dir repository
     // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
     // The group id is ignored when searching -- in this case, it is "blank"

gradle.properties

@@ -41,7 +41,7 @@ mapping_version=2022.11.27-1.19.2
 
 create_minecraft_version = 1.19.2
 flywheel_minecraft_version = 1.19.2
-create_version = 0.5.1.e-42
+create_version = 0.5.1.f-46
 create_version_range = [0.5.1.e,)
 flywheel_version = 0.6.10-20
 registrate_version = MC1.19-1.1.5
@@ -59,7 +59,7 @@ mod_name=Create: Power Loader
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.4.0-mc1.19.2
+mod_version=1.5.0-mc1.19.2
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/hlysine/create_power_loader/mixin/GlobalStationMixin.java

@@ -13,7 +13,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(value = GlobalStation.class, remap = false)
+@Mixin(value = GlobalStation.class)
 public class GlobalStationMixin implements CPLGlobalStation {
     @Unique
     public StationChunkLoader cpl$chunkLoader;
@@ -34,30 +34,35 @@ public void setLoader(StationChunkLoader loader) {
 
     @Inject(
             at = @At("RETURN"),
-            method = "read(Lnet/minecraft/nbt/CompoundTag;ZLcom/simibubi/create/content/trains/graph/DimensionPalette;)V"
+            method = "read(Lnet/minecraft/nbt/CompoundTag;ZLcom/simibubi/create/content/trains/graph/DimensionPalette;)V",
+            remap = false
     )
     private void cpl$read(CompoundTag nbt, boolean migration, DimensionPalette dimensions, CallbackInfo ci) {
-        cpl$chunkLoader = StationChunkLoader.read((GlobalStation) (Object) this, nbt.getCompound("CPLData"));
+        CompoundTag data = nbt.getCompound("CPLData");
+        cpl$chunkLoader = StationChunkLoader.read((GlobalStation) (Object) this, data);
     }
 
     @Inject(
-            at = @At("RETURN"),
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/network/FriendlyByteBuf;readUtf()Ljava/lang/String;"),
             method = "read(Lnet/minecraft/network/FriendlyByteBuf;Lcom/simibubi/create/content/trains/graph/DimensionPalette;)V"
     )
     private void cpl$read(FriendlyByteBuf buffer, DimensionPalette dimensions, CallbackInfo ci) {
-        cpl$chunkLoader = StationChunkLoader.read((GlobalStation) (Object) this, buffer.readAnySizeNbt());
+        CompoundTag nbt = buffer.readAnySizeNbt();
+        if (nbt != null)
+            cpl$chunkLoader = StationChunkLoader.read((GlobalStation) (Object) this, nbt);
     }
 
     @Inject(
             at = @At("RETURN"),
-            method = "write(Lnet/minecraft/nbt/CompoundTag;Lcom/simibubi/create/content/trains/graph/DimensionPalette;)V"
+            method = "write(Lnet/minecraft/nbt/CompoundTag;Lcom/simibubi/create/content/trains/graph/DimensionPalette;)V",
+            remap = false
     )
     private void cpl$write(CompoundTag nbt, DimensionPalette dimensions, CallbackInfo ci) {
         nbt.put("CPLData", getLoader().write());
     }
 
     @Inject(
-            at = @At("RETURN"),
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/network/FriendlyByteBuf;writeUtf(Ljava/lang/String;)Lnet/minecraft/network/FriendlyByteBuf;"),
             method = "write(Lnet/minecraft/network/FriendlyByteBuf;Lcom/simibubi/create/content/trains/graph/DimensionPalette;)V"
     )
     private void cpl$write(FriendlyByteBuf buffer, DimensionPalette dimensions, CallbackInfo ci) {

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

@@ -12,33 +12,40 @@
   "create.create_power_loader.brass_chunk_loader.load_5x5": "5x5 矩形",
 
   "create_power_loader.ponder.empty_chunk_loader_basic.header": "空的区块加载器用法",
-  "create_power_loader.ponder.empty_chunk_loader_basic.text_1": "用空的区块加载器右击恶魂来捕获它",
-  "create_power_loader.ponder.empty_chunk_loader_basic.text_2": "利用旋转的动力，可让被捕获的恶魂点亮机械核心……",
-  "create_power_loader.ponder.empty_chunk_loader_basic.text_3": "……将区块加载器带入生活",
+  "create_power_loader.ponder.empty_chunk_loader_basic.text_1": "手持空的区块加载器右击恶魂来捕获它",
+  "create_power_loader.ponder.empty_chunk_loader_basic.text_2": "利用旋转力，可让被捕获的恶魂点亮传送门核心……",
+  "create_power_loader.ponder.empty_chunk_loader_basic.text_3": "……并激活区块加载器",
 
   "create_power_loader.ponder.andesite_chunk_loader_basic.header": "安山区块加载器的基本用法",
-  "create_power_loader.ponder.andesite_chunk_loader_basic.text_1": "给予旋转动力后区块加载器会保持当前区块的加载",
+  "create_power_loader.ponder.andesite_chunk_loader_basic.text_1": "给予旋转力后区块加载器会保持当前区块的加载",
   "create_power_loader.ponder.andesite_chunk_loader_basic.text_2": "当转速过慢时不会工作",
 
   "create_power_loader.ponder.andesite_chunk_loader_redstone.header": "红石与安山区块加载器",
-  "create_power_loader.ponder.andesite_chunk_loader_redstone.text_1": "加载器工作时可以点亮比较器",
+  "create_power_loader.ponder.andesite_chunk_loader_redstone.text_1": "区块加载器工作时产生比较器输出",
   "create_power_loader.ponder.andesite_chunk_loader_redstone.text_2": "动力消失后，在区块被卸载前会有一小段延迟（可配置）",
-  "create_power_loader.ponder.andesite_chunk_loader_redstone.text_3": "如果在延迟期间动力复原，则区块可继续加载",
+  "create_power_loader.ponder.andesite_chunk_loader_redstone.text_3": "如果在延迟期间动力复原，区块会保持加载",
 
   "create_power_loader.ponder.brass_chunk_loader_basic.header": "黄铜区块加载器的基本用法",
-  "create_power_loader.ponder.brass_chunk_loader_basic.text_1": "给予旋转动力后区块加载器会保持当前区块的加载",
+  "create_power_loader.ponder.brass_chunk_loader_basic.text_1": "给予旋转力后区块加载器会保持当前区块的加载",
   "create_power_loader.ponder.brass_chunk_loader_basic.text_2": "当转速过慢时不会工作",
   "create_power_loader.ponder.brass_chunk_loader_basic.text_3": "可以通过控制面板配置加载范围……",
   "create_power_loader.ponder.brass_chunk_loader_basic.text_4": "……但更广的范围需要更高的转速",
 
   "create_power_loader.ponder.brass_chunk_loader_redstone.header": "红石与黄铜区块加载器",
-  "create_power_loader.ponder.brass_chunk_loader_redstone.text_1": "加载器工作时可以点亮比较器",
+  "create_power_loader.ponder.brass_chunk_loader_redstone.text_1": "区块加载器工作时产生比较器输出",
   "create_power_loader.ponder.brass_chunk_loader_redstone.text_2": "动力消失后，在区块被卸载前会有一小段延迟（可配置）",
-  "create_power_loader.ponder.brass_chunk_loader_redstone.text_3": "如果在延迟期间动力复原，则区块可继续加载",
-
-  "create_power_loader.ponder.brass_chunk_loader_contraptions.header": "区块加载器与动态结构",
-  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_1": "黄铜区块加载器也可在动态结构上使用",
-  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_2": "可一直加载动态结构周围3x3区块",
-  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_3": "组装后，则不再需要旋转动力来启动",
-  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_4": "它们也能在固定的结构上工作"
+  "create_power_loader.ponder.brass_chunk_loader_redstone.text_3": "如果在延迟期间动力复原，区块会保持加载",
+
+  "create_power_loader.ponder.brass_chunk_loader_contraptions.header": "加载动态结构周围的区块",
+  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_1": "黄铜区块加载器也可在动态结构上工作",
+  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_2": "这些区块加载器总是加载动态结构周围3x3的区块",
+  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_3": "组装后，不再需要旋转力来运转",
+  "create_power_loader.ponder.brass_chunk_loader_contraptions.text_4": "它们也能在静止的结构上工作",
+
+  "create_power_loader.ponder.brass_chunk_loader_station.header": "为列车站加载区块",
+  "create_power_loader.ponder.brass_chunk_loader_station.text_1": "黄铜区块加载器可以附加在列车站上",
+  "create_power_loader.ponder.brass_chunk_loader_station.text_2": "将其以正确的方向放置在列车站旁边",
+  "create_power_loader.ponder.brass_chunk_loader_station.text_3": "这些区块加载器不需要旋转力，但正常情况下不会运转",
+  "create_power_loader.ponder.brass_chunk_loader_station.text_4": "当一节列车到达站点时，区块加载器旁边3x3的区块将会被加载",
+  "create_power_loader.ponder.brass_chunk_loader_station.text_5": "列车发车时，这些区块将再次被卸载"
 }

update.json

@@ -1,8 +1,8 @@
 {
   "homepage": "https://github.com/hlysine/create_power_loader/",
   "promos": {
-    "1.20.1-recommended": "1.4.0-mc1.20.1",
-    "1.19.2-recommended": "1.4.0-mc1.19.2",
-    "1.18.2-recommended": "1.4.0-mc1.18.2"
+    "1.20.1-recommended": "1.5.0-mc1.20.1",
+    "1.19.2-recommended": "1.5.0-mc1.19.2",
+    "1.18.2-recommended": "1.5.0-mc1.18.2"
   }
 }