移動到1.21.1

.gitignore

@@ -29,4 +29,5 @@ _tmp_fabric_source
 _tmp_bedrock_source
 
 generated
+!src/generated/
 .*

.vscode/launch.json

@@ -6,17 +6,17 @@
       "request": "launch",
       "name": "Client",
       "presentation": {
-        "group": "Mod Development - DecIsland",
+        "group": "Mod Development - DecIslandNeoforge-main",
         "order": 0
       },
-      "projectName": "DecIsland",
+      "projectName": "DecIslandNeoforge-main",
       "mainClass": "net.neoforged.devlaunch.Main",
       "args": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\clientRunProgramArgs.txt"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\clientRunProgramArgs.txt"
       ],
       "vmArgs": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\clientRunVmArgs.txt",
-        "-Dfml.modFolders\u003ddecisland%%E:\\MCJEMod\\DecIsland\\bin\\main"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\clientRunVmArgs.txt",
+        "-Dfml.modFolders\u003ddecisland%%F:\\DecIslandNeoforge-main\\bin\\main"
       ],
       "cwd": "${workspaceFolder}\\run",
       "env": {},
@@ -28,17 +28,17 @@
       "request": "launch",
       "name": "Data",
       "presentation": {
-        "group": "Mod Development - DecIsland",
+        "group": "Mod Development - DecIslandNeoforge-main",
         "order": 1
       },
-      "projectName": "DecIsland",
+      "projectName": "DecIslandNeoforge-main",
       "mainClass": "net.neoforged.devlaunch.Main",
       "args": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\dataRunProgramArgs.txt"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\dataRunProgramArgs.txt"
       ],
       "vmArgs": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\dataRunVmArgs.txt",
-        "-Dfml.modFolders\u003ddecisland%%E:\\MCJEMod\\DecIsland\\bin\\main"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\dataRunVmArgs.txt",
+        "-Dfml.modFolders\u003ddecisland%%F:\\DecIslandNeoforge-main\\bin\\main"
       ],
       "cwd": "${workspaceFolder}\\run",
       "env": {},
@@ -50,17 +50,17 @@
       "request": "launch",
       "name": "GameTestServer",
       "presentation": {
-        "group": "Mod Development - DecIsland",
+        "group": "Mod Development - DecIslandNeoforge-main",
         "order": 2
       },
-      "projectName": "DecIsland",
+      "projectName": "DecIslandNeoforge-main",
       "mainClass": "net.neoforged.devlaunch.Main",
       "args": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\gameTestServerRunProgramArgs.txt"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\gameTestServerRunProgramArgs.txt"
       ],
       "vmArgs": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\gameTestServerRunVmArgs.txt",
-        "-Dfml.modFolders\u003ddecisland%%E:\\MCJEMod\\DecIsland\\bin\\main"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\gameTestServerRunVmArgs.txt",
+        "-Dfml.modFolders\u003ddecisland%%F:\\DecIslandNeoforge-main\\bin\\main"
       ],
       "cwd": "${workspaceFolder}\\run",
       "env": {},
@@ -72,17 +72,17 @@
       "request": "launch",
       "name": "Server",
       "presentation": {
-        "group": "Mod Development - DecIsland",
+        "group": "Mod Development - DecIslandNeoforge-main",
         "order": 3
       },
-      "projectName": "DecIsland",
+      "projectName": "DecIslandNeoforge-main",
       "mainClass": "net.neoforged.devlaunch.Main",
       "args": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\serverRunProgramArgs.txt"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\serverRunProgramArgs.txt"
       ],
       "vmArgs": [
-        "@E:\\MCJEMod\\DecIsland\\build\\moddev\\serverRunVmArgs.txt",
-        "-Dfml.modFolders\u003ddecisland%%E:\\MCJEMod\\DecIsland\\bin\\main"
+        "@F:\\DecIslandNeoforge-main\\build\\moddev\\serverRunVmArgs.txt",
+        "-Dfml.modFolders\u003ddecisland%%F:\\DecIslandNeoforge-main\\bin\\main"
       ],
       "cwd": "${workspaceFolder}\\run",
       "env": {},

README.md

@@ -16,144 +16,10 @@ BiliBili: LiLeyi
 
 ## Version
 
-So far, we support Minecraft 1.21.11 and Neoforge 21.11.38-beta
+So far, we support Minecraft 1.21.1 and Neoforge 21.1.247
 
 ## 物品移植进度（基岩版 → JE）
 
