diff --git a/README.md b/README.md index d7cfec3..9475bf2 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ # -This mod gives the mace a complete overhaul, making it like the trident — having a 2D icon with a 3D first-person model. -(Credit to [Volery](https://modrinth.com/mod/mace-but-3d/) | [MIT](https://github.com/Volery39/MaceBut3D/blob/3c22f7265b5b1b1ccb5d5774cf890700b03103e0/LICENSE)) +This mod gives the mace a complete overhaul, making it as special as the trident, if not even more so! +This mod also expands the capabilities of the mace by adding a new crafting recipe, new items, and a new ability, wind bounce! -This mod also expands the capabilities of the mace by adding a new crafting recipe, new items, and new other stuff! +You can wind bounce by using the mace on the ground below you, though it does cost a good amount of durabilty, use it wisely! # diff --git a/src/main/java/com/kckarnige/wham/items/ModItems.java b/src/main/java/com/kckarnige/wham/items/ModItems.java new file mode 100644 index 0000000..f281e5a --- /dev/null +++ b/src/main/java/com/kckarnige/wham/items/ModItems.java @@ -0,0 +1,32 @@ +package com.kckarnige.wham.items; + +import com.kckarnige.wham.wham; + +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; + +public class ModItems { + + public static final Item MACE_HEAD = registerItem("mace_head", new Item(new Item.Settings().rarity(Rarity.EPIC))); + + private static void addItemToItemGroup(FabricItemGroupEntries entries) { + entries.add(MACE_HEAD); + } + + private static Item registerItem (String name, Item item) { + return Registry.register(Registries.ITEM, Identifier.of(wham.MOD_ID, name), item); + } + + public static void registerModItems () { + wham.LOGGER.info("[Wham!] Things feel different.."); + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(ModItems::addItemToItemGroup); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register(ModItems::addItemToItemGroup); + } +} diff --git a/src/main/java/com/kckarnige/wham/wham.java b/src/main/java/com/kckarnige/wham/wham.java index c480dfa..49e2b2d 100644 --- a/src/main/java/com/kckarnige/wham/wham.java +++ b/src/main/java/com/kckarnige/wham/wham.java @@ -1,5 +1,6 @@ package com.kckarnige.wham; +import com.kckarnige.wham.items.ModItems; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; @@ -12,6 +13,7 @@ public class wham implements ModInitializer { @Override public void onInitialize() { + ModItems.registerModItems(); LOGGER.info("[Wham!] Now this should pack more of a punch!"); } } \ No newline at end of file diff --git a/src/main/resources/assets/wham/icon.png b/src/main/resources/assets/wham/icon.png index f5cd3d5..95730c0 100644 Binary files a/src/main/resources/assets/wham/icon.png and b/src/main/resources/assets/wham/icon.png differ diff --git a/src/main/resources/assets/wham/lang/en_gb.json b/src/main/resources/assets/wham/lang/en_gb.json new file mode 100644 index 0000000..018c577 --- /dev/null +++ b/src/main/resources/assets/wham/lang/en_gb.json @@ -0,0 +1,3 @@ +{ + "item.wham.mace_head": "Mace Head" +} \ No newline at end of file diff --git a/src/main/resources/assets/wham/lang/en_us.json b/src/main/resources/assets/wham/lang/en_us.json new file mode 100644 index 0000000..018c577 --- /dev/null +++ b/src/main/resources/assets/wham/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "item.wham.mace_head": "Mace Head" +} \ No newline at end of file diff --git a/src/main/resources/assets/wham/models/item/mace_head.json b/src/main/resources/assets/wham/models/item/mace_head.json new file mode 100644 index 0000000..8496d33 --- /dev/null +++ b/src/main/resources/assets/wham/models/item/mace_head.json @@ -0,0 +1,178 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [8, 8], + "textures": { + "9": "wham:item/mace_texture", + "particle": "item/mace" + }, + "elements": [ + { + "from": [7.625, 0, 7.625], + "to": [8.375, 3, 8.375], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 2.2875, 8]}, + "faces": { + "north": {"uv": [14.5, 1.5, 16, 7.5], "texture": "#9"}, + "east": {"uv": [14.5, 1.5, 16, 7.5], "texture": "#9"}, + "south": {"uv": [14.5, 1.5, 16, 7.5], "texture": "#9"}, + "west": {"uv": [14.5, 1.5, 16, 7.5], "texture": "#9"}, + "up": {"uv": [16, 1.5, 14.5, 0], "texture": "#9"}, + "down": {"uv": [16, 7.5, 14.5, 9], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [8, 3, 7.625], + "to": [8, 3.5, 8.375], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 2.2875, 8]}, + "faces": { + "east": {"uv": [14.5, 13.075, 16, 14], "texture": "#9"}, + "west": {"uv": [16, 13.075, 14.5, 14], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [7.625, 3, 8], + "to": [8.375, 3.5, 8], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 2.2875, 8]}, + "faces": { + "north": {"uv": [14.5, 13.075, 16, 14], "texture": "#9"}, + "south": {"uv": [16, 13.075, 14.5, 14], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [8, -0.8, 8.25], + "to": [8, 3.45, 10.5], + "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "east": {"uv": [6.5, 0, 11, 8], "texture": "#9"}, + "west": {"uv": [11, 0, 6.5, 8], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [5.5, -0.8, 8], + "to": [7.75, 3.45, 8], + "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "north": {"uv": [11, 0, 6.5, 8], "texture": "#9"}, + "south": {"uv": [6.5, 0, 11, 8], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [8.25, -0.8, 8], + "to": [10.5, 3.45, 8], + "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "north": {"uv": [6.5, 0, 11, 8], "texture": "#9"}, + "south": {"uv": [11, 0, 6.5, 8], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [8, -0.8, 5.5], + "to": [8, 3.45, 7.75], + "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "east": {"uv": [11, 0, 6.5, 8], "texture": "#9"}, + "west": {"uv": [6.5, 0, 11, 8], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [8, -0.8, 5.5], + "to": [8, 3.45, 7.75], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "east": {"uv": [11, 0, 6.5, 8], "texture": "#9"}, + "west": {"uv": [6.5, 0, 11, 8], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [8, -0.8, 8.25], + "to": [8, 3.45, 10.5], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "east": {"uv": [6.5, 0, 11, 8], "texture": "#9"}, + "west": {"uv": [11, 0, 6.5, 8], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [8.25, -0.8, 8], + "to": [10.5, 3.45, 8], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "north": {"uv": [6.5, 0, 11, 8], "texture": "#9"}, + "south": {"uv": [11, 0, 6.5, 8], "texture": "#9"} + } + }, + { + "name": "plane", + "from": [5.5, -0.8, 8], + "to": [7.75, 3.45, 8], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 2.2875, 8]}, + "faces": { + "north": {"uv": [11, 0, 6.5, 8], "texture": "#9"}, + "south": {"uv": [6.5, 0, 11, 8], "texture": "#9"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [176, 20, -2], + "translation": [0, -12, 2.5], + "scale": [2.18, 2.18, 2.18] + }, + "thirdperson_lefthand": { + "rotation": [176, 20, -2], + "translation": [0, -12, 2.5], + "scale": [2.18, 2.18, 2.18] + }, + "firstperson_righthand": { + "rotation": [4, 8, 1], + "translation": [-1.5, 14, 4], + "scale": [1.69, 1.63, 1.69] + }, + "firstperson_lefthand": { + "rotation": [4, 8, 1], + "translation": [-1.5, 14, 4], + "scale": [1.69, 1.63, 1.69] + }, + "ground": { + "translation": [0, 12, 0], + "scale": [2, 2, 2] + }, + "gui": { + "rotation": [34, -46, 0], + "translation": [0, 14.25, 0], + "scale": [2.58, 2.58, 2.58] + }, + "head": { + "translation": [0, 22, 0], + "scale": [4, 2.5, 4] + }, + "fixed": { + "translation": [0, 12.5, 0], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "Original Model by GugerOS", + "origin": [7.25, 1.5, 7.25], + "color": 0, + "children": [ + 0, + { + "name": "Edit by KayoticCarnige", + "origin": [7.5, 6.375, 7.5], + "color": 0, + "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/wham/textures/item/mace_head.png b/src/main/resources/assets/wham/textures/item/mace_head.png new file mode 100644 index 0000000..70b5b77 Binary files /dev/null and b/src/main/resources/assets/wham/textures/item/mace_head.png differ diff --git a/src/main/resources/data/minecraft/recipe/mace.json b/src/main/resources/data/minecraft/recipe/mace.json index c974455..225da84 100644 --- a/src/main/resources/data/minecraft/recipe/mace.json +++ b/src/main/resources/data/minecraft/recipe/mace.json @@ -3,15 +3,15 @@ "category": "equipment", "pattern": [ "=#=", - "-I-", - " I " + " I ", + " - " ], "key": { "#": { - "item": "minecraft:heavy_core" + "item": "wham:mace_head" }, "=": { - "item": "minecraft:iron_ingot" + "item": "minecraft:wind_charge" }, "-": { "item": "minecraft:iron_nugget" diff --git a/src/main/resources/data/wham/recipe/mace_head.json b/src/main/resources/data/wham/recipe/mace_head.json new file mode 100644 index 0000000..a22bf9d --- /dev/null +++ b/src/main/resources/data/wham/recipe/mace_head.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " - ", + "=#=", + "- -" + ], + "key": { + "#": { + "item": "minecraft:heavy_core" + }, + "=": { + "item": "minecraft:iron_ingot" + }, + "-": { + "item": "minecraft:iron_nugget" + } + }, + "result": { + "id": "wham:mace_head", + "count": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index dbad2af..fc847d4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -2,14 +2,14 @@ "schemaVersion": 1, "id": "wham", "version": "${version}", - "name": "Slow Your Bronze", - "description": "A compatibility mod to make the 'Bronze' mod compatible with 'Slow Your Roll'.", + "name": "Wham!", + "description": "A complete mace overhaul!", "authors": [ "KayoticCarnige" ], "contact": { "homepage": "https://fabricmc.net/", - "sources": "https://github.com/kckarnige/wham" + "sources": "https://github.com/kckarnige/WhamMace" }, "license": "MIT", "icon": "assets/wham/icon.png", diff --git a/wham.gif b/wham.gif new file mode 100644 index 0000000..9ce8d32 Binary files /dev/null and b/wham.gif differ diff --git a/wham.png b/wham.png new file mode 100644 index 0000000..ea40de4 Binary files /dev/null and b/wham.png differ diff --git a/wham.psd b/wham.psd index 422954f..e195e9b 100644 Binary files a/wham.psd and b/wham.psd differ diff --git a/wham_small.png b/wham_small.png new file mode 100644 index 0000000..95730c0 Binary files /dev/null and b/wham_small.png differ