version up

hrmcngs · Dec 8, 2024 · 44e71cd · 44e71cd
1 parent cc1ca5a
commit 44e71cd
Show file tree

Hide file tree

Showing 20 changed files with 1,687 additions and 647 deletions.
diff --git a/elements/AlchemyCraftBlockBlockAdded.mod.json b/elements/AlchemyCraftBlockBlockAdded.mod.json
@@ -2,6 +2,6 @@
   "_fv": 43,
   "_type": "procedure",
   "definition": {
-    "procedurexml": "<xml xmlns=\"https://developers.google.com/blockly/xml\"><block type=\"event_trigger\" deletable=\"false\" x=\"40\" y=\"40\"><field name=\"trigger\">no_ext_trigger</field><next><block type=\"execute_command\"><value name=\"command\"><block type=\"text\"><field name=\"TEXT\">/summon minecraft:armor_stand ~ ~-0.5 ~ {Invisible:true,Invulnerable:true,PersistenceRequired:true,NoBasePlate:true,NoGravity:true,Small:true,DisabledSlots:4144959,Tags:[\"minecraft_armor_weapon_alchemy_craft_block_mahouzinn\"]}</field></block></value><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value></block></next></block></xml>"
+    "procedurexml": "<xml xmlns=\"https://developers.google.com/blockly/xml\"><block type=\"event_trigger\" deletable=\"false\" x=\"40\" y=\"40\"><field name=\"trigger\">no_ext_trigger</field><next><block type=\"execute_command\"><value name=\"command\"><block type=\"text\"><field name=\"TEXT\">/summon minecraft:armor_stand ~ ~-0.5 ~ {Invisible:true,Invulnerable:true,PersistenceRequired:true,NoBasePlate:true,NoGravity:true,Small:true,DisabledSlots:4144959,Tags:[\"minecraft_armor_weapon_alchemy_craft_block_mahouzinn\"]}</field></block></value><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"math_dual_ops\"><field name=\"OP\">MINUS</field><value name=\"A\"><block type=\"coord_y\"></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">0.5</field></block></value></block></value><value name=\"z\"><block type=\"coord_z\"></block></value></block></next></block></xml>"
   }
 }
diff --git a/elements/MagicWand.mod.json b/elements/MagicWand.mod.json
@@ -1,45 +1,30 @@
 {
   "_fv": 43,
-  "_type": "item",
+  "_type": "tool",
   "definition": {
     "renderType": 1,
     "texture": "black_spesyal_arrow",
     "customModelName": "magicstick:default",
-    "name": "Magic Wand",
-    "rarity": "RARE",
+    "name": "Magicwand",
+    "specialInfo": [],
     "creativeTab": {
       "value": "CUSTOM:MagicBooks"
     },
-    "stackSize": 1,
-    "enchantability": 0,
-    "useDuration": 0,
-    "toolType": 1.0,
-    "damageCount": 0,
-    "recipeRemainder": {
-      "value": ""
-    },
-    "destroyAnyBlock": false,
-    "immuneToFire": false,
-    "stayInGridWhenCrafting": true,
-    "damageOnCrafting": false,
-    "enableMeleeDamage": false,
+    "toolType": "Sword",
+    "harvestLevel": 1,
+    "efficiency": 4.0,
+    "attackSpeed": 1.6,
+    "enchantability": 2,
     "damageVsEntity": 0.0,
-    "specialInfo": [],
+    "usageCount": 0,
+    "blocksAffected": [],
     "hasGlow": false,
-    "guiBoundTo": "<NONE>",
-    "inventorySize": 9,
-    "inventoryStackSize": 64,
+    "repairItems": [],
+    "immuneToFire": false,
+    "stayInGridWhenCrafting": false,
+    "damageOnCrafting": false,
     "onRightClickedInAir": {
       "name": "MagicWandYoukuritukusitatoki"
-    },
-    "isFood": false,
-    "nutritionalValue": 4,
-    "saturation": 0.3,
-    "eatResultItem": {
-      "value": ""
-    },
-    "isMeat": false,
-    "isAlwaysEdible": false,
-    "animation": "none"
+    }
   }
 }
diff --git a/elements/MagicWandYoukuritukusitatoki.mod.json b/elements/MagicWandYoukuritukusitatoki.mod.json
diff --git a/elements/SkinOfDragonTick.mod.json b/elements/SkinOfDragonTick.mod.json
diff --git a/elements/Tick.mod.json b/elements/Tick.mod.json
@@ -0,0 +1,7 @@
+{
+  "_fv": 43,
+  "_type": "procedure",
+  "definition": {
+    "procedurexml": "<xml xmlns=\"https://developers.google.com/blockly/xml\"><block type=\"event_trigger\" deletable=\"false\" x=\"40\" y=\"40\"><field name=\"trigger\">world_ticks</field></block></xml>"
+  }
+}
diff --git a/minecraft_armor_weapon.mcreator b/minecraft_armor_weapon.mcreator
@@ -2033,20 +2033,6 @@
         ]
       }
     },