-对比基准：`_tmp_bedrock_source/DecIslandB/ex_items/`（基岩 536 个）vs `list/items.txt`（JE 注册表，由 runData 生成）。
-最后更新：2026-09-02。剩余 **69** 个未移植。
+1.21.1已完成移植
+neoforge 21.1.247
 
-注意：双格作物（方块）暂缓；copper/iron_bow 盔甲为基岩废弃内容，不移植。
-
-### 剑 ×19
-- [ ] bamboo_yataghan 竹长剑
-- [ ] blue_of_the_sea 海之忧伤
-- [x] decrepit_atlantis 破旧的亚特兰蒂斯
-- [x] dust_destroyer 尘灭者
-- [x] everlasting_winter_sword 永冬长剑
-- [x] ghost_sword 灵魂吸收者
-- [x] growth 生长者
-- [ ] radiate_sword 堕落圣刃
-- [x] scale_sword 鳞之刃
-- [ ] star_sword 迸发之星
-- [ ] storm_giant_sword 风暴巨剑
-- [x] sword_of_deep 黑域
-- [x] sword_of_guard 侍卫之灵
-- [x] sword_of_halloween 万圣之刃
-- [x] the_imperial_sword 尚方宝剑
-- [ ] village_guardian 村庄守卫
-- [x] vortex 旋涡
-- [x] warden_sword 匿潜刃
-- [x] wind_of_shadow 暗影之风
-
-### 法杖 ×10
-- [ ] bat_staff 蝙蝠杖
-- [ ] blaze_staff 烈焰法杖
-- [ ] chaos_staff 混沌召唤杖
-- [ ] chicken_staff 小鸡法杖
-- [ ] dust_staff 尘埃召唤杖
-- [ ] ghost_summoner 唤魂者
-- [ ] god_of_sun 太阳神
-- [ ] natural_spear 自然之矛
-- [ ] radiate_spreader 堕落之神
-- [ ] spider_staff 蜘蛛法杖
-
-### 破坏神杖 ×2
-- [ ] destroy_staff 破坏神杖
-- [ ] god_of_destroy 破坏之神
-
-### 图腾 ×4
-- [ ] energy_totem 能量图腾
-- [ ] fire_totem 火焰图腾
-- [ ] gingerbread_totem 姜饼图腾
-- [ ] ocean_totem 海洋图腾
-
-### 枪械 ×3 + 弹药 ×2
-- [ ] bomber 轰炸者
-- [ ] catapult 弹弓
-- [ ] echo_of_deep 深渊回影
-- [ ] bomber_bullet 轰炸弹
-- [ ] exploding_pellets 爆炸弹丸
-
-### 投掷杂项 ×6
-- [ ] dragon_fireball_by_player 龙息弹
-- [ ] grapeshot_frozen_ball 霰弹冰霜魔法球
-- [ ] leaves_knife 绿叶飞刀
-- [ ] levitation_cloud 悬浮云
-- [ ] poison_bag 毒囊
-- [ ] soul_fireball 灵魂烈焰弹
-
-### 导航/载具 ×10
-- [ ] fire_heart 烈火之心
-- [ ] ghost_dirt_wall 鬼魂土墙
-- [ ] hook_rope 钩锁
-- [ ] ice_hook_rope 极寒钩锁
-- [ ] levitation_dirt_wall 飘浮土墙
-- [ ] magic_scroll_blue 蓝魔法卷轴
-- [ ] paraffin_bucket 煤油桶
-- [ ] scarecrow 稻草人
-- [ ] simple_car 简单小车（骑乘实体，工程量大）
-- [ ] simple_glider 简单滑翔机（骑乘实体，工程量大）
-
-### 装饰 ×8
-- [ ] christmas_gift 圣诞礼物
-- [ ] christmas_sock 圣诞袜
-- [ ] drift_bottle 漂流瓶
-- [ ] golden_fence 流金栅栏
-- [ ] magic_mask_bag 魔法面具袋
-- [ ] patterned_vase_red 红色纹饰花瓶
-- [ ] red_bag 红包
-- [ ] unknow_book 未知的书
-
-### 零散 ×7
-- [ ] angel_purification 净化使者（矛）
-- [ ] wooden_enchant_book 木制附魔书（魔法书）
-- [ ] tear_from_dream 梦境之泪（魔法饰品）
-- [ ] blood_meat 血腥肉块（夜间活动物品）
-- [ ] everlasting_winter_heart 永冬之心（夜间活动物品）
-
-## 剑 ×19 移植方案（2026-09-02 侦查完毕）
-
-### 约定
-- 面板伤害 = 1 + 材质加成 + 参数，对齐基岩 `minecraft:damage`；攻速统一 -2.4（JE 剑标准）
-- 技能冷却用 `useCooldown`；`magicpoint` 走 `ManaManager`；基岩事件自伤魔法 1 = 命中扣 1 耐久（WEAPON 组件）
-- **材质严格专属**：每把剑单独建 `ModToolMaterial`，不复用已有材质（不可损坏的剑不给耐久）
-- **粒子不将就**：未移植的基岩粒子必须先移植，不用现有粒子顶替
-- 村庄守卫做**占位版**：被动（命中给附近村民回血）完整实现；技能（召唤村庄传送门）因 boss/传送门未移植，只做前置检查与提示，不生成传送门，后续补齐
-
-### A 批：简单/被动
-| 剑 | 机制 | 要点 |
-|---|---|---|
-| [x] decrepit_atlantis 破旧的亚特兰蒂斯 | 无技能，不可损坏 | 纯属性，无耐久，伤害 6，附魔 15 |
-| [x] sword_of_guard 侍卫之灵 | 右键耗魔 1 → 自身抗性 5s | 耐久 231 / 伤害 6 / 附魔 15，铁修复 |
-| [x] sword_of_halloween 万圣之刃 | 命中 1/5 概率召唤南瓜炸弹 | 炸弹：3s 引信、威力 2、带火；耐久 513 / 伤害 5 |
-| [x] ghost_sword 灵魂吸收者 | 命中 1/6 概率目标隐身 3s + 粒子 | 耐久 4095 / 伤害 12，复用已有 ghost_sickle 粒子 |
-| [x] dust_destroyer 尘灭者 | 右键耗魔 1（需 >1，与基岩一致）→ 前方 3/5 格凋零雾 ×2 | 雾：接触凋零 10s 放大器2（同基岩 json）+ 2 伤害，5s 消散；耐久 2045 / 伤害 14 |
-| [x] growth 生长者 | 命中耗魔 4 / 右键耗魔 5 → 生长能量射线 | 复用已有 GrowingEnergyRay；耐久 502 / 伤害 7 |
-
-### B 批：AOE/增益/蓄力
-| 剑 | 机制 | 要点 |
-|---|---|---|
-| [x] everlasting_winter_sword 永冬长剑 | 右键耗魔 1 → 半径 2-4 环减速 3s I | 耐久 1712 / 伤害 8 / 附魔 5 |
-| [x] sword_of_deep 黑域 | 右键耗魔 4 → 半径 4 全体凋零 10s II | 耐久 1023 / 伤害 13；已移植 deep_range 粒子 |
-| [x] vortex 旋涡 | 右键：水中耗魔 7（潮涌 5s + r3 中毒 5s + 溺水伤害 10）/ 陆地耗魔 11（中毒 2s + 伤害 7） | 耐久 832 / 伤害 8；已移植 bubble_vortex 粒子 |
-| [x] scale_sword 鳞之刃 | 命中：水中 1/2 概率目标 r3 溺水伤害 10 + 自身潮涌 10s；右键水中耗魔 6 / 陆地耗魔 10 强化版（伤害 12/8） | 耐久 1024 / 伤害 8 |
-| [x] warden_sword 匿潜刃 | 长按 1.5s 蓄力：耗魔 20 → 自身失明 10s + 黑暗 30s + 力量 8s + 速度 8s II + 抗性 8s II | 耐久 563 / 伤害 6 / 附魔 7，冷却 15s |
-| [x] wind_of_shadow 暗影之风 | 两段：右键耗魔 10 → 隐身 + 加速 3s；续按 3s → 半径 4 魔法伤害 11 | 耐久 524 / 伤害 8，冷却 4s；已移植 ender_spurt/ender_bomb 粒子 |
-| [x] the_imperial_sword 尚方宝剑 | 右键计数蓄能：第 8 次耗魔 15 → 力量 5s II + 抗性 2s III + r2-5 定身 1s；第 16 次强化版 | 耐久 564 / 伤害 8 / 附魔 20；已移植 frozen_shield 粒子 |
-
-### C 批：发射投射物（需新实体）
-| 剑 | 投射物 | 要点 |
-|---|---|---|
-| [ ] blue_of_the_sea 海之忧伤 | HardBubble ×4（伤害 4、无重力、初速 3/1/0.6/0.6） | 耗魔 3，耐久 412 / 伤害 6，冷却 0.7s |
-| [ ] storm_giant_sword 风暴巨剑 | StormEnergy ×4（伤害 4 + 击退、初速 0.08-0.3 散射） | 耗魔 3，耐久 533 / 伤害 6，冷却 2s |
-| [ ] radiate_sword 堕落圣刃 | RadiateFog（伤害 1 + 中毒 5s III） | 耗魔 2，耐久 1024 / 伤害 10，冷却 0.2s |
-| [ ] star_sword 迸发之星 | SpotsBySword ×6（伤害 14 + 点燃、初速 0.2-2.0） | 右键叠计数至 12 发射（4/8 层蓄力特效），耗魔 15；耐久 4096 / 伤害 12 / 附魔 10 |
-| [ ] bamboo_yataghan 竹长剑 | 投掷剑本体（伤害 7 + 击退、重力、弹跳、插地） | 需耐久 >7 并消耗 7；耐久 60 / 伤害 6，无附魔 |
-| [ ] village_guardian 村庄守卫 | 被动：命中给目标附近 4 格村民回血 10s；技能：占位（抬头+耐久>100+耗魔 20，提示等待传送门内容） | 耐久 513 / 伤害 6，冷却 60s |
-
-### 待移植粒子清单（剑相关）
-`bat_spurt`（A 批）、`deep_range`、`bubble_vortex`、`frozen_shield`、`village_portal_seep`、`ender_bomb`、`ender_spurt`、`bubble_spurt_middle`（B/C 批）
-
-### 待新建投射物实体
-`PumpkinBomb`、`WitherCloud`（A 批）、`HardBubble`、`StormEnergy`、`RadiateFog`、`SpotsBySword`、`BambooYataghanProjectile`（C 批）

