diff --git a/common/src/main/java/net/sweenus/simplyswords/compat/AdvancedNetheriteCompat.java b/common/src/main/java/net/sweenus/simplyswords/compat/AdvancedNetheriteCompat.java new file mode 100644 index 00000000..a17f00be --- /dev/null +++ b/common/src/main/java/net/sweenus/simplyswords/compat/AdvancedNetheriteCompat.java @@ -0,0 +1,343 @@ +package net.sweenus.simplyswords.compat; + +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.sweenus.simplyswords.SimplySwords; +import net.sweenus.simplyswords.config.Config; +import net.sweenus.simplyswords.config.ConfigDefaultValues; +import net.sweenus.simplyswords.item.*; + +public class AdvancedNetheriteCompat { + + //Compat for Advanced Netherite + static float longsword_positive_modifier = Config.getFloat("longsword_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.longsword_positiveDamageModifier); + static float twinblade_positive_modifier = Config.getFloat("twinblade_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.twinblade_positiveDamageModifier); + static float rapier_positive_modifier = Config.getFloat("rapier_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.rapier_positiveDamageModifier); + static float katana_positive_modifier = Config.getFloat("katana_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.katana_positiveDamageModifier); + static float sai_positive_modifier = Config.getFloat("sai_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.sai_positiveDamageModifier); + static float spear_positive_modifier = Config.getFloat("spear_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.spear_positiveDamageModifier); + static float glaive_positive_modifier = Config.getFloat("glaive_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.glaive_positiveDamageModifier); + static float warglaive_positive_modifier = Config.getFloat("warglaive_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.warglaive_positiveDamageModifier); + static float cutlass_positive_modifier = Config.getFloat("cutlass_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.cutlass_positiveDamageModifier); + static float claymore_positive_modifier = Config.getFloat("claymore_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.claymore_positiveDamageModifier); + static float greataxe_positive_modifier = Config.getFloat("greataxe_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.greataxe_positiveDamageModifier); + static float greathammer_positive_modifier = Config.getFloat("greathammer_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.greathammer_positiveDamageModifier); + static float chakram_positive_modifier = Config.getFloat("chakram_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.chakram_positiveDamageModifier); + static float scythe_positive_modifier = Config.getFloat("scythe_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.scythe_positiveDamageModifier); + static float halberd_positive_modifier = Config.getFloat("halberd_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.halberd_positiveDamageModifier); + + static float longsword_negative_modifier = Config.getFloat("longsword_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.longsword_negativeDamageModifier); + static float twinblade_negative_modifier = Config.getFloat("twinblade_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.twinblade_negativeDamageModifier); + static float rapier_negative_modifier = Config.getFloat("rapier_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.rapier_negativeDamageModifier); + static float sai_negative_modifier = Config.getFloat("sai_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.sai_negativeDamageModifier); + static float spear_negative_modifier = Config.getFloat("spear_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.spear_negativeDamageModifier); + static float katana_negative_modifier = Config.getFloat("katana_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.katana_negativeDamageModifier); + static float glaive_negative_modifier = Config.getFloat("glaive_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.glaive_negativeDamageModifier); + static float warglaive_negative_modifier = Config.getFloat("warglaive_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.warglaive_negativeDamageModifier); + static float cutlass_negative_modifier = Config.getFloat("cutlass_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.cutlass_negativeDamageModifier); + static float claymore_negative_modifier = Config.getFloat("claymore_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.claymore_negativeDamageModifier); + static float greataxe_negative_modifier = Config.getFloat("greataxe_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.greataxe_negativeDamageModifier); + static float greathammer_negative_modifier = Config.getFloat("greathammer_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.greathammer_negativeDamageModifier); + static float chakram_negative_modifier = Config.getFloat("chakram_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.chakram_negativeDamageModifier); + static float scythe_negative_modifier = Config.getFloat("scythe_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.scythe_negativeDamageModifier); + static float halberd_negative_modifier = Config.getFloat("halberd_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.halberd_negativeDamageModifier); + + static float longsword_attackspeed = Config.getFloat("longsword_attackSpeed", "WeaponAttributes", ConfigDefaultValues.longsword_attackSpeed); + static float twinblade_attackspeed = Config.getFloat("twinblade_attackSpeed", "WeaponAttributes", ConfigDefaultValues.twinblade_attackSpeed); + static float rapier_attackspeed = Config.getFloat("rapier_attackSpeed", "WeaponAttributes", ConfigDefaultValues.rapier_attackSpeed); + static float sai_attackspeed = Config.getFloat("sai_attackSpeed", "WeaponAttributes", ConfigDefaultValues.sai_attackSpeed); + static float spear_attackspeed = Config.getFloat("spear_attackSpeed", "WeaponAttributes", ConfigDefaultValues.spear_attackSpeed); + static float katana_attackspeed = Config.getFloat("katana_attackSpeed", "WeaponAttributes", ConfigDefaultValues.katana_attackSpeed); + static float glaive_attackspeed = Config.getFloat("glaive_attackSpeed", "WeaponAttributes", ConfigDefaultValues.glaive_attackSpeed); + static float warglaive_attackspeed = Config.getFloat("warglaive_attackSpeed", "WeaponAttributes", ConfigDefaultValues.warglaive_attackSpeed); + static float cutlass_attackspeed = Config.getFloat("cutlass_attackSpeed", "WeaponAttributes", ConfigDefaultValues.cutlass_attackSpeed); + static float claymore_attackspeed = Config.getFloat("claymore_attackSpeed", "WeaponAttributes", ConfigDefaultValues.claymore_attackSpeed); + static float greataxe_attackspeed = Config.getFloat("greataxe_attackSpeed", "WeaponAttributes", ConfigDefaultValues.greataxe_attackSpeed); + static float greathammer_attackspeed = Config.getFloat("greathammer_attackSpeed", "WeaponAttributes", ConfigDefaultValues.greathammer_attackSpeed); + static float chakram_attackspeed = Config.getFloat("chakram_attackSpeed", "WeaponAttributes", ConfigDefaultValues.chakram_attackSpeed); + static float scythe_attackspeed = Config.getFloat("scythe_attackSpeed", "WeaponAttributes", ConfigDefaultValues.scythe_attackSpeed); + static float halberd_attackspeed = Config.getFloat("halberd_attackSpeed", "WeaponAttributes", ConfigDefaultValues.halberd_attackSpeed); + + static int longsword_modifier = (int) (longsword_positive_modifier - longsword_negative_modifier); + static int twinblade_modifier = (int) (twinblade_positive_modifier - twinblade_negative_modifier); + static int rapier_modifier = (int) (rapier_positive_modifier - rapier_negative_modifier); + static int sai_modifier = (int) (sai_positive_modifier - sai_negative_modifier); + static int spear_modifier = (int) (spear_positive_modifier - spear_negative_modifier); + static int katana_modifier = (int) (katana_positive_modifier - katana_negative_modifier); + static int glaive_modifier = (int) (glaive_positive_modifier - glaive_negative_modifier); + static int warglaive_modifier = (int) (warglaive_positive_modifier - warglaive_negative_modifier); + static int cutlass_modifier = (int) (cutlass_positive_modifier - cutlass_negative_modifier); + static int chakram_modifier = (int) (chakram_positive_modifier - chakram_negative_modifier); + static int scythe_modifier = (int) (scythe_positive_modifier - scythe_negative_modifier); + static int claymore_modifier = (int) (claymore_positive_modifier - claymore_negative_modifier); + static int greathammer_modifier = (int) (greathammer_positive_modifier - greathammer_negative_modifier); + static int greataxe_modifier = (int) (greataxe_positive_modifier - greataxe_negative_modifier); + static int halberd_modifier = (int) (halberd_positive_modifier - halberd_negative_modifier); + + static int netherite_iron_modifier = (int) Config.getFloat("netherite_iron_damageModifier", "WeaponAttributes", ConfigDefaultValues.netheriteIron_damageModifier); + static int netherite_gold_modifier = (int) Config.getFloat("netherite_gold_damageModifier", "WeaponAttributes", ConfigDefaultValues.netheriteGold_damageModifier); + static int netherite_emerald_modifier = (int) Config.getFloat("netherite_emerald_damageModifier", "WeaponAttributes", ConfigDefaultValues.netheriteEmerald_damageModifier); + static int netherite_diamond_modifier = (int) Config.getFloat("netherite_diamond_damageModifier", "WeaponAttributes", ConfigDefaultValues.netheriteDiamond_damageModifier); + + + //Netherite-Iron + public static final Item NETHERITE_IRON_LONGSWORD = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_longsword", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + longsword_modifier, longsword_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_TWINBLADE = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_twinblade", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + twinblade_modifier, twinblade_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_RAPIER = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_rapier", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + rapier_modifier, rapier_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_KATANA = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_katana", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + katana_modifier, katana_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_SAI = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_sai", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + sai_modifier, sai_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_SPEAR = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_spear", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + spear_modifier, spear_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_GLAIVE = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_glaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + glaive_modifier, glaive_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_WARGLAIVE = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_warglaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + warglaive_modifier, warglaive_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_CUTLASS = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_cutlass", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + cutlass_modifier, cutlass_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_CLAYMORE = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_claymore", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + claymore_modifier, claymore_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_GREATHAMMER = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_greathammer", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + greathammer_modifier, greathammer_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_GREATAXE = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_greataxe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + greataxe_modifier, greataxe_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_CHAKRAM = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_chakram", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + chakram_modifier, chakram_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_SCYTHE = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_scythe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + scythe_modifier, scythe_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + public static final Item NETHERITE_IRON_HALBERD = registerItem( "advanced_netherite_compat/netherite_iron/netherite_iron_halberd", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_IRON, netherite_iron_modifier + halberd_modifier, halberd_attackspeed, + "advancednetherite:netherite_iron_ingot")); + + + //Netherite-Gold + public static final Item NETHERITE_GOLD_LONGSWORD = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_longsword", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + longsword_modifier, longsword_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_TWINBLADE = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_twinblade", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + twinblade_modifier, twinblade_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_RAPIER = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_rapier", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + rapier_modifier, rapier_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_KATANA = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_katana", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + katana_modifier, katana_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_SAI = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_sai", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + sai_modifier, sai_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_SPEAR = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_spear", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + spear_modifier, spear_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_GLAIVE = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_glaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + glaive_modifier, glaive_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_WARGLAIVE = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_warglaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + warglaive_modifier, warglaive_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_CUTLASS = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_cutlass", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + cutlass_modifier, cutlass_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_CLAYMORE = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_claymore", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + claymore_modifier, claymore_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_GREATHAMMER = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_greathammer", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + greathammer_modifier, greathammer_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_GREATAXE = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_greataxe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + greataxe_modifier, greataxe_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_CHAKRAM = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_chakram", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + chakram_modifier, chakram_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_SCYTHE = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_scythe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + scythe_modifier, scythe_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + public static final Item NETHERITE_GOLD_HALBERD = registerItem( "advanced_netherite_compat/netherite_gold/netherite_gold_halberd", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_GOLD, netherite_gold_modifier + halberd_modifier, halberd_attackspeed, + "advancednetherite:netherite_gold_ingot")); + + + //Netherite-Emerald + public static final Item NETHERITE_EMERALD_LONGSWORD = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_longsword", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + longsword_modifier, longsword_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_TWINBLADE = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_twinblade", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + twinblade_modifier, twinblade_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_RAPIER = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_rapier", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + rapier_modifier, rapier_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_KATANA = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_katana", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + katana_modifier, katana_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_SAI = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_sai", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + sai_modifier, sai_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_SPEAR = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_spear", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + spear_modifier, spear_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_GLAIVE = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_glaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + glaive_modifier, glaive_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_WARGLAIVE = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_warglaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + warglaive_modifier, warglaive_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_CUTLASS = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_cutlass", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + cutlass_modifier, cutlass_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_CLAYMORE = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_claymore", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + claymore_modifier, claymore_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_GREATHAMMER = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_greathammer", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + greathammer_modifier, greathammer_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_GREATAXE = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_greataxe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + greataxe_modifier, greataxe_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_CHAKRAM = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_chakram", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + chakram_modifier, chakram_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_SCYTHE = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_scythe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + scythe_modifier, scythe_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + public static final Item NETHERITE_EMERALD_HALBERD = registerItem( "advanced_netherite_compat/netherite_emerald/netherite_emerald_halberd", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_EMERALD, netherite_emerald_modifier + halberd_modifier, halberd_attackspeed, + "advancednetherite:netherite_emerald_ingot")); + + + //Netherite-Diamond + public static final Item NETHERITE_DIAMOND_LONGSWORD = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_longsword", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + longsword_modifier, longsword_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_TWINBLADE = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_twinblade", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + twinblade_modifier, twinblade_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_RAPIER = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_rapier", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + rapier_modifier, rapier_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_KATANA = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_katana", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + katana_modifier, katana_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_SAI = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_sai", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + sai_modifier, sai_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_SPEAR = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_spear", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + spear_modifier, spear_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_GLAIVE = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_glaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + glaive_modifier, glaive_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_WARGLAIVE = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_warglaive", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + warglaive_modifier, warglaive_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_CUTLASS = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_cutlass", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + cutlass_modifier, cutlass_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_CLAYMORE = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_claymore", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + claymore_modifier, claymore_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_GREATHAMMER = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_greathammer", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + greathammer_modifier, greathammer_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_GREATAXE = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_greataxe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + greataxe_modifier, greataxe_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_CHAKRAM = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_chakram", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + chakram_modifier, chakram_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_SCYTHE = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_scythe", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + scythe_modifier, scythe_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + public static final Item NETHERITE_DIAMOND_HALBERD = registerItem( "advanced_netherite_compat/netherite_diamond/netherite_diamond_halberd", + new AdvancedNetheriteSwordItem(ModToolMaterial.NETHERITE_DIAMOND, netherite_diamond_modifier + halberd_modifier, halberd_attackspeed, + "advancednetherite:netherite_diamond_ingot")); + + + private static Item registerItem(String name, Item item) { + return Registry.register(Registries.ITEM, new Identifier(SimplySwords.MOD_ID, name), item); + } + + + + public static void registerModItems() { + SimplySwords.LOGGER.info("Registering Advanced Netherite compat Items for " + SimplySwords.MOD_ID); + } + +} diff --git a/common/src/main/java/net/sweenus/simplyswords/compat/DragonLootCompat.java b/common/src/main/java/net/sweenus/simplyswords/compat/DragonLootCompat.java new file mode 100644 index 00000000..20b28d24 --- /dev/null +++ b/common/src/main/java/net/sweenus/simplyswords/compat/DragonLootCompat.java @@ -0,0 +1,154 @@ +package net.sweenus.simplyswords.compat; + +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.sweenus.simplyswords.SimplySwords; +import net.sweenus.simplyswords.config.Config; +import net.sweenus.simplyswords.config.ConfigDefaultValues; +import net.sweenus.simplyswords.item.*; + +public class DragonLootCompat { + + //Compat for Advanced Netherite + static float longsword_positive_modifier = Config.getFloat("longsword_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.longsword_positiveDamageModifier); + static float twinblade_positive_modifier = Config.getFloat("twinblade_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.twinblade_positiveDamageModifier); + static float rapier_positive_modifier = Config.getFloat("rapier_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.rapier_positiveDamageModifier); + static float katana_positive_modifier = Config.getFloat("katana_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.katana_positiveDamageModifier); + static float sai_positive_modifier = Config.getFloat("sai_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.sai_positiveDamageModifier); + static float spear_positive_modifier = Config.getFloat("spear_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.spear_positiveDamageModifier); + static float glaive_positive_modifier = Config.getFloat("glaive_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.glaive_positiveDamageModifier); + static float warglaive_positive_modifier = Config.getFloat("warglaive_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.warglaive_positiveDamageModifier); + static float cutlass_positive_modifier = Config.getFloat("cutlass_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.cutlass_positiveDamageModifier); + static float claymore_positive_modifier = Config.getFloat("claymore_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.claymore_positiveDamageModifier); + static float greataxe_positive_modifier = Config.getFloat("greataxe_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.greataxe_positiveDamageModifier); + static float greathammer_positive_modifier = Config.getFloat("greathammer_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.greathammer_positiveDamageModifier); + static float chakram_positive_modifier = Config.getFloat("chakram_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.chakram_positiveDamageModifier); + static float scythe_positive_modifier = Config.getFloat("scythe_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.scythe_positiveDamageModifier); + static float halberd_positive_modifier = Config.getFloat("halberd_positiveDamageModifier", "WeaponAttributes", ConfigDefaultValues.halberd_positiveDamageModifier); + + static float longsword_negative_modifier = Config.getFloat("longsword_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.longsword_negativeDamageModifier); + static float twinblade_negative_modifier = Config.getFloat("twinblade_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.twinblade_negativeDamageModifier); + static float rapier_negative_modifier = Config.getFloat("rapier_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.rapier_negativeDamageModifier); + static float sai_negative_modifier = Config.getFloat("sai_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.sai_negativeDamageModifier); + static float spear_negative_modifier = Config.getFloat("spear_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.spear_negativeDamageModifier); + static float katana_negative_modifier = Config.getFloat("katana_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.katana_negativeDamageModifier); + static float glaive_negative_modifier = Config.getFloat("glaive_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.glaive_negativeDamageModifier); + static float warglaive_negative_modifier = Config.getFloat("warglaive_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.warglaive_negativeDamageModifier); + static float cutlass_negative_modifier = Config.getFloat("cutlass_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.cutlass_negativeDamageModifier); + static float claymore_negative_modifier = Config.getFloat("claymore_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.claymore_negativeDamageModifier); + static float greataxe_negative_modifier = Config.getFloat("greataxe_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.greataxe_negativeDamageModifier); + static float greathammer_negative_modifier = Config.getFloat("greathammer_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.greathammer_negativeDamageModifier); + static float chakram_negative_modifier = Config.getFloat("chakram_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.chakram_negativeDamageModifier); + static float scythe_negative_modifier = Config.getFloat("scythe_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.scythe_negativeDamageModifier); + static float halberd_negative_modifier = Config.getFloat("halberd_negativeDamageModifier", "WeaponAttributes", ConfigDefaultValues.halberd_negativeDamageModifier); + + static float longsword_attackspeed = Config.getFloat("longsword_attackSpeed", "WeaponAttributes", ConfigDefaultValues.longsword_attackSpeed); + static float twinblade_attackspeed = Config.getFloat("twinblade_attackSpeed", "WeaponAttributes", ConfigDefaultValues.twinblade_attackSpeed); + static float rapier_attackspeed = Config.getFloat("rapier_attackSpeed", "WeaponAttributes", ConfigDefaultValues.rapier_attackSpeed); + static float sai_attackspeed = Config.getFloat("sai_attackSpeed", "WeaponAttributes", ConfigDefaultValues.sai_attackSpeed); + static float spear_attackspeed = Config.getFloat("spear_attackSpeed", "WeaponAttributes", ConfigDefaultValues.spear_attackSpeed); + static float katana_attackspeed = Config.getFloat("katana_attackSpeed", "WeaponAttributes", ConfigDefaultValues.katana_attackSpeed); + static float glaive_attackspeed = Config.getFloat("glaive_attackSpeed", "WeaponAttributes", ConfigDefaultValues.glaive_attackSpeed); + static float warglaive_attackspeed = Config.getFloat("warglaive_attackSpeed", "WeaponAttributes", ConfigDefaultValues.warglaive_attackSpeed); + static float cutlass_attackspeed = Config.getFloat("cutlass_attackSpeed", "WeaponAttributes", ConfigDefaultValues.cutlass_attackSpeed); + static float claymore_attackspeed = Config.getFloat("claymore_attackSpeed", "WeaponAttributes", ConfigDefaultValues.claymore_attackSpeed); + static float greataxe_attackspeed = Config.getFloat("greataxe_attackSpeed", "WeaponAttributes", ConfigDefaultValues.greataxe_attackSpeed); + static float greathammer_attackspeed = Config.getFloat("greathammer_attackSpeed", "WeaponAttributes", ConfigDefaultValues.greathammer_attackSpeed); + static float chakram_attackspeed = Config.getFloat("chakram_attackSpeed", "WeaponAttributes", ConfigDefaultValues.chakram_attackSpeed); + static float scythe_attackspeed = Config.getFloat("scythe_attackSpeed", "WeaponAttributes", ConfigDefaultValues.scythe_attackSpeed); + static float halberd_attackspeed = Config.getFloat("halberd_attackSpeed", "WeaponAttributes", ConfigDefaultValues.halberd_attackSpeed); + + static int longsword_modifier = (int) (longsword_positive_modifier - longsword_negative_modifier); + static int twinblade_modifier = (int) (twinblade_positive_modifier - twinblade_negative_modifier); + static int rapier_modifier = (int) (rapier_positive_modifier - rapier_negative_modifier); + static int sai_modifier = (int) (sai_positive_modifier - sai_negative_modifier); + static int spear_modifier = (int) (spear_positive_modifier - spear_negative_modifier); + static int katana_modifier = (int) (katana_positive_modifier - katana_negative_modifier); + static int glaive_modifier = (int) (glaive_positive_modifier - glaive_negative_modifier); + static int warglaive_modifier = (int) (warglaive_positive_modifier - warglaive_negative_modifier); + static int cutlass_modifier = (int) (cutlass_positive_modifier - cutlass_negative_modifier); + static int chakram_modifier = (int) (chakram_positive_modifier - chakram_negative_modifier); + static int scythe_modifier = (int) (scythe_positive_modifier - scythe_negative_modifier); + static int claymore_modifier = (int) (claymore_positive_modifier - claymore_negative_modifier); + static int greathammer_modifier = (int) (greathammer_positive_modifier - greathammer_negative_modifier); + static int greataxe_modifier = (int) (greataxe_positive_modifier - greataxe_negative_modifier); + static int halberd_modifier = (int) (halberd_positive_modifier - halberd_negative_modifier); + + static int dragon_scale_modifier = (int) Config.getFloat("dragon_scale_damageModifier", "WeaponAttributes", ConfigDefaultValues.dragonScale_damageModifier); + + + //Dragon Scale + public static final Item DRAGON_SCALE_LONGSWORD = registerItem( "dragon_loot_compat/dragon_longsword", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + longsword_modifier, longsword_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_TWINBLADE = registerItem( "dragon_loot_compat/dragon_twinblade", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + twinblade_modifier, twinblade_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_RAPIER = registerItem( "dragon_loot_compat/dragon_rapier", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + rapier_modifier, rapier_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_KATANA = registerItem( "dragon_loot_compat/dragon_katana", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + katana_modifier, katana_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_SAI = registerItem( "dragon_loot_compat/dragon_sai", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + sai_modifier, sai_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_SPEAR = registerItem( "dragon_loot_compat/dragon_spear", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + spear_modifier, spear_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_GLAIVE = registerItem( "dragon_loot_compat/dragon_glaive", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + glaive_modifier, glaive_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_WARGLAIVE = registerItem( "dragon_loot_compat/dragon_warglaive", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + warglaive_modifier, warglaive_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_CUTLASS = registerItem( "dragon_loot_compat/dragon_cutlass", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + cutlass_modifier, cutlass_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_CLAYMORE = registerItem( "dragon_loot_compat/dragon_claymore", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + claymore_modifier, claymore_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_GREATHAMMER = registerItem( "dragon_loot_compat/dragon_greathammer", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + greathammer_modifier, greathammer_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_GREATAXE = registerItem( "dragon_loot_compat/dragon_greataxe", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + greataxe_modifier, greataxe_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_CHAKRAM = registerItem( "dragon_loot_compat/dragon_chakram", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + chakram_modifier, chakram_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_SCYTHE = registerItem( "dragon_loot_compat/dragon_scythe", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + scythe_modifier, scythe_attackspeed, + "dragonloot:dragon_scale")); + + public static final Item DRAGON_SCALE_HALBERD = registerItem( "dragon_loot_compat/dragon_halberd", + new SimplySwordsNetheriteSwordItem(ModToolMaterial.DRAGON_SCALE, dragon_scale_modifier + halberd_modifier, halberd_attackspeed, + "dragonloot:dragon_scale")); + + + private static Item registerItem(String name, Item item) { + return Registry.register(Registries.ITEM, new Identifier(SimplySwords.MOD_ID, name), item); + } + + + + public static void registerModItems() { + SimplySwords.LOGGER.info("Registering Dragon Loot compat Items for " + SimplySwords.MOD_ID); + } + +} diff --git a/common/src/main/java/net/sweenus/simplyswords/config/ConfigDefaultValues.java b/common/src/main/java/net/sweenus/simplyswords/config/ConfigDefaultValues.java index e8e0f28b..f7978dc5 100644 --- a/common/src/main/java/net/sweenus/simplyswords/config/ConfigDefaultValues.java +++ b/common/src/main/java/net/sweenus/simplyswords/config/ConfigDefaultValues.java @@ -311,7 +311,14 @@ public class ConfigDefaultValues { public static float gobberNether_damageModifier = 3.0f; public static float gobberEnd_damageModifier = 6.0f; - + public static float netheriteIron_damageModifier = 3f; + public static float netheriteGold_damageModifier = 3f; + public static float netheriteEmerald_damageModifier = 3f; + public static float netheriteDiamond_damageModifier = 3f; + + public static float dragonScale_damageModifier = 3f; + + public static float longsword_attackSpeed = -2.4f; public static float twinblade_attackSpeed = -2.0f; public static float rapier_attackSpeed = -1.8f; diff --git a/common/src/main/java/net/sweenus/simplyswords/config/WeaponAttributesConfig.java b/common/src/main/java/net/sweenus/simplyswords/config/WeaponAttributesConfig.java index 43a7fed7..6e784a67 100644 --- a/common/src/main/java/net/sweenus/simplyswords/config/WeaponAttributesConfig.java +++ b/common/src/main/java/net/sweenus/simplyswords/config/WeaponAttributesConfig.java @@ -71,6 +71,13 @@ public class WeaponAttributesConfig implements ConfigData { public float gobberNether_damageModifier = 3.0f; public float gobberEnd_damageModifier = 6.0f; + public float netheriteIron_damageModifier = 3f; + public float netheriteGold_damageModifier = 3f; + public float netheriteEmerald_damageModifier = 3f; + public float netheriteDiamond_damageModifier = 3f; + + public float dragonScale_damageModifier = 3f; + @ConfigEntry.Gui.PrefixText public float longsword_attackSpeed = -2.4f; public float twinblade_attackSpeed = -2.0f; diff --git a/common/src/main/java/net/sweenus/simplyswords/item/AdvancedNetheriteSwordItem.java b/common/src/main/java/net/sweenus/simplyswords/item/AdvancedNetheriteSwordItem.java new file mode 100644 index 00000000..ed6d8a88 --- /dev/null +++ b/common/src/main/java/net/sweenus/simplyswords/item/AdvancedNetheriteSwordItem.java @@ -0,0 +1,68 @@ +package net.sweenus.simplyswords.item; + +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.registry.Registries; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.text.TextColor; +import net.minecraft.util.Identifier; +import net.minecraft.world.World; +import net.sweenus.simplyswords.SimplySwords; +import net.sweenus.simplyswords.util.HelperMethods; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class AdvancedNetheriteSwordItem extends SwordItem { + String[] repairIngredient; + + public AdvancedNetheriteSwordItem(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, String... repairIngredient) { + super(toolMaterial, attackDamage, attackSpeed, + new Settings().arch$tab(SimplySwords.SIMPLYSWORDS).fireproof()); + this.repairIngredient = repairIngredient; + } + + @Override + public boolean canRepair(ItemStack stack, ItemStack ingredient) { + List potentialIngredients = new ArrayList<>(List.of()); + Arrays.stream(repairIngredient).toList().forEach(repIngredient -> + potentialIngredients.add( + Registries.ITEM.get(new Identifier(repIngredient)))); + + + return potentialIngredients.contains(ingredient.getItem()); + } + + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + if (!attacker.getWorld().isClient()) { + HelperMethods.playHitSounds(attacker, target); + } + return super.postHit(stack, target, attacker); + } + + + @Override + public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { + + //Netherite alloys use GRAY, GOLD, DARK_GREEN, and AQUA colors + + if (this.getName(itemStack).getString().contains("Netherite-Iron")); + //Add Netherite-Iron tooltip + else if (this.getName(itemStack).getString().contains("Netherite-Gold")); + //Add Netherite-Gold tooltip + else if (this.getName(itemStack).getString().contains("Netherite-Emerald")); + //Add Netherite-Emerald tooltip + else if (this.getName(itemStack).getString().contains("Netherite-Diamond")); + //Add Netherite-Iron, -Gold, AND -Emerald tooltips + + super.appendTooltip(itemStack,world, tooltip, tooltipContext); + } + +} \ No newline at end of file diff --git a/common/src/main/java/net/sweenus/simplyswords/item/ModToolMaterial.java b/common/src/main/java/net/sweenus/simplyswords/item/ModToolMaterial.java index 969cc490..47fe8333 100644 --- a/common/src/main/java/net/sweenus/simplyswords/item/ModToolMaterial.java +++ b/common/src/main/java/net/sweenus/simplyswords/item/ModToolMaterial.java @@ -46,7 +46,17 @@ public enum ModToolMaterial implements ToolMaterial { //GOBBER GOBBER(5, 3800, 9.0F, 9.0F, 20, Items.DIAMOND), GOBBER_NETHER(6, 5200, 12.0F, 9.0F, 25, Items.DIAMOND), - GOBBER_END(7, 8000, 14.0F, 9.0F, 30, Items.DIAMOND); + GOBBER_END(7, 8000, 14.0F, 9.0F, 30, Items.DIAMOND), + + + //ADVANCED NETHERITE + NETHERITE_IRON(5, 2281, 12.0F, 4.0F, 15, Items.DIAMOND), + NETHERITE_GOLD(5, 2313, 20.0F, 5.0F, 25, Items.DIAMOND), + NETHERITE_EMERALD(5, 2651, 29.0F, 6.0F, 20, Items.DIAMOND), + NETHERITE_DIAMOND(5, 3092, 39.0F, 7.0F, 15, Items.DIAMOND), + + //DRAGON LOOT + DRAGON_SCALE(5,2479,12,5,20,Items.DIAMOND); private final int miningLevel; private final int itemDurability; diff --git a/common/src/main/resources/assets/simplyswords/lang/en_us.json b/common/src/main/resources/assets/simplyswords/lang/en_us.json index deb71931..049f495f 100644 --- a/common/src/main/resources/assets/simplyswords/lang/en_us.json +++ b/common/src/main/resources/assets/simplyswords/lang/en_us.json @@ -492,6 +492,95 @@ "item.simplyswords.gobber_compat.gobber_end.gobber_end_halberd": "End Gobber Halberd", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_claymore": "Netherite-Iron Claymore", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_cutlasss": "Netherite-Iron Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_glaive": "Netherite-Iron Glaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_katana": "Netherite-Iron Katana", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_longsword": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_rapier": "Netherite-Iron Rapier", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_sai": "Netherite-Iron Sai", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_spear": "Netherite-Iron Spear", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_twinblade": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_warglaive": "Netherite-Iron Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greathammer": "Netherite-Iron Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greataxe": "Netherite-Iron Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_chakram": "Netherite-Iron Chakram", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_scythe": "Netherite-Iron Scythe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_halberd": "Netherite-Iron Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_claymore": "Netherite-Gold Claymore", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_cutlasss": "Netherite-Gold Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_glaive": "Netherite-Gold Glaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_katana": "Netherite-Gold Katana", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_longsword": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_rapier": "Netherite-Gold Rapier", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_sai": "Netherite-Gold Sai", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_spear": "Netherite-Gold Spear", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_twinblade": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_warglaive": "Netherite-Gold Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greathammer": "Netherite-Gold Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greataxe": "Netherite-Gold Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_chakram": "Netherite-Gold Chakram", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_scythe": "Netherite-Gold Scythe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_halberd": "Netherite-Gold Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_claymore": "Netherite-Emerald Claymore", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_cutlasss": "Netherite-Emerald Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_glaive": "Netherite-Emerald Glaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_katana": "Netherite-Emerald Katana", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_longsword": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_rapier": "Netherite-Emerald Rapier", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_sai": "Netherite-Emerald Sai", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_spear": "Netherite-Emerald Spear", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_twinblade": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_warglaive": "Netherite-Emerald Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greathammer": "Netherite-Emerald Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greataxe": "Netherite-Emerald Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_chakram": "Netherite-Emerald Chakram", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_scythe": "Netherite-Emerald Scythe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_halberd": "Netherite-Emerald Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_claymore": "Netherite-Diamond Claymore", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_cutlasss": "Netherite-Diamond Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_glaive": "Netherite-Diamond Glaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_katana": "Netherite-Diamond Katana", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_longsword": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_rapier": "Netherite-Diamond Rapier", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_sai": "Netherite-Diamond Sai", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_spear": "Netherite-Diamond Spear", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_twinblade": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_warglaive": "Netherite-Diamond Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greathammer": "Netherite-Diamond Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greataxe": "Netherite-Diamond Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_chakram": "Netherite-Diamond Chakram", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_scythe": "Netherite-Diamond Scythe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_halberd": "Netherite-Diamond Halberd", + + "item.advancednetherite_compat.netherite-iron.tooltip": "%s Chance of dropping additional Phantom Membrane(s) on killing Phantom", + "item.advancednetherite_compat.netherite-gold.tooltip1": "%s Chance of dropping additional Gold Ingot on killing Piglin", + "item.advancednetherite_compat.netherite-gold.tooltip2": "%s Chance of dropping additional Gold Nugget(s) on killing Zombified Piglin", + "item.advancednetherite_compat.netherite-emerald.tooltip": "%s Chance of dropping additional Ender Pearl on killing Enderman", + + "item.advancednetherite.misc.press_shift_key": "Hold %s to view all perks", + "item.advancednetherite.misc.shift": "[SHIFT]", + "item.advancednetherite.misc.plus": "+", + + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_claymore": "Dragon Claymore", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_cutlasss": "Dragon Cutlass", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_glaive": "Dragon Glaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_katana": "Dragon Katana", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_longsword": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_rapier": "Dragon Rapier", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_sai": "Dragon Sai", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_spear": "Dragon Spear", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_twinblade": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_warglaive": "Dragon Warglaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greathammer": "Dragon Greathammer", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greataxe": "Dragon Greataxe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_chakram": "Dragon Chakram", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_scythe": "Dragon Scythe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_halberd": "Dragon Halberd", + "itemGroup.simplyswords.simplyswords": "Simply Swords", "item.simplyswords.awakening": "Awakening LV: %d ", "item.simplyswords.awakening.exp": "Awakening XP: %d%% ", @@ -995,8 +1084,6 @@ "item.simplyswords.runic_tablet.tooltip3": "Can also be used to repair", "item.simplyswords.runic_tablet.tooltip4": "Unique weapons.", - - "item.simplyswords.uniquesworditem.netherfused_power.echo": "[ Netherfused: Echo ]", "item.simplyswords.uniquesworditem.netherfused_power.echo.description": "Your weapon swings echo, dealing", "item.simplyswords.uniquesworditem.netherfused_power.echo.description2": "additional unmitigated damage ", diff --git a/common/src/main/resources/assets/simplyswords/lang/ja_jp.json b/common/src/main/resources/assets/simplyswords/lang/ja_jp.json index f62731ac..728406d4 100644 --- a/common/src/main/resources/assets/simplyswords/lang/ja_jp.json +++ b/common/src/main/resources/assets/simplyswords/lang/ja_jp.json @@ -478,6 +478,94 @@ "item.simplyswords.gobber_compat.gobber_end.gobber_end_scythe": "エンドゴバーの大鎌", "item.simplyswords.gobber_compat.gobber_end.gobber_end_halberd": "エンドゴバーのハルバード", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_claymore": "Netherite-Iron Claymore", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_cutlasss": "Netherite-Iron Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_glaive": "Netherite-Iron Glaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_katana": "Netherite-Iron Katana", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_longsword": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_rapier": "Netherite-Iron Rapier", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_sai": "Netherite-Iron Sai", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_spear": "Netherite-Iron Spear", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_twinblade": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_warglaive": "Netherite-Iron Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greathammer": "Netherite-Iron Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greataxe": "Netherite-Iron Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_chakram": "Netherite-Iron Chakram", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_scythe": "Netherite-Iron Scythe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_halberd": "Netherite-Iron Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_claymore": "Netherite-Gold Claymore", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_cutlasss": "Netherite-Gold Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_glaive": "Netherite-Gold Glaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_katana": "Netherite-Gold Katana", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_longsword": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_rapier": "Netherite-Gold Rapier", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_sai": "Netherite-Gold Sai", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_spear": "Netherite-Gold Spear", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_twinblade": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_warglaive": "Netherite-Gold Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greathammer": "Netherite-Gold Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greataxe": "Netherite-Gold Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_chakram": "Netherite-Gold Chakram", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_scythe": "Netherite-Gold Scythe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_halberd": "Netherite-Gold Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_claymore": "Netherite-Emerald Claymore", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_cutlasss": "Netherite-Emerald Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_glaive": "Netherite-Emerald Glaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_katana": "Netherite-Emerald Katana", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_longsword": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_rapier": "Netherite-Emerald Rapier", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_sai": "Netherite-Emerald Sai", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_spear": "Netherite-Emerald Spear", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_twinblade": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_warglaive": "Netherite-Emerald Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greathammer": "Netherite-Emerald Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greataxe": "Netherite-Emerald Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_chakram": "Netherite-Emerald Chakram", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_scythe": "Netherite-Emerald Scythe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_halberd": "Netherite-Emerald Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_claymore": "Netherite-Diamond Claymore", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_cutlasss": "Netherite-Diamond Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_glaive": "Netherite-Diamond Glaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_katana": "Netherite-Diamond Katana", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_longsword": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_rapier": "Netherite-Diamond Rapier", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_sai": "Netherite-Diamond Sai", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_spear": "Netherite-Diamond Spear", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_twinblade": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_warglaive": "Netherite-Diamond Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greathammer": "Netherite-Diamond Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greataxe": "Netherite-Diamond Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_chakram": "Netherite-Diamond Chakram", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_scythe": "Netherite-Diamond Scythe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_halberd": "Netherite-Diamond Halberd", + + "item.advancednetherite_compat.netherite-iron.tooltip": "%s Chance of dropping additional Phantom Membrane(s) on killing Phantom", + "item.advancednetherite_compat.netherite-gold.tooltip1": "%s Chance of dropping additional Gold Ingot on killing Piglin", + "item.advancednetherite_compat.netherite-gold.tooltip2": "%s Chance of dropping additional Gold Nugget(s) on killing Zombified Piglin", + "item.advancednetherite_compat.netherite-emerald.tooltip": "%s Chance of dropping additional Ender Pearl on killing Enderman", + + "item.advancednetherite.misc.press_shift_key": "Hold %s to view all perks", + "item.advancednetherite.misc.shift": "[SHIFT]", + "item.advancednetherite.misc.plus": "+", + + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_claymore": "Dragon Claymore", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_cutlasss": "Dragon Cutlass", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_glaive": "Dragon Glaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_katana": "Dragon Katana", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_longsword": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_rapier": "Dragon Rapier", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_sai": "Dragon Sai", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_spear": "Dragon Spear", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_twinblade": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_warglaive": "Dragon Warglaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greathammer": "Dragon Greathammer", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greataxe": "Dragon Greataxe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_chakram": "Dragon Chakram", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_scythe": "Dragon Scythe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_halberd": "Dragon Halberd", "itemGroup.simplyswords.simplyswords": "Simply Swords", "item.simplyswords.awakening": "覚醒LV: %d ", @@ -819,7 +907,6 @@ "item.simplyswords.unidentifiedsworditem.tooltip1": "ルーンの刻まれた能力:????", "item.simplyswords.unidentifiedsworditem.tooltip2": "クリックで能力を覚醒させる", - "item.simplyswords.uniquesworditem.netherfused_power.echo": "[ 覚醒済:死を吐く反響 ]", "item.simplyswords.uniquesworditem.netherfused_power.echo.description": "武器が反響し、", "item.simplyswords.uniquesworditem.netherfused_power.echo.description2": "僅かな時間の後、", diff --git a/common/src/main/resources/assets/simplyswords/lang/ko_kr.json b/common/src/main/resources/assets/simplyswords/lang/ko_kr.json index b5943d84..2d7f059f 100644 --- a/common/src/main/resources/assets/simplyswords/lang/ko_kr.json +++ b/common/src/main/resources/assets/simplyswords/lang/ko_kr.json @@ -424,6 +424,94 @@ "item.simplyswords.gobber_compat.gobber_end.gobber_end_chakram": "End Gobber Chakram", "item.simplyswords.gobber_compat.gobber_end.gobber_end_scythe": "End Gobber Scythe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_claymore": "Netherite-Iron Claymore", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_cutlasss": "Netherite-Iron Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_glaive": "Netherite-Iron Glaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_katana": "Netherite-Iron Katana", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_longsword": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_rapier": "Netherite-Iron Rapier", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_sai": "Netherite-Iron Sai", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_spear": "Netherite-Iron Spear", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_twinblade": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_warglaive": "Netherite-Iron Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greathammer": "Netherite-Iron Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greataxe": "Netherite-Iron Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_chakram": "Netherite-Iron Chakram", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_scythe": "Netherite-Iron Scythe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_halberd": "Netherite-Iron Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_claymore": "Netherite-Gold Claymore", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_cutlasss": "Netherite-Gold Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_glaive": "Netherite-Gold Glaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_katana": "Netherite-Gold Katana", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_longsword": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_rapier": "Netherite-Gold Rapier", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_sai": "Netherite-Gold Sai", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_spear": "Netherite-Gold Spear", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_twinblade": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_warglaive": "Netherite-Gold Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greathammer": "Netherite-Gold Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greataxe": "Netherite-Gold Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_chakram": "Netherite-Gold Chakram", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_scythe": "Netherite-Gold Scythe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_halberd": "Netherite-Gold Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_claymore": "Netherite-Emerald Claymore", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_cutlasss": "Netherite-Emerald Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_glaive": "Netherite-Emerald Glaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_katana": "Netherite-Emerald Katana", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_longsword": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_rapier": "Netherite-Emerald Rapier", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_sai": "Netherite-Emerald Sai", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_spear": "Netherite-Emerald Spear", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_twinblade": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_warglaive": "Netherite-Emerald Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greathammer": "Netherite-Emerald Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greataxe": "Netherite-Emerald Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_chakram": "Netherite-Emerald Chakram", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_scythe": "Netherite-Emerald Scythe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_halberd": "Netherite-Emerald Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_claymore": "Netherite-Diamond Claymore", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_cutlasss": "Netherite-Diamond Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_glaive": "Netherite-Diamond Glaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_katana": "Netherite-Diamond Katana", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_longsword": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_rapier": "Netherite-Diamond Rapier", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_sai": "Netherite-Diamond Sai", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_spear": "Netherite-Diamond Spear", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_twinblade": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_warglaive": "Netherite-Diamond Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greathammer": "Netherite-Diamond Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greataxe": "Netherite-Diamond Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_chakram": "Netherite-Diamond Chakram", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_scythe": "Netherite-Diamond Scythe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_halberd": "Netherite-Diamond Halberd", + + "item.advancednetherite_compat.netherite-iron.tooltip": "%s Chance of dropping additional Phantom Membrane(s) on killing Phantom", + "item.advancednetherite_compat.netherite-gold.tooltip1": "%s Chance of dropping additional Gold Ingot on killing Piglin", + "item.advancednetherite_compat.netherite-gold.tooltip2": "%s Chance of dropping additional Gold Nugget(s) on killing Zombified Piglin", + "item.advancednetherite_compat.netherite-emerald.tooltip": "%s Chance of dropping additional Ender Pearl on killing Enderman", + + "item.advancednetherite.misc.press_shift_key": "Hold %s to view all perks", + "item.advancednetherite.misc.shift": "[SHIFT]", + "item.advancednetherite.misc.plus": "+", + + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_claymore": "Dragon Claymore", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_cutlasss": "Dragon Cutlass", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_glaive": "Dragon Glaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_katana": "Dragon Katana", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_longsword": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_rapier": "Dragon Rapier", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_sai": "Dragon Sai", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_spear": "Dragon Spear", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_twinblade": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_warglaive": "Dragon Warglaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greathammer": "Dragon Greathammer", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greataxe": "Dragon Greataxe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_chakram": "Dragon Chakram", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_scythe": "Dragon Scythe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_halberd": "Dragon Halberd", "itemGroup.simplyswords.simplyswords": "Simply Swords", diff --git a/common/src/main/resources/assets/simplyswords/lang/ru_ru.json b/common/src/main/resources/assets/simplyswords/lang/ru_ru.json index 0d25f181..f2995d46 100644 --- a/common/src/main/resources/assets/simplyswords/lang/ru_ru.json +++ b/common/src/main/resources/assets/simplyswords/lang/ru_ru.json @@ -470,6 +470,94 @@ "item.simplyswords.gobber_compat.gobber_end.gobber_end_chakram": "End Gobber Чакрам", "item.simplyswords.gobber_compat.gobber_end.gobber_end_scythe": "End Gobber Коса", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_claymore": "Netherite-Iron Claymore", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_cutlasss": "Netherite-Iron Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_glaive": "Netherite-Iron Glaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_katana": "Netherite-Iron Katana", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_longsword": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_rapier": "Netherite-Iron Rapier", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_sai": "Netherite-Iron Sai", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_spear": "Netherite-Iron Spear", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_twinblade": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_warglaive": "Netherite-Iron Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greathammer": "Netherite-Iron Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greataxe": "Netherite-Iron Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_chakram": "Netherite-Iron Chakram", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_scythe": "Netherite-Iron Scythe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_halberd": "Netherite-Iron Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_claymore": "Netherite-Gold Claymore", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_cutlasss": "Netherite-Gold Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_glaive": "Netherite-Gold Glaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_katana": "Netherite-Gold Katana", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_longsword": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_rapier": "Netherite-Gold Rapier", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_sai": "Netherite-Gold Sai", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_spear": "Netherite-Gold Spear", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_twinblade": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_warglaive": "Netherite-Gold Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greathammer": "Netherite-Gold Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greataxe": "Netherite-Gold Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_chakram": "Netherite-Gold Chakram", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_scythe": "Netherite-Gold Scythe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_halberd": "Netherite-Gold Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_claymore": "Netherite-Emerald Claymore", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_cutlasss": "Netherite-Emerald Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_glaive": "Netherite-Emerald Glaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_katana": "Netherite-Emerald Katana", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_longsword": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_rapier": "Netherite-Emerald Rapier", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_sai": "Netherite-Emerald Sai", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_spear": "Netherite-Emerald Spear", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_twinblade": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_warglaive": "Netherite-Emerald Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greathammer": "Netherite-Emerald Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greataxe": "Netherite-Emerald Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_chakram": "Netherite-Emerald Chakram", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_scythe": "Netherite-Emerald Scythe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_halberd": "Netherite-Emerald Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_claymore": "Netherite-Diamond Claymore", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_cutlasss": "Netherite-Diamond Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_glaive": "Netherite-Diamond Glaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_katana": "Netherite-Diamond Katana", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_longsword": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_rapier": "Netherite-Diamond Rapier", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_sai": "Netherite-Diamond Sai", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_spear": "Netherite-Diamond Spear", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_twinblade": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_warglaive": "Netherite-Diamond Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greathammer": "Netherite-Diamond Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greataxe": "Netherite-Diamond Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_chakram": "Netherite-Diamond Chakram", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_scythe": "Netherite-Diamond Scythe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_halberd": "Netherite-Diamond Halberd", + + "item.advancednetherite_compat.netherite-iron.tooltip": "%s Chance of dropping additional Phantom Membrane(s) on killing Phantom", + "item.advancednetherite_compat.netherite-gold.tooltip1": "%s Chance of dropping additional Gold Ingot on killing Piglin", + "item.advancednetherite_compat.netherite-gold.tooltip2": "%s Chance of dropping additional Gold Nugget(s) on killing Zombified Piglin", + "item.advancednetherite_compat.netherite-emerald.tooltip": "%s Chance of dropping additional Ender Pearl on killing Enderman", + + "item.advancednetherite.misc.press_shift_key": "Hold %s to view all perks", + "item.advancednetherite.misc.shift": "[SHIFT]", + "item.advancednetherite.misc.plus": "+", + + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_claymore": "Dragon Claymore", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_cutlasss": "Dragon Cutlass", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_glaive": "Dragon Glaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_katana": "Dragon Katana", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_longsword": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_rapier": "Dragon Rapier", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_sai": "Dragon Sai", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_spear": "Dragon Spear", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_twinblade": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_warglaive": "Dragon Warglaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greathammer": "Dragon Greathammer", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greataxe": "Dragon Greataxe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_chakram": "Dragon Chakram", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_scythe": "Dragon Scythe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_halberd": "Dragon Halberd", "itemGroup.simplyswords.simplyswords": "Simply Swords", "item.simplyswords.awakening": "Awakening LV: %d ", diff --git a/common/src/main/resources/assets/simplyswords/lang/zh_cn.json b/common/src/main/resources/assets/simplyswords/lang/zh_cn.json index 568ad3bc..738d117a 100644 --- a/common/src/main/resources/assets/simplyswords/lang/zh_cn.json +++ b/common/src/main/resources/assets/simplyswords/lang/zh_cn.json @@ -491,6 +491,94 @@ "item.simplyswords.gobber_compat.gobber_end.gobber_end_scythe": "末地戈伯长柄镰", "item.simplyswords.gobber_compat.gobber_end.gobber_end_halberd": "末地戈伯戟", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_claymore": "Netherite-Iron Claymore", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_cutlasss": "Netherite-Iron Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_glaive": "Netherite-Iron Glaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_katana": "Netherite-Iron Katana", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_longsword": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_rapier": "Netherite-Iron Rapier", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_sai": "Netherite-Iron Sai", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_spear": "Netherite-Iron Spear", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_twinblade": "Netherite-Iron Longsword", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_warglaive": "Netherite-Iron Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greathammer": "Netherite-Iron Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_greataxe": "Netherite-Iron Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_chakram": "Netherite-Iron Chakram", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_scythe": "Netherite-Iron Scythe", + "item.simplyswords.advancednetherite_compat.netherite-iron.netherite-iron_halberd": "Netherite-Iron Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_claymore": "Netherite-Gold Claymore", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_cutlasss": "Netherite-Gold Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_glaive": "Netherite-Gold Glaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_katana": "Netherite-Gold Katana", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_longsword": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_rapier": "Netherite-Gold Rapier", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_sai": "Netherite-Gold Sai", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_spear": "Netherite-Gold Spear", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_twinblade": "Netherite-Gold Longsword", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_warglaive": "Netherite-Gold Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greathammer": "Netherite-Gold Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_greataxe": "Netherite-Gold Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_chakram": "Netherite-Gold Chakram", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_scythe": "Netherite-Gold Scythe", + "item.simplyswords.advancednetherite_compat.netherite-gold.netherite-gold_halberd": "Netherite-Gold Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_claymore": "Netherite-Emerald Claymore", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_cutlasss": "Netherite-Emerald Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_glaive": "Netherite-Emerald Glaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_katana": "Netherite-Emerald Katana", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_longsword": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_rapier": "Netherite-Emerald Rapier", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_sai": "Netherite-Emerald Sai", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_spear": "Netherite-Emerald Spear", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_twinblade": "Netherite-Emerald Longsword", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_warglaive": "Netherite-Emerald Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greathammer": "Netherite-Emerald Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_greataxe": "Netherite-Emerald Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_chakram": "Netherite-Emerald Chakram", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_scythe": "Netherite-Emerald Scythe", + "item.simplyswords.advancednetherite_compat.netherite-emerald.netherite-emerald_halberd": "Netherite-Emerald Halberd", + + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_claymore": "Netherite-Diamond Claymore", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_cutlasss": "Netherite-Diamond Cutlass", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_glaive": "Netherite-Diamond Glaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_katana": "Netherite-Diamond Katana", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_longsword": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_rapier": "Netherite-Diamond Rapier", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_sai": "Netherite-Diamond Sai", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_spear": "Netherite-Diamond Spear", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_twinblade": "Netherite-Diamond Longsword", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_warglaive": "Netherite-Diamond Warglaive", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greathammer": "Netherite-Diamond Greathammer", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_greataxe": "Netherite-Diamond Greataxe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_chakram": "Netherite-Diamond Chakram", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_scythe": "Netherite-Diamond Scythe", + "item.simplyswords.advancednetherite_compat.netherite-diamond.netherite-diamond_halberd": "Netherite-Diamond Halberd", + + "item.advancednetherite_compat.netherite-iron.tooltip": "%s Chance of dropping additional Phantom Membrane(s) on killing Phantom", + "item.advancednetherite_compat.netherite-gold.tooltip1": "%s Chance of dropping additional Gold Ingot on killing Piglin", + "item.advancednetherite_compat.netherite-gold.tooltip2": "%s Chance of dropping additional Gold Nugget(s) on killing Zombified Piglin", + "item.advancednetherite_compat.netherite-emerald.tooltip": "%s Chance of dropping additional Ender Pearl on killing Enderman", + + "item.advancednetherite.misc.press_shift_key": "Hold %s to view all perks", + "item.advancednetherite.misc.shift": "[SHIFT]", + "item.advancednetherite.misc.plus": "+", + + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_claymore": "Dragon Claymore", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_cutlasss": "Dragon Cutlass", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_glaive": "Dragon Glaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_katana": "Dragon Katana", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_longsword": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_rapier": "Dragon Rapier", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_sai": "Dragon Sai", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_spear": "Dragon Spear", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_twinblade": "Dragon Longsword", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_warglaive": "Dragon Warglaive", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greathammer": "Dragon Greathammer", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_greataxe": "Dragon Greataxe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_chakram": "Dragon Chakram", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_scythe": "Dragon Scythe", + "item.simplyswords.dragonloot_compat.dragon_scale.dragon_halberd": "Dragon Halberd", "itemGroup.simplyswords.simplyswords": "简易刀剑", "item.simplyswords.awakening": "觉醒等级：%d ", diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/chakram.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/chakram.json new file mode 100644 index 00000000..bad041f8 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/chakram.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_chakram", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/claymore.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/claymore.json new file mode 100644 index 00000000..cdc16587 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/claymore.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_claymore", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/cutlass.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/cutlass.json new file mode 100644 index 00000000..7fa3849b --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/cutlass.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_cutlass", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/cutlass" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/glaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/glaive.json new file mode 100644 index 00000000..5ca6b11f --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/glaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_glaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/glaive" + } + } \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/greataxe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/greataxe.json new file mode 100644 index 00000000..81b7d3b7 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/greataxe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/greataxe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/greathammer.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/greathammer.json new file mode 100644 index 00000000..d42b7730 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/greathammer.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_greathammer", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/halberd.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/halberd.json new file mode 100644 index 00000000..50814f78 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/halberd.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/long_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/halberd" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/katana.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/katana.json new file mode 100644 index 00000000..ef04679a --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/katana.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_katana", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/longsword.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/longsword.json new file mode 100644 index 00000000..db80b8f1 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/longsword.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/longsword" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/rapier.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/rapier.json new file mode 100644 index 00000000..f79a1c21 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/rapier.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/rapier" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/sai.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/sai.json new file mode 100644 index 00000000..aaa20534 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/sai.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_sai", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/sai" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/scythe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/scythe.json new file mode 100644 index 00000000..f34142ca --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/scythe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/scythe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/spear.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/spear.json new file mode 100644 index 00000000..e5bd44e3 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/spear" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/twinblade.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/twinblade.json new file mode 100644 index 00000000..e5138e81 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/twinblade.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_twinblade", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/twinblade" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/warglaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/warglaive.json new file mode 100644 index 00000000..4c876e9f --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-diamond/warglaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_warglaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-diamond/warglaive" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/chakram.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/chakram.json new file mode 100644 index 00000000..8e2bd8cf --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/chakram.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_chakram", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/claymore.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/claymore.json new file mode 100644 index 00000000..9c4f77ba --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/claymore.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_claymore", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/cutlass.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/cutlass.json new file mode 100644 index 00000000..45976c83 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/cutlass.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_cutlass", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/cutlass" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/glaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/glaive.json new file mode 100644 index 00000000..469496f3 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/glaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_glaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/glaive" + } + } \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/greataxe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/greataxe.json new file mode 100644 index 00000000..1e00bdab --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/greataxe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/greataxe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/greathammer.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/greathammer.json new file mode 100644 index 00000000..a5130dad --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/greathammer.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_greathammer", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/halberd.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/halberd.json new file mode 100644 index 00000000..d99bd6b9 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/halberd.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/long_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/halberd" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/katana.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/katana.json new file mode 100644 index 00000000..689542b9 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/katana.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_katana", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/longsword.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/longsword.json new file mode 100644 index 00000000..24c1008f --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/longsword.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/longsword" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/rapier.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/rapier.json new file mode 100644 index 00000000..68e2b7dd --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/rapier.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/rapier" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/sai.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/sai.json new file mode 100644 index 00000000..3fd6f72b --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/sai.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_sai", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/sai" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/scythe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/scythe.json new file mode 100644 index 00000000..09a6e130 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/scythe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/scythe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/spear.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/spear.json new file mode 100644 index 00000000..40d09453 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/spear" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/twinblade.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/twinblade.json new file mode 100644 index 00000000..ff73e2d2 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/twinblade.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_twinblade", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/twinblade" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/warglaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/warglaive.json new file mode 100644 index 00000000..3e7482e9 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-emerald/warglaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_warglaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-emerald/warglaive" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/chakram.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/chakram.json new file mode 100644 index 00000000..024e6600 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/chakram.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_chakram", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/claymore.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/claymore.json new file mode 100644 index 00000000..3ec73911 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/claymore.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_claymore", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/cutlass.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/cutlass.json new file mode 100644 index 00000000..907c2c2d --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/cutlass.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_cutlass", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/cutlass" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/glaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/glaive.json new file mode 100644 index 00000000..7e0729b0 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/glaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_glaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/glaive" + } + } \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/greataxe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/greataxe.json new file mode 100644 index 00000000..9fb90ab0 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/greataxe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/greataxe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/greathammer.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/greathammer.json new file mode 100644 index 00000000..cf1de5df --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/greathammer.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_greathammer", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/halberd.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/halberd.json new file mode 100644 index 00000000..e1488c95 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/halberd.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/long_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/halberd" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/katana.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/katana.json new file mode 100644 index 00000000..ddd75d91 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/katana.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_katana", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/longsword.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/longsword.json new file mode 100644 index 00000000..74198804 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/longsword.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/longsword" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/rapier.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/rapier.json new file mode 100644 index 00000000..e290a834 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/rapier.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/rapier" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/sai.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/sai.json new file mode 100644 index 00000000..f7b7c361 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/sai.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_sai", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/sai" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/scythe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/scythe.json new file mode 100644 index 00000000..5d20e495 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/scythe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/scythe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/spear.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/spear.json new file mode 100644 index 00000000..26758abd --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/spear" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/twinblade.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/twinblade.json new file mode 100644 index 00000000..7fb8644f --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/twinblade.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_twinblade", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/twinblade" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/warglaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/warglaive.json new file mode 100644 index 00000000..0768a9b7 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-gold/warglaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_warglaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-gold/warglaive" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/chakram.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/chakram.json new file mode 100644 index 00000000..ad8c1557 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/chakram.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_chakram", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/claymore.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/claymore.json new file mode 100644 index 00000000..5f7aa415 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/claymore.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_claymore", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/cutlass.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/cutlass.json new file mode 100644 index 00000000..906bbf81 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/cutlass.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_cutlass", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/cutlass" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/glaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/glaive.json new file mode 100644 index 00000000..e8c8abf3 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/glaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_glaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/glaive" + } + } \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/greataxe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/greataxe.json new file mode 100644 index 00000000..80b5bd54 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/greataxe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/greataxe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/greathammer.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/greathammer.json new file mode 100644 index 00000000..9f5cbc67 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/greathammer.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_greathammer", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/halberd.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/halberd.json new file mode 100644 index 00000000..cf58ec48 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/halberd.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/long_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/halberd" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/katana.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/katana.json new file mode 100644 index 00000000..38cab066 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/katana.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_katana", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/longsword.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/longsword.json new file mode 100644 index 00000000..fffc4496 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/longsword.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/longsword" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/rapier.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/rapier.json new file mode 100644 index 00000000..11d376a8 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/rapier.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/rapier" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/sai.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/sai.json new file mode 100644 index 00000000..240cf2d7 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/sai.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_sai", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/sai" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/scythe.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/scythe.json new file mode 100644 index 00000000..0ad95534 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/scythe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/scythe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/spear.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/spear.json new file mode 100644 index 00000000..c858d159 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/spear" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/twinblade.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/twinblade.json new file mode 100644 index 00000000..78d5fa6a --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/twinblade.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_twinblade", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/twinblade" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/warglaive.json b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/warglaive.json new file mode 100644 index 00000000..a1cd60d7 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/advancednetherite_compat/netherite-iron/warglaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_warglaive", + "textures": { + "layer0": "simplyswords:item/advancednetherite_compat/netherite-iron/warglaive" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/chakram.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/chakram.json new file mode 100644 index 00000000..5e607254 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/chakram.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_chakram", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_chakram" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/claymore.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/claymore.json new file mode 100644 index 00000000..3dd4afc5 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/claymore.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_claymore", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/cutlass.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/cutlass.json new file mode 100644 index 00000000..94623163 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/cutlass.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_cutlass", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_cutlass" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/glaive.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/glaive.json new file mode 100644 index 00000000..bf116f99 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/glaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_glaive", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_glaive" + } + } \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/greataxe.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/greataxe.json new file mode 100644 index 00000000..2acb5083 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/greataxe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_greataxe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/greathammer.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/greathammer.json new file mode 100644 index 00000000..7c0e5e73 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/greathammer.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_greathammer", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_greathammer" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/halberd.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/halberd.json new file mode 100644 index 00000000..a3e0b4d3 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/halberd.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/long_handheld", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_halberd" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/katana.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/katana.json new file mode 100644 index 00000000..e58763dd --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/katana.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_katana", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/longsword.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/longsword.json new file mode 100644 index 00000000..20815e79 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/longsword.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_longsword" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/rapier.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/rapier.json new file mode 100644 index 00000000..724a75d1 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/rapier.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_longsword", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_rapier" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/sai.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/sai.json new file mode 100644 index 00000000..5972625e --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/sai.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_sai", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_sai" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/scythe.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/scythe.json new file mode 100644 index 00000000..fab99a57 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/scythe.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_scythe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/spear.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/spear.json new file mode 100644 index 00000000..27a7fbbe --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/big_handheld", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_spear" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/twinblade.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/twinblade.json new file mode 100644 index 00000000..c0dfd221 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/twinblade.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_twinblade", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_twinblade" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/warglaive.json b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/warglaive.json new file mode 100644 index 00000000..df70d582 --- /dev/null +++ b/common/src/main/resources/assets/simplyswords/models/item/dragonloot_compat/dragon_scale/warglaive.json @@ -0,0 +1,6 @@ +{ + "parent": "simplyswords:item/template_warglaive", + "textures": { + "layer0": "simplyswords:item/dragonloot_compat/dragon_warglaive" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/chakram.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/chakram.png new file mode 100644 index 00000000..ed1f2fc5 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/chakram.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/claymore.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/claymore.png new file mode 100644 index 00000000..3ed4b0e0 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/claymore.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/cutlass.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/cutlass.png new file mode 100644 index 00000000..6bdc14ca Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/cutlass.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/glaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/glaive.png new file mode 100644 index 00000000..655424be Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/glaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/greataxe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/greataxe.png new file mode 100644 index 00000000..afb3c8c8 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/greataxe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/greathammer.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/greathammer.png new file mode 100644 index 00000000..64fa1796 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/greathammer.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/halberd.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/halberd.png new file mode 100644 index 00000000..063e1085 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/halberd.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/katana.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/katana.png new file mode 100644 index 00000000..3efdc8fa Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/katana.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/longsword.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/longsword.png new file mode 100644 index 00000000..74b2d75b Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/longsword.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/rapier.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/rapier.png new file mode 100644 index 00000000..9d734ec0 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/rapier.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/sai.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/sai.png new file mode 100644 index 00000000..c408af9d Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/sai.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/scythe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/scythe.png new file mode 100644 index 00000000..2316317e Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/scythe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/spear.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/spear.png new file mode 100644 index 00000000..dfd6a315 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/spear.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/twinblade.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/twinblade.png new file mode 100644 index 00000000..0fba8769 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/twinblade.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/warglaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/warglaive.png new file mode 100644 index 00000000..c310ca59 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-diamond/warglaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/chakram.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/chakram.png new file mode 100644 index 00000000..e59e9f60 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/chakram.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/claymore.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/claymore.png new file mode 100644 index 00000000..17effa45 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/claymore.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/cutlass.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/cutlass.png new file mode 100644 index 00000000..0f62d32c Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/cutlass.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/glaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/glaive.png new file mode 100644 index 00000000..d77790b9 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/glaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/greataxe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/greataxe.png new file mode 100644 index 00000000..e5d4a1dd Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/greataxe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/greathammer.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/greathammer.png new file mode 100644 index 00000000..35f18d9c Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/greathammer.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/halberd.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/halberd.png new file mode 100644 index 00000000..47a43c35 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/halberd.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/katana.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/katana.png new file mode 100644 index 00000000..6c083dc0 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/katana.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/longsword.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/longsword.png new file mode 100644 index 00000000..2d8e59e5 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/longsword.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/rapier.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/rapier.png new file mode 100644 index 00000000..e32403e7 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/rapier.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/sai.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/sai.png new file mode 100644 index 00000000..70194fcc Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/sai.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/scythe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/scythe.png new file mode 100644 index 00000000..0ee42ac3 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/scythe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/spear.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/spear.png new file mode 100644 index 00000000..809f0d99 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/spear.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/twinblade.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/twinblade.png new file mode 100644 index 00000000..458901d2 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/twinblade.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/warglaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/warglaive.png new file mode 100644 index 00000000..0b13f5fa Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-emerald/warglaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/chakram.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/chakram.png new file mode 100644 index 00000000..0164f37c Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/chakram.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/claymore.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/claymore.png new file mode 100644 index 00000000..230815e7 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/claymore.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/cutlass.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/cutlass.png new file mode 100644 index 00000000..0f856f6c Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/cutlass.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/glaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/glaive.png new file mode 100644 index 00000000..ae7a8a84 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/glaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/greataxe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/greataxe.png new file mode 100644 index 00000000..e65c0ebd Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/greataxe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/greathammer.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/greathammer.png new file mode 100644 index 00000000..bdf0b6d0 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/greathammer.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/halberd.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/halberd.png new file mode 100644 index 00000000..f4e3ae39 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/halberd.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/katana.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/katana.png new file mode 100644 index 00000000..e2910eec Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/katana.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/longsword.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/longsword.png new file mode 100644 index 00000000..353c7178 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/longsword.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/rapier.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/rapier.png new file mode 100644 index 00000000..44e25c79 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/rapier.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/sai.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/sai.png new file mode 100644 index 00000000..c91ffa7e Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/sai.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/scythe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/scythe.png new file mode 100644 index 00000000..f9e9b597 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/scythe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/spear.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/spear.png new file mode 100644 index 00000000..53848838 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/spear.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/twinblade.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/twinblade.png new file mode 100644 index 00000000..e6e6ff7c Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/twinblade.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/warglaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/warglaive.png new file mode 100644 index 00000000..d1e4baa6 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-gold/warglaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/chakram.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/chakram.png new file mode 100644 index 00000000..a2f93d86 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/chakram.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/claymore.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/claymore.png new file mode 100644 index 00000000..45693578 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/claymore.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/cutlass.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/cutlass.png new file mode 100644 index 00000000..145d7bd6 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/cutlass.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/glaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/glaive.png new file mode 100644 index 00000000..8e9c78bb Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/glaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/greataxe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/greataxe.png new file mode 100644 index 00000000..b6c6574b Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/greataxe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/greathammer.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/greathammer.png new file mode 100644 index 00000000..e106502e Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/greathammer.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/halberd.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/halberd.png new file mode 100644 index 00000000..39aef846 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/halberd.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/katana.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/katana.png new file mode 100644 index 00000000..168300b4 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/katana.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/longsword.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/longsword.png new file mode 100644 index 00000000..df5e6656 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/longsword.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/rapier.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/rapier.png new file mode 100644 index 00000000..4068076f Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/rapier.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/sai.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/sai.png new file mode 100644 index 00000000..cc6090e0 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/sai.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/scythe.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/scythe.png new file mode 100644 index 00000000..e66e50fa Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/scythe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/spear.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/spear.png new file mode 100644 index 00000000..b8b74876 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/spear.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/twinblade.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/twinblade.png new file mode 100644 index 00000000..6a9473d6 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/twinblade.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/warglaive.png b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/warglaive.png new file mode 100644 index 00000000..48f9c8e6 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/advancednetherite_compat/netherite-iron/warglaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_chakram.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_chakram.png new file mode 100644 index 00000000..8cea5ef2 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_chakram.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_claymore.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_claymore.png new file mode 100644 index 00000000..4617adc4 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_claymore.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_cutlass.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_cutlass.png new file mode 100644 index 00000000..6f8eb62a Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_cutlass.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_glaive.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_glaive.png new file mode 100644 index 00000000..fb887ea0 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_glaive.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_greataxe.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_greataxe.png new file mode 100644 index 00000000..b1c0f348 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_greataxe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_greathammer.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_greathammer.png new file mode 100644 index 00000000..098f5f01 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_greathammer.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_halberd.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_halberd.png new file mode 100644 index 00000000..0b023632 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_halberd.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_katana.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_katana.png new file mode 100644 index 00000000..0b98e955 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_katana.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_longsword.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_longsword.png new file mode 100644 index 00000000..6781193b Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_longsword.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_rapier.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_rapier.png new file mode 100644 index 00000000..2caf60c9 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_rapier.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_sai.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_sai.png new file mode 100644 index 00000000..15af91c8 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_sai.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_scythe.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_scythe.png new file mode 100644 index 00000000..1d93670f Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_scythe.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_spear.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_spear.png new file mode 100644 index 00000000..2016d5b4 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_spear.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_twinblade.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_twinblade.png new file mode 100644 index 00000000..88401899 Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_twinblade.png differ diff --git a/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_warglaive.png b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_warglaive.png new file mode 100644 index 00000000..4245505c Binary files /dev/null and b/common/src/main/resources/assets/simplyswords/textures/item/dragonloot_compat/dragon_warglaive.png differ diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/chakram.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/chakram.json new file mode 100644 index 00000000..c46c3f91 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/chakram.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/chakram" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/chakram" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/claymore.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/claymore.json new file mode 100644 index 00000000..c2594815 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/claymore.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/claymore" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/claymore" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/cutlass.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/cutlass.json new file mode 100644 index 00000000..78015e9a --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/cutlass.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/cutlass" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/cutlass" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/glaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/glaive.json new file mode 100644 index 00000000..0dd12e2b --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/glaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/glaive" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/glaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/greataxe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/greataxe.json new file mode 100644 index 00000000..4cc38471 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/greataxe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/greataxe" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/greataxe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/greathammer.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/greathammer.json new file mode 100644 index 00000000..d0e9a05f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/greathammer.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/greathammer" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/greathammer" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/halberd.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/halberd.json new file mode 100644 index 00000000..23929d9c --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/halberd.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/halberd" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/halberd" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/katana.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/katana.json new file mode 100644 index 00000000..1f83c1cc --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/katana.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/katana" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/katana" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/longsword.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/longsword.json new file mode 100644 index 00000000..8dbf06ff --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/longsword.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/longsword" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/longsword" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/rapier.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/rapier.json new file mode 100644 index 00000000..3f9cc77e --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/rapier.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/rapier" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/rapier" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/sai.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/sai.json new file mode 100644 index 00000000..4aad36c2 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/sai.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/sai" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/sai" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/scythe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/scythe.json new file mode 100644 index 00000000..0675cd5b --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/scythe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/scythe" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/scythe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/spear.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/spear.json new file mode 100644 index 00000000..7cec1f08 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/spear.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/spear" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/spear" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/twinblade.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/twinblade.json new file mode 100644 index 00000000..ec774833 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/twinblade.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/twinblade" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/twinblade" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/warglaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/warglaive.json new file mode 100644 index 00000000..5a6ec297 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-diamond/warglaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-emerald/warglaive" + }, + "addition": { + "item": "advancednetherite:netherite_diamond_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-diamond/warglaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/chakram.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/chakram.json new file mode 100644 index 00000000..3a232d37 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/chakram.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/chakram" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/chakram" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/claymore.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/claymore.json new file mode 100644 index 00000000..e301bbda --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/claymore.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/claymore" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/claymore" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/cutlass.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/cutlass.json new file mode 100644 index 00000000..c3e6c3f8 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/cutlass.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/cutlass" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/cutlass" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/glaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/glaive.json new file mode 100644 index 00000000..aba7a1f0 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/glaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/glaive" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/glaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/greataxe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/greataxe.json new file mode 100644 index 00000000..63fa2f1c --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/greataxe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/greataxe" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/greataxe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/greathammer.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/greathammer.json new file mode 100644 index 00000000..4639b05f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/greathammer.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/greathammer" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/greathammer" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/halberd.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/halberd.json new file mode 100644 index 00000000..40734423 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/halberd.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/halberd" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/halberd" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/katana.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/katana.json new file mode 100644 index 00000000..03513fc9 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/katana.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/katana" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/katana" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/longsword.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/longsword.json new file mode 100644 index 00000000..67484584 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/longsword.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/longsword" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/longsword" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/rapier.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/rapier.json new file mode 100644 index 00000000..0ed53ef0 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/rapier.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/rapier" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/rapier" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/sai.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/sai.json new file mode 100644 index 00000000..c7f5a1b6 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/sai.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/sai" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/sai" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/scythe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/scythe.json new file mode 100644 index 00000000..bc037790 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/scythe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/scythe" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/scythe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/spear.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/spear.json new file mode 100644 index 00000000..23027244 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/spear.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/spear" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/spear" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/twinblade.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/twinblade.json new file mode 100644 index 00000000..f13507b6 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/twinblade.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/twinblade" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/twinblade" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/warglaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/warglaive.json new file mode 100644 index 00000000..d6f06c9d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-emerald/warglaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-gold/warglaive" + }, + "addition": { + "item": "advancednetherite:netherite_emerald_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-emerald/warglaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/chakram.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/chakram.json new file mode 100644 index 00000000..2e3b66ad --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/chakram.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/chakram" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/chakram" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/claymore.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/claymore.json new file mode 100644 index 00000000..8d61491f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/claymore.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/claymore" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/claymore" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/cutlass.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/cutlass.json new file mode 100644 index 00000000..7f72fab5 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/cutlass.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/cutlass" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/cutlass" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/glaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/glaive.json new file mode 100644 index 00000000..b2a7de2a --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/glaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/glaive" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/glaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/greataxe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/greataxe.json new file mode 100644 index 00000000..347a868c --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/greataxe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/greataxe" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/greataxe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/greathammer.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/greathammer.json new file mode 100644 index 00000000..e82bf86f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/greathammer.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/greathammer" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/greathammer" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/halberd.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/halberd.json new file mode 100644 index 00000000..a2a81658 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/halberd.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/halberd" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/halberd" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/katana.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/katana.json new file mode 100644 index 00000000..51c15407 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/katana.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/katana" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/katana" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/longsword.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/longsword.json new file mode 100644 index 00000000..8d0b7bf9 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/longsword.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/longsword" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/longsword" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/rapier.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/rapier.json new file mode 100644 index 00000000..015d8ab2 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/rapier.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/rapier" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/rapier" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/sai.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/sai.json new file mode 100644 index 00000000..7d58f1ed --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/sai.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/sai" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/sai" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/scythe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/scythe.json new file mode 100644 index 00000000..bc04626f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/scythe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/scythe" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/scythe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/spear.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/spear.json new file mode 100644 index 00000000..18ea5e50 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/spear.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/spear" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/spear" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/twinblade.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/twinblade.json new file mode 100644 index 00000000..1c7b1751 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/twinblade.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/twinblade" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/twinblade" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/warglaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/warglaive.json new file mode 100644 index 00000000..2c01eb12 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-gold/warglaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:advancednetherite/netherite-iron/warglaive" + }, + "addition": { + "item": "advancednetherite:netherite_gold_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-gold/warglaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/chakram.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/chakram.json new file mode 100644 index 00000000..4c101480 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/chakram.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_chakram" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/chakram" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/claymore.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/claymore.json new file mode 100644 index 00000000..5b3f8287 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/claymore.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_claymore" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/claymore" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/cutlass.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/cutlass.json new file mode 100644 index 00000000..5735df5b --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/cutlass.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_cutlass" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/cutlass" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/glaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/glaive.json new file mode 100644 index 00000000..cb03e0af --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/glaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_glaive" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/glaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/greataxe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/greataxe.json new file mode 100644 index 00000000..47165a33 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/greataxe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_greataxe" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/greataxe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/greathammer.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/greathammer.json new file mode 100644 index 00000000..df1a4361 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/greathammer.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_greathammer" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/greathammer" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/halberd.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/halberd.json new file mode 100644 index 00000000..9bda1560 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/halberd.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_halberd" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/halberd" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/katana.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/katana.json new file mode 100644 index 00000000..3cfbb6d0 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/katana.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_katana" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/katana" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/longsword.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/longsword.json new file mode 100644 index 00000000..55109d35 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/longsword.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_longsword" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/longsword" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/rapier.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/rapier.json new file mode 100644 index 00000000..f95ccaef --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/rapier.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_rapier" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/rapier" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/sai.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/sai.json new file mode 100644 index 00000000..1e43f665 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/sai.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_sai" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/sai" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/scythe.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/scythe.json new file mode 100644 index 00000000..d6e23297 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/scythe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_scythe" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/scythe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/spear.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/spear.json new file mode 100644 index 00000000..5d0c83de --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/spear.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_spear" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/spear" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/twinblade.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/twinblade.json new file mode 100644 index 00000000..96cd227b --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/twinblade.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_twinblade" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/twinblade" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/warglaive.json b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/warglaive.json new file mode 100644 index 00000000..c31bb402 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/advancednetherite/netherite-iron/warglaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "advancednetherite" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "advancednetherite" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:netherite_warglaive" + }, + "addition": { + "item": "advancednetherite:netherite_iron_ingot" + }, + "result": { + "item": "simplyswords:advancednetherite/netherite-iron/warglaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/chakram.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/chakram.json new file mode 100644 index 00000000..d8bfd5dd --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/chakram.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/chakram" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/chakram" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/claymore.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/claymore.json new file mode 100644 index 00000000..24b47479 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/claymore.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/claymore" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/claymore" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/cutlass.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/cutlass.json new file mode 100644 index 00000000..18c0ec39 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/cutlass.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/cutlass" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/cutlass" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/glaive.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/glaive.json new file mode 100644 index 00000000..6b1d1e46 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/glaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/glaive" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/glaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/greataxe.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/greataxe.json new file mode 100644 index 00000000..89f10f38 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/greataxe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/greataxe" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/greataxe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/greathammer.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/greathammer.json new file mode 100644 index 00000000..ab066507 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/greathammer.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/greathammer" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/greathammer" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/halberd.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/halberd.json new file mode 100644 index 00000000..d6c9cdb9 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/halberd.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/halberd" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/halberd" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/katana.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/katana.json new file mode 100644 index 00000000..6fa33712 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/katana.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/katana" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/katana" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/longsword.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/longsword.json new file mode 100644 index 00000000..1ebf0c9e --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/longsword.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/longsword" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/longsword" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/rapier.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/rapier.json new file mode 100644 index 00000000..e3b9af8d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/rapier.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/rapier" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/rapier" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/sai.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/sai.json new file mode 100644 index 00000000..a9f2283d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/sai.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/sai" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/sai" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/scythe.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/scythe.json new file mode 100644 index 00000000..c43f0cc2 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/scythe.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/scythe" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/scythe" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/spear.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/spear.json new file mode 100644 index 00000000..a0652f8d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/spear.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/spear" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/spear" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/twinblade.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/twinblade.json new file mode 100644 index 00000000..0874fb18 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/twinblade.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/twinblade" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/twinblade" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/recipes/dragon_loot/warglaive.json b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/warglaive.json new file mode 100644 index 00000000..681ad6b7 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/recipes/dragon_loot/warglaive.json @@ -0,0 +1,29 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dragonloot" + ] + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dragonloot" + } + ], + "type": "minecraft:smithing_transform", + "base": { + "item": "simplyswords:dragon_loot/dragon_scale/warglaive" + }, + "addition": { + "item": "dragonloot:dragon_scale" + }, + "result": { + "item": "simplyswords:dragon_loot/warglaive" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/tags/items/netherite_diamond_tools.json b/common/src/main/resources/data/simplyswords/tags/items/netherite_diamond_tools.json new file mode 100644 index 00000000..f37f916e --- /dev/null +++ b/common/src/main/resources/data/simplyswords/tags/items/netherite_diamond_tools.json @@ -0,0 +1,65 @@ +{ + "replace": false, + "values": [ + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_claymore", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_cutlass", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_glaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_katana", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_longsword", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_rapier", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_sai", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_spear", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_twinblade", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_warglaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_greathammer", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_greataxe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_chakram", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_scythe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_diamond/netherite_diamond_halberd", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/tags/items/netherite_emerald_tools.json b/common/src/main/resources/data/simplyswords/tags/items/netherite_emerald_tools.json new file mode 100644 index 00000000..9daddeff --- /dev/null +++ b/common/src/main/resources/data/simplyswords/tags/items/netherite_emerald_tools.json @@ -0,0 +1,65 @@ +{ + "replace": false, + "values": [ + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_claymore", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_cutlass", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_glaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_katana", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_longsword", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_rapier", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_sai", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_spear", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_twinblade", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_warglaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_greathammer", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_greataxe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_chakram", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_scythe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_emerald/netherite_emerald_halberd", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/tags/items/netherite_gold_tools.json b/common/src/main/resources/data/simplyswords/tags/items/netherite_gold_tools.json new file mode 100644 index 00000000..4da4e3bc --- /dev/null +++ b/common/src/main/resources/data/simplyswords/tags/items/netherite_gold_tools.json @@ -0,0 +1,65 @@ +{ + "replace": false, + "values": [ + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_claymore", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_cutlass", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_glaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_katana", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_longsword", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_rapier", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_sai", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_spear", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_twinblade", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_warglaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_greathammer", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_greataxe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_chakram", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_scythe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_gold/netherite_gold_halberd", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/tags/items/netherite_iron_tools.json b/common/src/main/resources/data/simplyswords/tags/items/netherite_iron_tools.json new file mode 100644 index 00000000..970d838f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/tags/items/netherite_iron_tools.json @@ -0,0 +1,65 @@ +{ + "replace": false, + "values": [ + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_claymore", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_cutlass", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_glaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_katana", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_longsword", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_rapier", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_sai", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_spear", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_twinblade", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_warglaive", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_greathammer", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_greataxe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_chakram", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_scythe", + "required": false + }, + { + "id": "simplyswords:advancednetherite_compat/netherite_iron/netherite_iron_halberd", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/chakram.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/chakram.json new file mode 100644 index 00000000..e96bda11 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/chakram.json @@ -0,0 +1,44 @@ +{ + "attributes": { + "attack_range": 5.0, + "two_handed": false, + "category": "chakram", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:one_handed_chakram_throw_left", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "OFF_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin_long_grounded", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/claymore.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/claymore.json new file mode 100644 index 00000000..8be7a9d9 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/claymore.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:claymore", + "attributes": { + "attack_range": 3.5, + "two_handed": true, + "category": "claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/cutlass.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/cutlass.json new file mode 100644 index 00000000..c681681d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/cutlass.json @@ -0,0 +1,7 @@ +{ + "parent": "bettercombat:sickle", + "attributes": { + "attack_range": 2.5, + "category": "sickle" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/glaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/glaive.json new file mode 100644 index 00000000..e4b76c3f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/glaive.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:glaive" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/greataxe.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/greataxe.json new file mode 100644 index 00000000..7ee8f316 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/greataxe.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "category": "greataxe", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.4, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:claymore_swing", + "pitch": 1.1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/greathammer.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/greathammer.json new file mode 100644 index 00000000..8670a024 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/greathammer.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "pose": "bettercombat:pose_two_handed_heavy", + "category": "greathammer", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.5, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam", + "swing_sound": { + "id": "bettercombat:hammer_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/halberd.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/halberd.json new file mode 100644 index 00000000..288c8f25 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/halberd.json @@ -0,0 +1,58 @@ +{ + "attributes": { + "attack_range": 4, + "category": "halberd", + "pose": "simplyswords:pose_halberd", + "two_handed": true, + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1 + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "simplyswords:halberd_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 0.8 + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.6, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/katana.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/katana.json new file mode 100644 index 00000000..91034928 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/katana.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:katana", + "attributes": { + "attack_range": 2.9, + "two_handed": true, + "category": "katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/longsword.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/longsword.json new file mode 100644 index 00000000..b539baa7 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/longsword.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 2.9, + "category": "sword", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.4, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:sword_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/rapier.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/rapier.json new file mode 100644 index 00000000..8d3980c1 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/rapier.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:rapier" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/sai.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/sai.json new file mode 100644 index 00000000..20d3566e --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/sai.json @@ -0,0 +1,19 @@ +{ + "attributes": { + "attack_range": 1.8, + "category": "soul_knife", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:dagger_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/spear.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/spear.json new file mode 100644 index 00000000..9a70ab90 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "bettercombat:trident", + "attributes": { + "attack_range": 3.1 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/twinblade.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/twinblade.json new file mode 100644 index 00000000..af5c19ec --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/twinblade.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 3, + "two_handed": true, + "category": "battlestaff", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/warglaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/warglaive.json new file mode 100644 index 00000000..eeca8d83 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-diamond/warglaive.json @@ -0,0 +1,42 @@ +{ + "attributes": { + "attack_range": 2.6, + "pose": "simplyswords:pose_warglaive_dual_animated", + "two_handed": false, + "category": "warglaive", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["NOT_DUAL_WIELDING"], + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:warglaive_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/chakram.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/chakram.json new file mode 100644 index 00000000..e96bda11 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/chakram.json @@ -0,0 +1,44 @@ +{ + "attributes": { + "attack_range": 5.0, + "two_handed": false, + "category": "chakram", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:one_handed_chakram_throw_left", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "OFF_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin_long_grounded", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/claymore.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/claymore.json new file mode 100644 index 00000000..8be7a9d9 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/claymore.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:claymore", + "attributes": { + "attack_range": 3.5, + "two_handed": true, + "category": "claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/cutlass.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/cutlass.json new file mode 100644 index 00000000..c681681d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/cutlass.json @@ -0,0 +1,7 @@ +{ + "parent": "bettercombat:sickle", + "attributes": { + "attack_range": 2.5, + "category": "sickle" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/glaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/glaive.json new file mode 100644 index 00000000..e4b76c3f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/glaive.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:glaive" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/greataxe.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/greataxe.json new file mode 100644 index 00000000..7ee8f316 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/greataxe.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "category": "greataxe", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.4, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:claymore_swing", + "pitch": 1.1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/greathammer.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/greathammer.json new file mode 100644 index 00000000..8670a024 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/greathammer.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "pose": "bettercombat:pose_two_handed_heavy", + "category": "greathammer", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.5, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam", + "swing_sound": { + "id": "bettercombat:hammer_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/halberd.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/halberd.json new file mode 100644 index 00000000..288c8f25 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/halberd.json @@ -0,0 +1,58 @@ +{ + "attributes": { + "attack_range": 4, + "category": "halberd", + "pose": "simplyswords:pose_halberd", + "two_handed": true, + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1 + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "simplyswords:halberd_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 0.8 + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.6, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/katana.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/katana.json new file mode 100644 index 00000000..91034928 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/katana.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:katana", + "attributes": { + "attack_range": 2.9, + "two_handed": true, + "category": "katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/longsword.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/longsword.json new file mode 100644 index 00000000..b539baa7 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/longsword.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 2.9, + "category": "sword", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.4, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:sword_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/rapier.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/rapier.json new file mode 100644 index 00000000..8d3980c1 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/rapier.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:rapier" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/sai.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/sai.json new file mode 100644 index 00000000..20d3566e --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/sai.json @@ -0,0 +1,19 @@ +{ + "attributes": { + "attack_range": 1.8, + "category": "soul_knife", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:dagger_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/spear.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/spear.json new file mode 100644 index 00000000..9a70ab90 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "bettercombat:trident", + "attributes": { + "attack_range": 3.1 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/twinblade.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/twinblade.json new file mode 100644 index 00000000..af5c19ec --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/twinblade.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 3, + "two_handed": true, + "category": "battlestaff", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/warglaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/warglaive.json new file mode 100644 index 00000000..eeca8d83 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-emerald/warglaive.json @@ -0,0 +1,42 @@ +{ + "attributes": { + "attack_range": 2.6, + "pose": "simplyswords:pose_warglaive_dual_animated", + "two_handed": false, + "category": "warglaive", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["NOT_DUAL_WIELDING"], + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:warglaive_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/chakram.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/chakram.json new file mode 100644 index 00000000..e96bda11 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/chakram.json @@ -0,0 +1,44 @@ +{ + "attributes": { + "attack_range": 5.0, + "two_handed": false, + "category": "chakram", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:one_handed_chakram_throw_left", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "OFF_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin_long_grounded", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/claymore.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/claymore.json new file mode 100644 index 00000000..8be7a9d9 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/claymore.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:claymore", + "attributes": { + "attack_range": 3.5, + "two_handed": true, + "category": "claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/cutlass.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/cutlass.json new file mode 100644 index 00000000..c681681d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/cutlass.json @@ -0,0 +1,7 @@ +{ + "parent": "bettercombat:sickle", + "attributes": { + "attack_range": 2.5, + "category": "sickle" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/glaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/glaive.json new file mode 100644 index 00000000..e4b76c3f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/glaive.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:glaive" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/greataxe.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/greataxe.json new file mode 100644 index 00000000..7ee8f316 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/greataxe.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "category": "greataxe", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.4, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:claymore_swing", + "pitch": 1.1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/greathammer.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/greathammer.json new file mode 100644 index 00000000..8670a024 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/greathammer.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "pose": "bettercombat:pose_two_handed_heavy", + "category": "greathammer", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.5, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam", + "swing_sound": { + "id": "bettercombat:hammer_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/halberd.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/halberd.json new file mode 100644 index 00000000..288c8f25 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/halberd.json @@ -0,0 +1,58 @@ +{ + "attributes": { + "attack_range": 4, + "category": "halberd", + "pose": "simplyswords:pose_halberd", + "two_handed": true, + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1 + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "simplyswords:halberd_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 0.8 + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.6, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/katana.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/katana.json new file mode 100644 index 00000000..91034928 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/katana.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:katana", + "attributes": { + "attack_range": 2.9, + "two_handed": true, + "category": "katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/longsword.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/longsword.json new file mode 100644 index 00000000..b539baa7 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/longsword.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 2.9, + "category": "sword", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.4, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:sword_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/rapier.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/rapier.json new file mode 100644 index 00000000..8d3980c1 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/rapier.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:rapier" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/sai.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/sai.json new file mode 100644 index 00000000..20d3566e --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/sai.json @@ -0,0 +1,19 @@ +{ + "attributes": { + "attack_range": 1.8, + "category": "soul_knife", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:dagger_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/spear.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/spear.json new file mode 100644 index 00000000..9a70ab90 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "bettercombat:trident", + "attributes": { + "attack_range": 3.1 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/twinblade.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/twinblade.json new file mode 100644 index 00000000..af5c19ec --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/twinblade.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 3, + "two_handed": true, + "category": "battlestaff", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/warglaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/warglaive.json new file mode 100644 index 00000000..eeca8d83 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-gold/warglaive.json @@ -0,0 +1,42 @@ +{ + "attributes": { + "attack_range": 2.6, + "pose": "simplyswords:pose_warglaive_dual_animated", + "two_handed": false, + "category": "warglaive", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["NOT_DUAL_WIELDING"], + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:warglaive_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/chakram.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/chakram.json new file mode 100644 index 00000000..e96bda11 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/chakram.json @@ -0,0 +1,44 @@ +{ + "attributes": { + "attack_range": 5.0, + "two_handed": false, + "category": "chakram", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:one_handed_chakram_throw_left", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "OFF_HAND_ONLY"], + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:chakram_spin_long_grounded", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/claymore.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/claymore.json new file mode 100644 index 00000000..8be7a9d9 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/claymore.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:claymore", + "attributes": { + "attack_range": 3.5, + "two_handed": true, + "category": "claymore" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/cutlass.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/cutlass.json new file mode 100644 index 00000000..c681681d --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/cutlass.json @@ -0,0 +1,7 @@ +{ + "parent": "bettercombat:sickle", + "attributes": { + "attack_range": 2.5, + "category": "sickle" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/glaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/glaive.json new file mode 100644 index 00000000..e4b76c3f --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/glaive.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:glaive" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/greataxe.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/greataxe.json new file mode 100644 index 00000000..7ee8f316 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/greataxe.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "category": "greataxe", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.4, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:claymore_swing", + "pitch": 1.1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/greathammer.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/greathammer.json new file mode 100644 index 00000000..8670a024 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/greathammer.json @@ -0,0 +1,41 @@ +{ + "parent": "bettercombat:heavy_axe", + "attributes" : { + "attack_range": 3.5, + "pose": "bettercombat:pose_two_handed_heavy", + "category": "greathammer", + "two_handed": true, + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:double_axe_swing" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.5, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam", + "swing_sound": { + "id": "bettercombat:hammer_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/halberd.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/halberd.json new file mode 100644 index 00000000..288c8f25 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/halberd.json @@ -0,0 +1,58 @@ +{ + "attributes": { + "attack_range": 4, + "category": "halberd", + "pose": "simplyswords:pose_halberd", + "two_handed": true, + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1 + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "simplyswords:halberd_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab", + "volume": 0.5, + "pitch": 1.2 + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "simplyswords:halberd_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 0.8 + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.6, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow", + "volume": 0.5, + "pitch": 1 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/katana.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/katana.json new file mode 100644 index 00000000..91034928 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/katana.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:katana", + "attributes": { + "attack_range": 2.9, + "two_handed": true, + "category": "katana" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/longsword.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/longsword.json new file mode 100644 index 00000000..b539baa7 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/longsword.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 2.9, + "category": "sword", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.4, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:sword_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/rapier.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/rapier.json new file mode 100644 index 00000000..8d3980c1 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/rapier.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:rapier" +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/sai.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/sai.json new file mode 100644 index 00000000..20d3566e --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/sai.json @@ -0,0 +1,19 @@ +{ + "attributes": { + "attack_range": 1.8, + "category": "soul_knife", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:dagger_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/spear.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/spear.json new file mode 100644 index 00000000..9a70ab90 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/spear.json @@ -0,0 +1,6 @@ +{ + "parent": "bettercombat:trident", + "attributes": { + "attack_range": 3.1 + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/twinblade.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/twinblade.json new file mode 100644 index 00000000..af5c19ec --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/twinblade.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 3, + "two_handed": true, + "category": "battlestaff", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/warglaive.json b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/warglaive.json new file mode 100644 index 00000000..eeca8d83 --- /dev/null +++ b/common/src/main/resources/data/simplyswords/weapon_attributes/advancednetherite_compat/netherite-iron/warglaive.json @@ -0,0 +1,42 @@ +{ + "attributes": { + "attack_range": 2.6, + "pose": "simplyswords:pose_warglaive_dual_animated", + "two_handed": false, + "category": "warglaive", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["NOT_DUAL_WIELDING"], + "damage_multiplier": 1, + "angle": 180, + "upswing": 0.5, + "animation": "simplyswords:warglaive_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1.2, + "angle": 360, + "upswing": 0.5, + "animation": "simplyswords:warglaive_spin", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + } + ] + } +} \ No newline at end of file