diff --git a/gradle.properties b/gradle.properties index f76c622..b37cb2c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21.7+build.2 loader_version=0.16.14 # Mod Properties -mod_version=1.21.7.3 +mod_version=1.21.7.4 maven_group=de.jottyfan.quickiemod archives_base_name=quickiemod diff --git a/src/main/java/de/jottyfan/quickiemod/item/ArmorStack.java b/src/main/java/de/jottyfan/quickiemod/item/ArmorStack.java new file mode 100644 index 0000000..32c2cb9 --- /dev/null +++ b/src/main/java/de/jottyfan/quickiemod/item/ArmorStack.java @@ -0,0 +1,21 @@ +package de.jottyfan.quickiemod.item; + +import net.minecraft.item.Item; +import net.minecraft.item.equipment.EquipmentType; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +/** + * + * @author jotty + * + */ +public class ArmorStack extends Item { + + public ArmorStack(Identifier identifier, EquipmentType type) { + super(new Item.Settings().maxCount(1).useItemPrefixedTranslationKey() + .registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier)) + .armor(ModArmorMaterials.TURQUOISE_ARMOR_MATERIAL, type)); + } +} diff --git a/src/main/java/de/jottyfan/quickiemod/item/ModArmorMaterials.java b/src/main/java/de/jottyfan/quickiemod/item/ModArmorMaterials.java new file mode 100644 index 0000000..bd49444 --- /dev/null +++ b/src/main/java/de/jottyfan/quickiemod/item/ModArmorMaterials.java @@ -0,0 +1,31 @@ +package de.jottyfan.quickiemod.item; + +import java.util.EnumMap; + +import de.jottyfan.quickiemod.Quickiemod; +import net.minecraft.item.equipment.ArmorMaterial; +import net.minecraft.item.equipment.EquipmentAsset; +import net.minecraft.item.equipment.EquipmentType; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Identifier; +import net.minecraft.util.Util; + +/** + * + * @author jotty + * + */ +public class ModArmorMaterials { + static RegistryKey> REGISTRY_KEY = RegistryKey.ofRegistry(Identifier.ofVanilla("equipment_asset")); + public static final RegistryKey TURQUOISE_KEY = RegistryKey.of(REGISTRY_KEY, Identifier.of(Quickiemod.MOD_ID, "turquoise")); + + public static final ArmorMaterial TURQUOISE_ARMOR_MATERIAL = new ArmorMaterial(500, Util.make(new EnumMap<>(EquipmentType.class), map -> { + map.put(EquipmentType.BOOTS, 4); + map.put(EquipmentType.LEGGINGS, 8); + map.put(EquipmentType.CHESTPLATE, 15); + map.put(EquipmentType.HELMET, 4); + map.put(EquipmentType.BODY, 8); + }), 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0, 0, null, TURQUOISE_KEY); +} diff --git a/src/main/java/de/jottyfan/quickiemod/item/ModItems.java b/src/main/java/de/jottyfan/quickiemod/item/ModItems.java index 1b86097..7b18570 100644 --- a/src/main/java/de/jottyfan/quickiemod/item/ModItems.java +++ b/src/main/java/de/jottyfan/quickiemod/item/ModItems.java @@ -6,6 +6,7 @@ import java.util.List; import de.jottyfan.quickiemod.Quickiemod; import de.jottyfan.quickiemod.identifier.ModIdentifiers; import net.minecraft.item.Item; +import net.minecraft.item.equipment.EquipmentType; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; @@ -64,14 +65,15 @@ public class ModItems { new Item64Stack(ModIdentifiers.ITEM_RAWTURQUOISE)); public static final Item ITEM_TURQUOISEINGOT = registerItem(ModIdentifiers.ITEM_TURQUOISEINGOT, new Item64Stack(ModIdentifiers.ITEM_TURQUOISEINGOT)); - public static final Item ITEM_TURQUOISE_BOOTS = registerItem(ModIdentifiers.ITEM_TURQUOISE_BOOTS, - new Item64Stack(ModIdentifiers.ITEM_TURQUOISE_BOOTS)); - public static final Item ITEM_TURQUOISE_HELMET = registerItem(ModIdentifiers.ITEM_TURQUOISE_HELMET, - new Item64Stack(ModIdentifiers.ITEM_TURQUOISE_HELMET)); - public static final Item ITEM_TURQUOISE_LEGGINGS = registerItem(ModIdentifiers.ITEM_TURQUOISE_LEGGINGS, - new Item64Stack(ModIdentifiers.ITEM_TURQUOISE_LEGGINGS)); - public static final Item ITEM_TURQUOISE_CHESTPLATE = registerItem(ModIdentifiers.ITEM_TURQUOISE_CHESTPLATE, - new Item64Stack(ModIdentifiers.ITEM_TURQUOISE_CHESTPLATE)); + + public static final Item ARMOR_TURQUOISE_BOOTS = registerArmorItem(ModIdentifiers.ITEM_TURQUOISE_BOOTS, + new ArmorStack(ModIdentifiers.ITEM_TURQUOISE_BOOTS, EquipmentType.BOOTS)); + public static final Item ARMOR_TURQUOISE_HELMET = registerArmorItem(ModIdentifiers.ITEM_TURQUOISE_HELMET, + new ArmorStack(ModIdentifiers.ITEM_TURQUOISE_HELMET, EquipmentType.HELMET)); + public static final Item ARMOR_TURQUOISE_LEGGINGS = registerArmorItem(ModIdentifiers.ITEM_TURQUOISE_LEGGINGS, + new ArmorStack(ModIdentifiers.ITEM_TURQUOISE_LEGGINGS, EquipmentType.LEGGINGS)); + public static final Item ARMOR_TURQUOISE_CHESTPLATE = registerArmorItem(ModIdentifiers.ITEM_TURQUOISE_CHESTPLATE, + new ArmorStack(ModIdentifiers.ITEM_TURQUOISE_CHESTPLATE, EquipmentType.CHESTPLATE)); public static final Item TOOL_SPEEDPOWDERAXE = registerItem(ModIdentifiers.TOOL_SPEEDPOWDERAXE, new ToolSpeedpowderAxe(ModIdentifiers.TOOL_SPEEDPOWDERAXE)); @@ -102,6 +104,11 @@ public class ModItems { return Registry.register(Registries.ITEM, identifier, item); } + private static final Item registerArmorItem(Identifier identifier, Item item) { + + return Registry.register(Registries.ITEM, identifier, item); + } + public static final List registerModItems() { Quickiemod.LOGGER.debug(String.format("registering item %s", Quickiemod.MOD_ID)); @@ -128,10 +135,11 @@ public class ModItems { items.add(ITEM_COPPERSTUB); items.add(ITEM_RAWTURQUOISE); items.add(ITEM_TURQUOISEINGOT); - items.add(ITEM_TURQUOISE_BOOTS); - items.add(ITEM_TURQUOISE_HELMET); - items.add(ITEM_TURQUOISE_LEGGINGS); - items.add(ITEM_TURQUOISE_CHESTPLATE); + + items.add(ARMOR_TURQUOISE_BOOTS); + items.add(ARMOR_TURQUOISE_HELMET); + items.add(ARMOR_TURQUOISE_LEGGINGS); + items.add(ARMOR_TURQUOISE_CHESTPLATE); items.add(TOOL_SPEEDPOWDERPICKAXE); items.add(TOOL_SPEEDPOWDERAXE); diff --git a/src/main/resources/assets/quickiemod/equipment/turquoise.json b/src/main/resources/assets/quickiemod/equipment/turquoise.json new file mode 100644 index 0000000..488e117 --- /dev/null +++ b/src/main/resources/assets/quickiemod/equipment/turquoise.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "quickiemod:turquoise" + } + ], + "humanoid_leggings": [ + { + "texture": "quickiemod:turquoise" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/textures/entity/equipment/humanoid/turquoise.png b/src/main/resources/assets/quickiemod/textures/entity/equipment/humanoid/turquoise.png new file mode 100644 index 0000000..0b5dede Binary files /dev/null and b/src/main/resources/assets/quickiemod/textures/entity/equipment/humanoid/turquoise.png differ diff --git a/src/main/resources/assets/quickiemod/textures/entity/equipment/humanoid_leggings/turquoise.png b/src/main/resources/assets/quickiemod/textures/entity/equipment/humanoid_leggings/turquoise.png new file mode 100644 index 0000000..6b6e5dc Binary files /dev/null and b/src/main/resources/assets/quickiemod/textures/entity/equipment/humanoid_leggings/turquoise.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/turquoise_boots.png b/src/main/resources/assets/quickiemod/textures/item/turquoise_boots.png index edc2216..1940f6f 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/turquoise_boots.png and b/src/main/resources/assets/quickiemod/textures/item/turquoise_boots.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/turquoise_chestplate.png b/src/main/resources/assets/quickiemod/textures/item/turquoise_chestplate.png index f146433..f704ead 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/turquoise_chestplate.png and b/src/main/resources/assets/quickiemod/textures/item/turquoise_chestplate.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/turquoise_helmet.png b/src/main/resources/assets/quickiemod/textures/item/turquoise_helmet.png index b597925..315c12e 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/turquoise_helmet.png and b/src/main/resources/assets/quickiemod/textures/item/turquoise_helmet.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/turquoise_leggings.png b/src/main/resources/assets/quickiemod/textures/item/turquoise_leggings.png index 2c0a255..0b1a064 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/turquoise_leggings.png and b/src/main/resources/assets/quickiemod/textures/item/turquoise_leggings.png differ