-    {
-      "name": "MagicWand",
-      "type": "item",
-      "sortid": 162,
-      "compiles": true,
-      "locked_code": false,
-      "registry_name": "magic_wand",
-      "metadata": {
-        "files": [
-          "src/main/resources/assets/minecraft_armor_weapon/models/item/magic_wand.json",
-          "src/main/java/minecraftarmorweapon/item/MagicWandItem.java"
-        ]
-      }
-    },
     {
       "name": "Strayouterarmorhat",
       "type": "armor",
@@ -8943,6 +8929,34 @@
           "src/main/resources/assets/minecraft_armor_weapon/models/item/alchemy_craft_block.json"
         ]
       }
+    },
+    {
+      "name": "Magicwand",
+      "type": "tool",
+      "sortid": 588,
+      "compiles": true,
+      "locked_code": false,
+      "registry_name": "magicwand",
+      "metadata": {
+        "files": [
+          "src/main/resources/assets/minecraft_armor_weapon/models/item/magicwand.json",
+          "src/main/java/minecraftarmorweapon/item/MagicwandItem.java"
+        ]
+      }
+    },
+    {
+      "name": "Tick",
+      "type": "procedure",
+      "sortid": 589,
+      "compiles": true,
+      "locked_code": false,
+      "registry_name": "tick",
+      "metadata": {
+        "files": [
+          "src/main/java/minecraftarmorweapon/procedures/TickProcedure.java"
+        ],
+        "dependencies": []
+      }
     }
   ],
   "variable_elements": [
@@ -9217,6 +9231,7 @@
       "item.minecraft_armor_weapon.bogged_outer_chestplate": "Bogged Outer Chestplate",
       "item.minecraft_armor_weapon.dragon_green_armor_boots": "§2Dragon green boots",
       "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood",
+      "item.minecraft_armor_weapon.magicwand": "Magicwand",
       "item.minecraft_armor_weapon.das_herz_einer_fee_armor_boots": "das herz einer fee armor boots",
       "entity.minecraft_armor_weapon.killotiru": "Otiruyo",
       "effect.minecraft_armor_weapon.kitterukitteru": "subetekirisuteru",
@@ -9336,7 +9351,6 @@
       "item.minecraft_armor_weapon.das_herz_einer_fee_armor_leggings": "das herz einer fee armor leggings",
       "item.minecraft_armor_weapon.dragon_red_armor_boots": "§4Dragon red boots",
       "item.minecraft_armor_weapon.bubbleshot": "§9Bubbleshot",
-      "item.minecraft_armor_weapon.magic_wand": "Magic Wand",
       "effect.minecraft_armor_weapon.tunderbolteffrct": "tunderboltattack",
       "item.minecraft_armor_weapon.netherite_katana": "§8Netherite Katana",
       "block.minecraft_armor_weapon.stone_katana_block_1": "stone Katana Block",
@@ -9478,6 +9492,7 @@
       "effect.minecraft_armor_weapon.long_range_weapon_cut": "遠距離武器斬る",
       "item.minecraft_armor_weapon.dragon_green_armor_boots": "§2Dragon green boots",
       "item.minecraft_armor_weapon.rivers_of_blood": "§4§lRivers of Blood",
+      "item.minecraft_armor_weapon.magicwand": "Magicwand",
       "entity.minecraft_armor_weapon.killotiru": "Otiruyo",
       "item.minecraft_armor_weapon.das_herz_einer_fee_armor_boots": "das herz einer fee armor boots",
       "effect.minecraft_armor_weapon.kitterukitteru": "subetekirisuteru",
@@ -9597,7 +9612,6 @@
       "item.minecraft_armor_weapon.das_herz_einer_fee_armor_leggings": "das herz einer fee armor leggings",
       "item.minecraft_armor_weapon.dragon_red_armor_boots": "§4Dragon red boots",
       "item.minecraft_armor_weapon.bubbleshot": "§9Bubbleshot",
-      "item.minecraft_armor_weapon.magic_wand": "Magic Wand",
       "effect.minecraft_armor_weapon.tunderbolteffrct": "tunderboltattack",
       "item.minecraft_armor_weapon.netherite_katana": "§8Netherite Katana",
       "block.minecraft_armor_weapon.stone_katana_block_1": "Netherite Katana Block",