build.gradle

@@ -41,7 +41,7 @@ base {
     archivesName = mod_id
 }
 
-// Mojang ships Java 21 to end users in 1.21.11, so mods should target Java 21.
+// Minecraft 1.21.1 requires Java 21, so the project targets Java 21.
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 neoForge {
@@ -59,6 +59,13 @@ neoForge {
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
     runs {
+        // MC <= 1.21.3: BootstrapLauncher starts the game with isolated classloaders that
+        // cannot see the JVM -cp, so non-mod library dependencies (e.g. the Kotlin stdlib)
+        // must be put on each run's legacy classpath to be visible at runtime.
+        configureEach { run ->
+            run.additionalRuntimeClasspathConfiguration.extendsFrom(configurations.implementation)
+        }
+
         client {
             client()
 
@@ -81,7 +88,7 @@ neoForge {
         }
 
         data {
-            clientData()
+            data()
 
             // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
             // gameDirectory = project.file('run-data')

gradle.properties

@@ -1,24 +1,24 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 org.gradle.jvmargs=-Xmx1G
-org.gradle.daemon=true
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.daemon=false
+org.gradle.parallel=false
+org.gradle.caching=false
+org.gradle.configuration-cache=false
 
 #read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-parchment_minecraft_version=1.21.11
-parchment_mappings_version=2025.12.20
+parchment_minecraft_version=1.21.1
+parchment_mappings_version=2024.11.17
 # Environment Properties
 # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.21.11
+minecraft_version=1.21.1
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.21.11]
+minecraft_version_range=[1.21.1]
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.11.38-beta
+neo_version=21.1.247
 
 ## Mod Properties
 
@@ -30,7 +30,7 @@ mod_name=DecIsland
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=1.0.0-1.21.11
+mod_version=1.0.0-1.21.1
 # 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

list/recipes.txt

@@ -3,7 +3,6 @@ amethyst_axe
 amethyst_dagger
 amethyst_pickaxe
 blast_furnace_copper_battleaxe
-blast_furnace_copper_dagger
 blast_furnace_diamond_axe
 blast_furnace_diamond_dagger
 blast_furnace_diamond_pickaxe
@@ -29,7 +28,6 @@ everlasting_winter_sword
 flintlock_bullet
 frozen_power
 furnace_copper_battleaxe
-furnace_copper_dagger
 furnace_diamond_axe
 furnace_diamond_dagger
 furnace_diamond_pickaxe