diff --git a/modules/bee_pickaxe/module_manifest.json b/modules/bee_pickaxe/module_manifest.json index 20bb06e0b..e4940833f 100644 --- a/modules/bee_pickaxe/module_manifest.json +++ b/modules/bee_pickaxe/module_manifest.json @@ -5,6 +5,9 @@ "author": [ "SkyEye_FAST" ], + "incompatible_with": [ + "fake_multitool" + ], "classifier": [ "modified_resource" ] diff --git a/modules/fake_multitool/add.json b/modules/fake_multitool/add.json new file mode 100644 index 000000000..2b535475f --- /dev/null +++ b/modules/fake_multitool/add.json @@ -0,0 +1,37 @@ +{ + "item.minecraft.wooden_axe": "木工具", + "item.minecraft.wooden_pickaxe": "木工具", + "item.minecraft.wooden_hoe": "木工具", + "item.minecraft.wooden_shovel": "木工具", + "item.minecraft.wooden_sword": "木工具", + + "item.minecraft.stone_axe": "石工具", + "item.minecraft.stone_pickaxe": "石工具", + "item.minecraft.stone_hoe": "石工具", + "item.minecraft.stone_shovel": "石工具", + "item.minecraft.stone_sword": "石工具", + + "item.minecraft.iron_axe": "铁工具", + "item.minecraft.iron_pickaxe": "铁工具", + "item.minecraft.iron_hoe": "铁工具", + "item.minecraft.iron_shovel": "铁工具", + "item.minecraft.iron_sword": "铁工具", + + "item.minecraft.diamond_axe": "钻石工具", + "item.minecraft.diamond_pickaxe": "钻石工具", + "item.minecraft.diamond_hoe": "钻石工具", + "item.minecraft.diamond_shovel": "钻石工具", + "item.minecraft.diamond_sword": "钻石工具", + + "item.minecraft.golden_axe": "金工具", + "item.minecraft.golden_pickaxe": "金工具", + "item.minecraft.golden_hoe": "金工具", + "item.minecraft.golden_shovel": "金工具", + "item.minecraft.golden_sword": "金工具", + + "item.minecraft.netherite_axe": "下界合金工具", + "item.minecraft.netherite_pickaxe": "下界合金工具", + "item.minecraft.netherite_hoe": "下界合金工具", + "item.minecraft.netherite_shovel": "下界合金工具", + "item.minecraft.netherite_sword": "下界合金工具" +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/debug_stick.json b/modules/fake_multitool/assets/minecraft/models/item/debug_stick.json new file mode 100644 index 000000000..80d09e5da --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/debug_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/orangice_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/diamond_axe.json b/modules/fake_multitool/assets/minecraft/models/item/diamond_axe.json new file mode 100644 index 000000000..9fd8e76f7 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/diamond_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/diamond_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/diamond_hoe.json b/modules/fake_multitool/assets/minecraft/models/item/diamond_hoe.json new file mode 100644 index 000000000..9fd8e76f7 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/diamond_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/diamond_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/diamond_pickaxe.json b/modules/fake_multitool/assets/minecraft/models/item/diamond_pickaxe.json new file mode 100644 index 000000000..9fd8e76f7 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/diamond_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/diamond_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/diamond_shovel.json b/modules/fake_multitool/assets/minecraft/models/item/diamond_shovel.json new file mode 100644 index 000000000..9fd8e76f7 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/diamond_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/diamond_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/diamond_sword.json b/modules/fake_multitool/assets/minecraft/models/item/diamond_sword.json new file mode 100644 index 000000000..9fd8e76f7 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/diamond_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/diamond_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/golden_axe.json b/modules/fake_multitool/assets/minecraft/models/item/golden_axe.json new file mode 100644 index 000000000..f2f2d155f --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/golden_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/golden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/golden_hoe.json b/modules/fake_multitool/assets/minecraft/models/item/golden_hoe.json new file mode 100644 index 000000000..f2f2d155f --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/golden_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/golden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/golden_pickaxe.json b/modules/fake_multitool/assets/minecraft/models/item/golden_pickaxe.json new file mode 100644 index 000000000..f2f2d155f --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/golden_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/golden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/golden_shovel.json b/modules/fake_multitool/assets/minecraft/models/item/golden_shovel.json new file mode 100644 index 000000000..f2f2d155f --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/golden_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/golden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/golden_sword.json b/modules/fake_multitool/assets/minecraft/models/item/golden_sword.json new file mode 100644 index 000000000..f2f2d155f --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/golden_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/golden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/iron_axe.json b/modules/fake_multitool/assets/minecraft/models/item/iron_axe.json new file mode 100644 index 000000000..630fd691d --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/iron_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/iron_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/iron_hoe.json b/modules/fake_multitool/assets/minecraft/models/item/iron_hoe.json new file mode 100644 index 000000000..630fd691d --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/iron_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/iron_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/iron_pickaxe.json b/modules/fake_multitool/assets/minecraft/models/item/iron_pickaxe.json new file mode 100644 index 000000000..630fd691d --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/iron_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/iron_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/iron_shovel.json b/modules/fake_multitool/assets/minecraft/models/item/iron_shovel.json new file mode 100644 index 000000000..630fd691d --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/iron_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/iron_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/iron_sword.json b/modules/fake_multitool/assets/minecraft/models/item/iron_sword.json new file mode 100644 index 000000000..630fd691d --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/iron_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/iron_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/netherite_axe.json b/modules/fake_multitool/assets/minecraft/models/item/netherite_axe.json new file mode 100644 index 000000000..91dfba1cf --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/netherite_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/netherite_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/netherite_hoe.json b/modules/fake_multitool/assets/minecraft/models/item/netherite_hoe.json new file mode 100644 index 000000000..91dfba1cf --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/netherite_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/netherite_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/netherite_pickaxe.json b/modules/fake_multitool/assets/minecraft/models/item/netherite_pickaxe.json new file mode 100644 index 000000000..91dfba1cf --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/netherite_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/netherite_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/netherite_shovel.json b/modules/fake_multitool/assets/minecraft/models/item/netherite_shovel.json new file mode 100644 index 000000000..91dfba1cf --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/netherite_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/netherite_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/netherite_sword.json b/modules/fake_multitool/assets/minecraft/models/item/netherite_sword.json new file mode 100644 index 000000000..91dfba1cf --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/netherite_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/netherite_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/stone_axe.json b/modules/fake_multitool/assets/minecraft/models/item/stone_axe.json new file mode 100644 index 000000000..65ee9a3c2 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/stone_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/stone_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/stone_hoe.json b/modules/fake_multitool/assets/minecraft/models/item/stone_hoe.json new file mode 100644 index 000000000..65ee9a3c2 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/stone_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/stone_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/stone_pickaxe.json b/modules/fake_multitool/assets/minecraft/models/item/stone_pickaxe.json new file mode 100644 index 000000000..65ee9a3c2 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/stone_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/stone_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/stone_shovel.json b/modules/fake_multitool/assets/minecraft/models/item/stone_shovel.json new file mode 100644 index 000000000..65ee9a3c2 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/stone_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/stone_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/stone_sword.json b/modules/fake_multitool/assets/minecraft/models/item/stone_sword.json new file mode 100644 index 000000000..65ee9a3c2 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/stone_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/stone_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/wooden_axe.json b/modules/fake_multitool/assets/minecraft/models/item/wooden_axe.json new file mode 100644 index 000000000..910d0cc43 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/wooden_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/wooden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/wooden_hoe.json b/modules/fake_multitool/assets/minecraft/models/item/wooden_hoe.json new file mode 100644 index 000000000..910d0cc43 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/wooden_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/wooden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/wooden_pickaxe.json b/modules/fake_multitool/assets/minecraft/models/item/wooden_pickaxe.json new file mode 100644 index 000000000..910d0cc43 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/wooden_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/wooden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/wooden_shovel.json b/modules/fake_multitool/assets/minecraft/models/item/wooden_shovel.json new file mode 100644 index 000000000..910d0cc43 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/wooden_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/wooden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/models/item/wooden_sword.json b/modules/fake_multitool/assets/minecraft/models/item/wooden_sword.json new file mode 100644 index 000000000..910d0cc43 --- /dev/null +++ b/modules/fake_multitool/assets/minecraft/models/item/wooden_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/wooden_multitool" + } +} \ No newline at end of file diff --git a/modules/fake_multitool/assets/minecraft/textures/item/diamond_multitool.png b/modules/fake_multitool/assets/minecraft/textures/item/diamond_multitool.png new file mode 100644 index 000000000..a0432daed Binary files /dev/null and b/modules/fake_multitool/assets/minecraft/textures/item/diamond_multitool.png differ diff --git a/modules/fake_multitool/assets/minecraft/textures/item/golden_multitool.png b/modules/fake_multitool/assets/minecraft/textures/item/golden_multitool.png new file mode 100644 index 000000000..31ac5976c Binary files /dev/null and b/modules/fake_multitool/assets/minecraft/textures/item/golden_multitool.png differ diff --git a/modules/fake_multitool/assets/minecraft/textures/item/iron_multitool.png b/modules/fake_multitool/assets/minecraft/textures/item/iron_multitool.png new file mode 100644 index 000000000..257dae4c7 Binary files /dev/null and b/modules/fake_multitool/assets/minecraft/textures/item/iron_multitool.png differ diff --git a/modules/fake_multitool/assets/minecraft/textures/item/netherite_multitool.png b/modules/fake_multitool/assets/minecraft/textures/item/netherite_multitool.png new file mode 100644 index 000000000..e79a20f8a Binary files /dev/null and b/modules/fake_multitool/assets/minecraft/textures/item/netherite_multitool.png differ diff --git a/modules/fake_multitool/assets/minecraft/textures/item/orangice_multitool.png b/modules/fake_multitool/assets/minecraft/textures/item/orangice_multitool.png new file mode 100644 index 000000000..f7a967058 Binary files /dev/null and b/modules/fake_multitool/assets/minecraft/textures/item/orangice_multitool.png differ diff --git a/modules/fake_multitool/assets/minecraft/textures/item/stone_multitool.png b/modules/fake_multitool/assets/minecraft/textures/item/stone_multitool.png new file mode 100644 index 000000000..8e692378c Binary files /dev/null and b/modules/fake_multitool/assets/minecraft/textures/item/stone_multitool.png differ diff --git a/modules/fake_multitool/assets/minecraft/textures/item/wooden_multitool.png b/modules/fake_multitool/assets/minecraft/textures/item/wooden_multitool.png new file mode 100644 index 000000000..4a28c4eba Binary files /dev/null and b/modules/fake_multitool/assets/minecraft/textures/item/wooden_multitool.png differ diff --git a/modules/fake_multitool/module_manifest.json b/modules/fake_multitool/module_manifest.json new file mode 100644 index 000000000..9c8cf2654 --- /dev/null +++ b/modules/fake_multitool/module_manifest.json @@ -0,0 +1,16 @@ +{ + "name": "fake_multitool", + "type": "resource", + "description": "工具的用途被模糊。", + "author": [ + "siiftun1857" + ], + "incompatible_with": [ + "lang_sfc", + "bee_pickaxe" + ], + "classifier": [ + "modified_language", + "modified_resource" + ] +} \ No newline at end of file diff --git a/modules/lang_sfc/module_manifest.json b/modules/lang_sfc/module_manifest.json index c66b0f8f0..a4092066d 100644 --- a/modules/lang_sfc/module_manifest.json +++ b/modules/lang_sfc/module_manifest.json @@ -5,6 +5,9 @@ "author": [ "梗体中文内容组" ], + "incompatible_with": [ + "fake_multitool" + ], "classifier": [ "modified_language" ]