diff --git a/src/main/java/dev/tggamesyt/szar/NiggeriteArmorMaterial.java b/src/main/java/dev/tggamesyt/szar/NiggeriteArmorMaterial.java new file mode 100644 index 0000000..7f9245a --- /dev/null +++ b/src/main/java/dev/tggamesyt/szar/NiggeriteArmorMaterial.java @@ -0,0 +1,55 @@ +package dev.tggamesyt.szar; + +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.recipe.Ingredient; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; + +public class NiggeriteArmorMaterial implements ArmorMaterial { + + public static final NiggeriteArmorMaterial INSTANCE = new NiggeriteArmorMaterial(); + + private static final int[] BASE_DURABILITY = {13, 15, 16, 11}; + private static final int[] PROTECTION = {4, 8, 10, 4}; + + @Override + public int getDurability(ArmorItem.Type type) { + return BASE_DURABILITY[type.getEquipmentSlot().getEntitySlotId()] * 40; + } + + @Override + public int getProtection(ArmorItem.Type type) { + return PROTECTION[type.getEquipmentSlot().getEntitySlotId()]; + } + + @Override + public int getEnchantability() { + return 18; + } + + @Override + public SoundEvent getEquipSound() { + return SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(Szar.NIGGERITE_INGOT); + } + + @Override + public String getName() { + return "mythril"; + } + + @Override + public float getToughness() { + return 3.5F; + } + + @Override + public float getKnockbackResistance() { + return 0.15F; + } +} diff --git a/src/main/java/dev/tggamesyt/szar/NiggeriteMaterial.java b/src/main/java/dev/tggamesyt/szar/NiggeriteMaterial.java new file mode 100644 index 0000000..66d294f --- /dev/null +++ b/src/main/java/dev/tggamesyt/szar/NiggeriteMaterial.java @@ -0,0 +1,40 @@ +package dev.tggamesyt.szar; + +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; + +public class NiggeriteMaterial implements ToolMaterial { + + public static final NiggeriteMaterial INSTANCE = new NiggeriteMaterial(); + + @Override + public int getDurability() { + return 2500; // Netherite is 2031 + } + + @Override + public float getMiningSpeedMultiplier() { + return 10.0F; // Netherite is 9 + } + + @Override + public float getAttackDamage() { + return 4.5F; + } + + @Override + public int getMiningLevel() { + return 4; // Netherite level + } + + @Override + public int getEnchantability() { + return 18; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(Szar.NIGGERITE_INGOT); + } +} + diff --git a/src/main/java/dev/tggamesyt/szar/Szar.java b/src/main/java/dev/tggamesyt/szar/Szar.java index 5cdbb17..87e6f18 100644 --- a/src/main/java/dev/tggamesyt/szar/Szar.java +++ b/src/main/java/dev/tggamesyt/szar/Szar.java @@ -2,6 +2,7 @@ package dev.tggamesyt.szar; import dev.tggamesyt.szar.items.Joint; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.fabricmc.fabric.api.message.v1.ServerMessageDecoratorEvent; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -51,6 +52,16 @@ public class Szar implements ModInitializer { entries.add(Szar.CANNABIS_ITEM); entries.add(Szar.WEED_ITEM); entries.add(Szar.WEED_JOINT_ITEM); + entries.add(Szar.NIGGERITE_INGOT); + entries.add(Szar.NIGGERITE_SWORD); + entries.add(Szar.NIGGERITE_AXE); + entries.add(Szar.NIGGERITE_PICKAXE); + entries.add(Szar.NIGGERITE_SHOVEL); + entries.add(Szar.NIGGERITE_HOE); + entries.add(Szar.NIGGERITE_HELMET); + entries.add(Szar.NIGGERITE_CHESTPLATE); + entries.add(Szar.NIGGERITE_LEGGINGS); + entries.add(Szar.NIGGERITE_BOOTS); }) .build() ); @@ -100,6 +111,97 @@ public class Szar implements ModInitializer { new Item.Settings() ) ); + public static final Item NIGGERITE_INGOT = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_ingot"), + new Item(new FabricItemSettings().fireproof()) + ); + public static final Item NIGGERITE_SWORD = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_sword"), + new SwordItem( + NiggeriteMaterial.INSTANCE, + 4, + -2.4F, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_AXE = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_axe"), + new AxeItem( + NiggeriteMaterial.INSTANCE, + 4, + -2.4F, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_PICKAXE = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_pickaxe"), + new PickaxeItem( + NiggeriteMaterial.INSTANCE, + 4, + -2.4F, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_HOE = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_hoe"), + new HoeItem( + NiggeriteMaterial.INSTANCE, + 4, + -2.4F, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_SHOVEL = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_shovel"), + new ShovelItem( + NiggeriteMaterial.INSTANCE, + 4, + -2.4F, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_HELMET = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_helmet"), + new ArmorItem( + NiggeriteArmorMaterial.INSTANCE, + ArmorItem.Type.HELMET, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_CHESTPLATE = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_chestplate"), + new ArmorItem( + NiggeriteArmorMaterial.INSTANCE, + ArmorItem.Type.CHESTPLATE, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_LEGGINGS = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_leggings"), + new ArmorItem( + NiggeriteArmorMaterial.INSTANCE, + ArmorItem.Type.LEGGINGS, + new FabricItemSettings().fireproof() + ) + ); + public static final Item NIGGERITE_BOOTS = Registry.register( + Registries.ITEM, + new Identifier(MOD_ID, "niggerite_boots"), + new ArmorItem( + NiggeriteArmorMaterial.INSTANCE, + ArmorItem.Type.BOOTS, + new FabricItemSettings().fireproof() + ) + ); public static final Item WEED_ITEM = Registry.register( Registries.ITEM, new Identifier(MOD_ID, "weed"), diff --git a/src/main/resources/assets/szar/models/item/niggerite_axe.json b/src/main/resources/assets/szar/models/item/niggerite_axe.json new file mode 100644 index 0000000..de2451f --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "szar:item/niggerite_axe" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_boots.json b/src/main/resources/assets/szar/models/item/niggerite_boots.json new file mode 100644 index 0000000..7664c9a --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/niggerite_boots" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_chestplate.json b/src/main/resources/assets/szar/models/item/niggerite_chestplate.json new file mode 100644 index 0000000..0ca5865 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/niggerite_chestplate" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_helmet.json b/src/main/resources/assets/szar/models/item/niggerite_helmet.json new file mode 100644 index 0000000..cacca1b --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/niggerite_helmet" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_hoe.json b/src/main/resources/assets/szar/models/item/niggerite_hoe.json new file mode 100644 index 0000000..1de0c9b --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "szar:item/niggerite_hoe" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_ingot.json b/src/main/resources/assets/szar/models/item/niggerite_ingot.json new file mode 100644 index 0000000..c84f85d --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/niggerite_ingot" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_leggings.json b/src/main/resources/assets/szar/models/item/niggerite_leggings.json new file mode 100644 index 0000000..bc270c4 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "szar:item/niggerite_leggings" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_pickaxe.json b/src/main/resources/assets/szar/models/item/niggerite_pickaxe.json new file mode 100644 index 0000000..6c1a43d --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "szar:item/niggerite_pickaxe" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_shovel.json b/src/main/resources/assets/szar/models/item/niggerite_shovel.json new file mode 100644 index 0000000..485eaae --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "szar:item/niggerite_shovel" + } +} diff --git a/src/main/resources/assets/szar/models/item/niggerite_sword.json b/src/main/resources/assets/szar/models/item/niggerite_sword.json new file mode 100644 index 0000000..9c40a52 --- /dev/null +++ b/src/main/resources/assets/szar/models/item/niggerite_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "szar:item/niggerite_sword" + } +} diff --git a/src/main/resources/assets/szar/models/item/weed_joint.json b/src/main/resources/assets/szar/models/item/weed_joint.json index 66ba92d..868199c 100644 --- a/src/main/resources/assets/szar/models/item/weed_joint.json +++ b/src/main/resources/assets/szar/models/item/weed_joint.json @@ -1,16 +1,32 @@ { - "parent": "item/generated", - "textures": { - "layer0": "szar:item/weed_joint" - }, - "overrides": [ - { - "predicate": { "held": 1 }, - "model": "szar:item/weed_joint_3d" - }, - { - "predicate": { "using": 1 }, - "model": "szar:item/weed_joint_held" - } - ] -} + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "textures": { + "0": "szar:item/joint3d", + "particle": "szar:item/joint3d" + }, + "elements": [ + { + "from": [7, 0, 7], + "to": [9, 12, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "east": {"uv": [2, 0, 4, 12], "texture": "#0"}, + "south": {"uv": [4, 0, 6, 12], "texture": "#0"}, + "west": {"uv": [6, 0, 8, 12], "texture": "#0"}, + "up": {"uv": [10, 2, 8, 0], "texture": "#0"}, + "down": {"uv": [10, 2, 8, 4], "texture": "#0"} + } + } + ], + "overrides": [ + { + "predicate": { + "using": 1 + }, + "model": "szar:item/weed_joint_held" + } + ], + "display": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/szar/models/item/weed_joint_3d.json b/src/main/resources/assets/szar/models/item/weed_joint_3d.json deleted file mode 100644 index 868199c..0000000 --- a/src/main/resources/assets/szar/models/item/weed_joint_3d.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "format_version": "1.9.0", - "credit": "Made with Blockbench", - "textures": { - "0": "szar:item/joint3d", - "particle": "szar:item/joint3d" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 12, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, - "faces": { - "north": {"uv": [0, 0, 2, 12], "texture": "#0"}, - "east": {"uv": [2, 0, 4, 12], "texture": "#0"}, - "south": {"uv": [4, 0, 6, 12], "texture": "#0"}, - "west": {"uv": [6, 0, 8, 12], "texture": "#0"}, - "up": {"uv": [10, 2, 8, 0], "texture": "#0"}, - "down": {"uv": [10, 2, 8, 4], "texture": "#0"} - } - } - ], - "overrides": [ - { - "predicate": { - "using": 1 - }, - "model": "szar:item/weed_joint_held" - } - ], - "display": {} -} \ No newline at end of file diff --git a/src/main/resources/assets/szar/models/item/weed_join_held.json b/src/main/resources/assets/szar/models/item/weed_joint_ahh.json similarity index 100% rename from src/main/resources/assets/szar/models/item/weed_join_held.json rename to src/main/resources/assets/szar/models/item/weed_joint_ahh.json diff --git a/src/main/resources/assets/szar/models/item/weed_joint_idk.json b/src/main/resources/assets/szar/models/item/weed_joint_idk.json new file mode 100644 index 0000000..66ba92d --- /dev/null +++ b/src/main/resources/assets/szar/models/item/weed_joint_idk.json @@ -0,0 +1,16 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "szar:item/weed_joint" + }, + "overrides": [ + { + "predicate": { "held": 1 }, + "model": "szar:item/weed_joint_3d" + }, + { + "predicate": { "using": 1 }, + "model": "szar:item/weed_joint_held" + } + ] +} diff --git a/src/main/resources/assets/szar/textures/item/niggerite_axe.png b/src/main/resources/assets/szar/textures/item/niggerite_axe.png new file mode 100644 index 0000000..322bf45 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_axe.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_block.png b/src/main/resources/assets/szar/textures/item/niggerite_block.png new file mode 100644 index 0000000..fa92917 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_block.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_boots.png b/src/main/resources/assets/szar/textures/item/niggerite_boots.png new file mode 100644 index 0000000..ec4183e Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_boots.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_chestplate.png b/src/main/resources/assets/szar/textures/item/niggerite_chestplate.png new file mode 100644 index 0000000..f2f0ad5 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_chestplate.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_helmet.png b/src/main/resources/assets/szar/textures/item/niggerite_helmet.png new file mode 100644 index 0000000..17bf7f8 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_helmet.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_hoe.png b/src/main/resources/assets/szar/textures/item/niggerite_hoe.png new file mode 100644 index 0000000..b41b1ee Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_hoe.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_ingot.png b/src/main/resources/assets/szar/textures/item/niggerite_ingot.png new file mode 100644 index 0000000..90aab05 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_ingot.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_leggings.png b/src/main/resources/assets/szar/textures/item/niggerite_leggings.png new file mode 100644 index 0000000..af45363 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_leggings.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_pickaxe.png b/src/main/resources/assets/szar/textures/item/niggerite_pickaxe.png new file mode 100644 index 0000000..088283b Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_pickaxe.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_shovel.png b/src/main/resources/assets/szar/textures/item/niggerite_shovel.png new file mode 100644 index 0000000..0cbaf61 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_shovel.png differ diff --git a/src/main/resources/assets/szar/textures/item/niggerite_sword.png b/src/main/resources/assets/szar/textures/item/niggerite_sword.png new file mode 100644 index 0000000..4bc0809 Binary files /dev/null and b/src/main/resources/assets/szar/textures/item/niggerite_sword.png differ