Bruteforce port from minecraft version 1.21 to 26.2-snapshot-5 using Codex

.gitignore

@@ -17,6 +17,9 @@ htmlReport/
 *.ipr
 *.iws
 
+# vs
+/.vs
+
 # vscode
 
 .settings/
@@ -42,4 +45,5 @@ replay_*.log
 *.jfr
 
 # kotlin
-.kotlin/
+.kotlin/
+

common/build.gradle.kts

@@ -69,6 +69,29 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
 
     implementation(project(":ledger"))
+    include(project(":ledger"))
+}
+
+sourceSets {
+    main {
+        java {
+            setIncludes(
+                listOf(
+                    "heckerpowered/matrix/mixin/CameraMixin.java",
+                    "heckerpowered/matrix/mixin/DamageSourceMixin.java",
+                    "heckerpowered/matrix/mixin/DeltaTrackerTimerMixin.java",
+                    "heckerpowered/matrix/mixin/EntityMixin.java",
+                    "heckerpowered/matrix/mixin/GameRendererStandaloneMixin.java",
+                    "heckerpowered/matrix/mixin/KeyboardMixin.java",
+                    "heckerpowered/matrix/mixin/LevelMixin.java",
+                    "heckerpowered/matrix/mixin/LivingEntityMixin.java",
+                    "heckerpowered/matrix/mixin/MinecraftMixin.java",
+                    "heckerpowered/matrix/mixin/MinecraftServerMixin.java",
+                    "heckerpowered/matrix/mixin/MixinInGameHud.java",
+                )
+            )
+        }
+    }
 }
 
 tasks.test {
@@ -108,4 +131,4 @@ tasks.jar {
     from("LICENSE") {
         rename { "${it}_${archiveBaseName}" }
     }
-}
+}

common/src/main/generated/assets/matrix/lang/en_us.json

@@ -83,8 +83,12 @@
   "item.minecraft.potion.effect.angered": "Potion of Angered",
   "item.minecraft.splash_potion.effect.angered": "Slash Potion of Angered",
   "itemGroup.matrix": "Matrix",
+  "key.category.matrix.key_category": "Matrix",
   "key.categories.matrix": "Matrix",
+  "key.categories.matrix.key_category": "Matrix",
   "key.matrix.next_magic": "Next magic",
+  "key.matrix.overclock_magic": "Overclock or underclock magic",
+  "key.matrix.overclock_mana": "Overclock or underclock mana",
   "key.matrix.previous_magic": "Previous magic",
   "key.matrix.use_magic": "Channel magic",
   "matrix.borrowed_time_charge.description": "Borrowed Time Charge: ",
@@ -134,6 +138,10 @@
   "matrix.magic.tuck_in.name": "Tuck In",
   "matrix.magic_available": "Ready",
   "matrix.magic_available.mana_not_enough": "Insufficient Mana Available",
+  "matrix.magic.available_status.channel_queue_full": "Queue Full",
+  "matrix.magic.available_status.channel_queue_locked": "Queue Locked",
+  "matrix.magic.available_status.insufficient_mana": "Insufficient Mana",
+  "matrix.magic.available_status.target_missing": "Target Missing",
   "matrix.magic_channel_queue_full": "Queue Full",
   "matrix.magic_channel_queue_locked": "Queue Locked",
   "matrix.magic_target_immune": "Target Immune",
@@ -142,6 +150,9 @@
   "matrix.mana": "Mana",
   "matrix.mana_cost_increased": "Mana cost increased by",
   "matrix.mana_cost_reduced": "Mana cost reduced by",
+  "matrix.hud.magic_list": "Magic selection",
+  "matrix.hud.selected_magic": "Selected magic",
+  "matrix.hud.target": "Target",
   "matrix.overclock.magic": "Overclock or Underclock Magic",
   "matrix.overclock.mana": "Overclock or Underclock Mana",
   "matrix.overclock.switch": "Switch Overclock or Underclock",
@@ -157,4 +168,4 @@
   "matrix.wizard_helmet.accumulated_mana_delta": "Spent/Recovered Mana: ",
   "matrix.wizard_helmet.blood_pact_conversion_efficiency": "Blood Pact Conversion Efficiency: ",
   "matrix.wizard_helmet.load.description": "Current load: "
-}
+}

common/src/main/generated/assets/matrix/lang/zh_cn.json

@@ -86,8 +86,12 @@
   "item.minecraft.potion.effect.angered": "狂暴药水",
   "item.minecraft.slash_potion.effect.angered": "喷溅型狂暴药水",
   "itemGroup.matrix": "Matrix",
+  "key.category.matrix.key_category": "Matrix",
   "key.categories.matrix": "Matrix",
+  "key.categories.matrix.key_category": "Matrix",
   "key.matrix.next_magic": "下一个魔法",
+  "key.matrix.overclock_magic": "超频或降频魔法",
+  "key.matrix.overclock_mana": "超频或降频法力",
   "key.matrix.previous_magic": "上一个魔法",
   "key.matrix.use_magic": "引导魔法",
   "matrix.borrowed_time_charge.description": "实境扭曲充能: ",
@@ -137,6 +141,10 @@
   "matrix.magic.tuck_in.name": "温柔哄睡",
   "matrix.magic_available": "就绪",
   "matrix.magic_available.mana_not_enough": "可用法力不足",
+  "matrix.magic.available_status.channel_queue_full": "队列已满",
+  "matrix.magic.available_status.channel_queue_locked": "队列已锁定",
+  "matrix.magic.available_status.insufficient_mana": "可用法力不足",
+  "matrix.magic.available_status.target_missing": "目标缺失",
   "matrix.magic_channel_queue_full": "队列已满",
   "matrix.magic_channel_queue_locked": "队列已锁定",
   "matrix.magic_target_immune": "目标免疫",
@@ -145,6 +153,9 @@
   "matrix.mana": "法力值",
   "matrix.mana_cost_increased": "法力消耗增加",
   "matrix.mana_cost_reduced": "法力消耗降低",
+  "matrix.hud.magic_list": "魔法选择",
+  "matrix.hud.selected_magic": "当前魔法",
+  "matrix.hud.target": "目标",
   "matrix.overclock.magic": "超频或降频魔法",
   "matrix.overclock.mana": "超频或降频法力",
   "matrix.overclock.switch": "切换超频或降频",
@@ -160,4 +171,4 @@
   "matrix.wizard_helmet.accumulated_mana_delta": "已使用/回复的法力: ",
   "matrix.wizard_helmet.blood_pact_conversion_efficiency": "血之契约兑换效率: ",
   "matrix.wizard_helmet.load.description": "当前负载: "
-}
+}

common/src/main/generated/data/matrix/advancement/recipes/combat/coal_boots.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/coal_chestplate.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/coal_helmet.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/coal_leggings.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/coal_sword.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/stone_boots.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "#minecraft:stone_tool_materials"
+            "items": "minecraft:cobblestone"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/stone_chestplate.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "#minecraft:stone_tool_materials"
+            "items": "minecraft:cobblestone"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/stone_helmet.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "#minecraft:stone_tool_materials"
+            "items": "minecraft:cobblestone"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/combat/stone_leggings.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "#minecraft:stone_tool_materials"
+            "items": "minecraft:cobblestone"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/tools/coal_axe.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/tools/coal_hoe.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/tools/coal_pickaxe.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/advancement/recipes/tools/coal_shovel.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:emerald"
+            "items": "minecraft:coal_block"
           }
         ]
       },

common/src/main/generated/data/matrix/recipe/coal_axe.json

@@ -3,20 +3,15 @@
   "category": "equipment",
   "group": "matrix_coal_suit",
   "key": {
-    "#": {
-      "item": "minecraft:coal_block"
-    },
-    "|": {
-      "item": "minecraft:stick"
-    }
+    "#": "minecraft:coal_block",
+    "|": "minecraft:stick"
   },
   "pattern": [
     "## ",
     "#| ",
     " | "
   ],
   "result": {
-    "count": 1,
     "id": "matrix:coal_axe"
   }
 }

common/src/main/generated/data/matrix/recipe/coal_boots.json

@@ -3,16 +3,13 @@
   "category": "equipment",
   "group": "matrix_coal_suit",
   "key": {
-    "#": {
-      "item": "minecraft:coal_block"
-    }
+    "#": "minecraft:coal_block"
   },
   "pattern": [
     "# #",
     "# #"
   ],
   "result": {
-    "count": 1,
     "id": "matrix:coal_boots"
   }
 }

common/src/main/generated/data/matrix/recipe/coal_chestplate.json

@@ -3,17 +3,14 @@
   "category": "equipment",
   "group": "matrix_coal_suit",
   "key": {
-    "#": {
-      "item": "minecraft:coal_block"
-    }
+    "#": "minecraft:coal_block"
   },
   "pattern": [
     "# #",
     "###",
     "###"
   ],
   "result": {
-    "count": 1,
     "id": "matrix:coal_chestplate"
   }
 }

common/src/main/generated/data/matrix/recipe/coal_helmet.json

@@ -3,16 +3,13 @@
   "category": "equipment",
   "group": "matrix_coal_suit",
   "key": {
-    "#": {
-      "item": "minecraft:coal_block"
-    }
+    "#": "minecraft:coal_block"
   },
   "pattern": [
     "###",
     "# #"
   ],
   "result": {
-    "count": 1,
     "id": "matrix:coal_helmet"
   }
 }

common/src/main/generated/data/matrix/recipe/coal_hoe.json

@@ -3,20 +3,15 @@
   "category": "equipment",
   "group": "matrix_coal_suit",
   "key": {
-    "#": {
-      "item": "minecraft:coal_block"
-    },
-    "|": {
-      "item": "minecraft:stick"
-    }
+    "#": "minecraft:coal_block",
+    "|": "minecraft:stick"
   },
   "pattern": [
     "## ",
     " | ",
     " | "
   ],
   "result": {
-    "count": 1,
     "id": "matrix:coal_hoe"
   }
 }

common/src/main/generated/data/matrix/recipe/coal_leggings.json

@@ -3,17 +3,14 @@
   "category": "equipment",
   "group": "matrix_coal_suit",
   "key": {
-    "#": {
-      "item": "minecraft:coal_block"
-    }
+    "#": "minecraft:coal_block"
   },
   "pattern": [
     "###",
     "# #",
     "# #"
   ],
   "result": {
-    "count": 1,
     "id": "matrix:coal_leggings"
   }
 }