diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/anchor.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/anchor.json new file mode 100644 index 000000000..3694339b3 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/anchor.json @@ -0,0 +1,19 @@ +{ + "attributes": { + "attack_range": 2.75, + "two_handed": true, + "category": "anchor", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam_heavy", + "swing_sound": { + "id": "bettercombat:anchor_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/axe.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/axe.json new file mode 100644 index 000000000..78669723a --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/axe.json @@ -0,0 +1,26 @@ +{ + "attributes": { + "attack_range": 2.5, + "category": "axe", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "angle": 90, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:axe_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "angle": 90, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:axe_slash" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/battlestaff.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/battlestaff.json new file mode 100644 index 000000000..904e6926f --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/battlestaff.json @@ -0,0 +1,67 @@ +{ + "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:staff_spin" + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.4, + "angle": 160, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam", + "swing_sound": { + "id": "bettercombat:staff_slam" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 0.8, + "upswing": 0.5, + "animation": "bettercombat:two_handed_stab_left", + "swing_sound": { + "id": "bettercombat:staff_stab" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 0.8, + "upswing": 0.5, + "animation": "bettercombat:two_handed_stab_right", + "swing_sound": { + "id": "bettercombat:staff_stab" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/bow_two_handed_heavy.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/bow_two_handed_heavy.json new file mode 100644 index 000000000..4a6892904 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/bow_two_handed_heavy.json @@ -0,0 +1,7 @@ +{ + "attributes": { + "attack_range": 0, + "two_handed": true, + "pose": "bettercombat:pose_two_handed_bow" + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/bow_two_handed_light.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/bow_two_handed_light.json new file mode 100644 index 000000000..f45ef9b76 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/bow_two_handed_light.json @@ -0,0 +1,6 @@ +{ + "attributes": { + "attack_range": 0, + "two_handed": true + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/claw.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/claw.json new file mode 100644 index 000000000..7131280bf --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/claw.json @@ -0,0 +1,25 @@ +{ + "attributes": { + "attack_range": 2.1, + "category": "claw", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "upswing": 0.5, + "animation": "bettercombat:one_handed_punch", + "swing_sound": { + "id": "bettercombat:fist_punch" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_swipe_horizontal_right", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/claymore.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/claymore.json new file mode 100644 index 000000000..64774534c --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/claymore.json @@ -0,0 +1,41 @@ +{ + "attributes": { + "attack_range": 2.75, + "two_handed": true, + "pose": "bettercombat:pose_two_handed_sword", + "category": "claymore", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.75, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:claymore_swing" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_stab_left", + "swing_sound": { + "id": "bettercombat:claymore_stab" + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.25, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam", + "swing_sound": { + "id": "bettercombat:claymore_slam", + "randomness": 0 + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/coral_blade.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/coral_blade.json new file mode 100644 index 000000000..3f9a66e1e --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/coral_blade.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 2.5, + "category": "coral_blade", + "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": "VERTICAL_PLANE", + "damage_multiplier": 1, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_uppercut_right", + "swing_sound": { + "id": "bettercombat:sword_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/crossbow_two_handed_heavy.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/crossbow_two_handed_heavy.json new file mode 100644 index 000000000..065ff1adf --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/crossbow_two_handed_heavy.json @@ -0,0 +1,7 @@ +{ + "attributes": { + "attack_range": 0, + "two_handed": true, + "pose": "bettercombat:pose_two_handed_crossbow" + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/crossbow_two_handed_light.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/crossbow_two_handed_light.json new file mode 100644 index 000000000..f45ef9b76 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/crossbow_two_handed_light.json @@ -0,0 +1,6 @@ +{ + "attributes": { + "attack_range": 0, + "two_handed": true + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/cutlass.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/cutlass.json new file mode 100644 index 000000000..91b6bc460 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/cutlass.json @@ -0,0 +1,11 @@ +{ + "parent": "bettercombat:sword", + "attributes" : { + "attack_range": 2.4, + "category": "cutlass", + "attacks": [ + {}, + {} + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/dagger.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/dagger.json new file mode 100644 index 000000000..7322058bc --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/dagger.json @@ -0,0 +1,40 @@ +{ + "attributes": { + "attack_range": 2, + "two_handed": false, + "category": "dagger", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:dagger_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:dagger_slash" + } + }, + { + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.4, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:dual_handed_stab", + "swing_sound": { + "id": "bettercombat:dagger_slash" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/double_axe.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/double_axe.json new file mode 100644 index 000000000..d153328b7 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/double_axe.json @@ -0,0 +1,30 @@ +{ + "attributes": { + "attack_range": 2.5, + "two_handed": true, + "category": "double_axe", + "attacks": [ + { + "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": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 360, + "upswing": 0.5, + "animation": "bettercombat:two_handed_spin", + "swing_sound": { + "id": "bettercombat:double_axe_swing", + "pitch": 1.1 + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/fist.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/fist.json new file mode 100644 index 000000000..2d1652c81 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/fist.json @@ -0,0 +1,16 @@ +{ + "attributes": { + "attack_range": 2, + "category": "fist", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "upswing": 0.5, + "animation": "bettercombat:one_handed_punch", + "swing_sound": { + "id": "bettercombat:fist_punch" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/glaive.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/glaive.json new file mode 100644 index 000000000..7b440aae8 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/glaive.json @@ -0,0 +1,40 @@ +{ + "attributes": { + "attack_range": 3.25, + "pose": "bettercombat:pose_two_handed_polearm", + "two_handed": true, + "category": "glaive", + "attacks": [ + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 0.8, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 0.8, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_left", + "swing_sound": { + "id": "bettercombat:glaive_slash_quick" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1.4, + "angle": 180, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/halberd.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/halberd.json new file mode 100644 index 000000000..019f94477 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/halberd.json @@ -0,0 +1,30 @@ +{ + "attributes": { + "attack_range": 3.5, + "pose": "bettercombat:pose_two_handed_polearm", + "two_handed": true, + "category": "halberd", + "attacks": [ + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 0.8, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_left", + "swing_sound": { + "id": "bettercombat:glaive_slash_slow" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.2, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/hammer.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/hammer.json new file mode 100644 index 000000000..e14961e35 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/hammer.json @@ -0,0 +1,20 @@ +{ + "attributes": { + "attack_range": 2.75, + "pose": "bettercombat:pose_two_handed_heavy", + "two_handed": true, + "category": "hammer", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "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/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/heavy_axe.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/heavy_axe.json new file mode 100644 index 000000000..d34833fda --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/heavy_axe.json @@ -0,0 +1,8 @@ +{ + "parent": "bettercombat:double_axe", + "attributes" : { + "pose": "bettercombat:pose_two_handed_heavy", + "category": "heavy_axe", + "two_handed": true + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/katana.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/katana.json new file mode 100644 index 000000000..ab1e599b4 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/katana.json @@ -0,0 +1,50 @@ +{ + "attributes": { + "attack_range": 2.75, + "pose": "bettercombat:pose_two_handed_katana", + "two_handed": true, + "category": "katana", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:katana_slash" + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.2, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_left", + "swing_sound": { + "id": "bettercombat:katana_slash" + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.2, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_vertical_right", + "swing_sound": { + "id": "bettercombat:katana_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:katana_slash" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/lance.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/lance.json new file mode 100644 index 000000000..8d471be52 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/lance.json @@ -0,0 +1,27 @@ +{ + "attributes" : { + "attack_range": 3.5, + "two_handed": false, + "category": "lance", + "attacks": [ + { + "conditions": ["NOT_MOUNTED"], + "hitbox": "FORWARD_BOX", + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:spear_stab" + } + }, + { + "conditions": ["MOUNTED"], + "hitbox": "FORWARD_BOX", + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab_mounted", + "swing_sound": { + "id": "bettercombat:spear_stab" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/mace.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/mace.json new file mode 100644 index 000000000..509de6cd6 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/mace.json @@ -0,0 +1,38 @@ +{ + "attributes": { + "attack_range": 2.5, + "category": "mace", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:mace_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:mace_slash" + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.4, + "angle": 90, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slam", + "swing_sound": { + "id": "bettercombat:mace_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/pickaxe.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/pickaxe.json new file mode 100644 index 000000000..e90565bec --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/pickaxe.json @@ -0,0 +1,18 @@ +{ + "attributes": { + "attack_range": 2.5, + "category": "pickaxe", + "attacks": [ + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1, + "angle": 90, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slam", + "swing_sound": { + "id": "bettercombat:pickaxe_swing" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/rapier.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/rapier.json new file mode 100644 index 000000000..3d7cb8f46 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/rapier.json @@ -0,0 +1,28 @@ +{ + "attributes": { + "attack_range": 2.75, + "category": "rapier", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.9, + "angle": 90, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:rapier_slash" + } + }, + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1.1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:rapier_stab" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/scythe.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/scythe.json new file mode 100644 index 000000000..d6f2664a1 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/scythe.json @@ -0,0 +1,30 @@ +{ + "attributes": { + "attack_range": 3.5, + "pose": "bettercombat:pose_two_handed_scythe", + "two_handed": true, + "category": "scythe", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:scythe_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:scythe_slash" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/sickle.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/sickle.json new file mode 100644 index 000000000..e3eb4bb2a --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/sickle.json @@ -0,0 +1,52 @@ +{ + "attributes": { + "attack_range": 2.5, + "category": "sickle", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.9, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.9, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:sickle_slash" + } + }, + { + "hitbox": "FORWARD_BOX", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "MAIN_HAND_ONLY"], + "damage_multiplier": 1.2, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:dual_handed_slash_cross", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 0.8 + } + }, + { + "hitbox": "FORWARD_BOX", + "conditions": ["DUAL_WIELDING_SAME_CATEGORY", "OFF_HAND_ONLY"], + "damage_multiplier": 1.3, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:dual_handed_slash_uncross", + "swing_sound": { + "id": "bettercombat:sickle_slash", + "pitch": 1.2 + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/soul_knife.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/soul_knife.json new file mode 100644 index 000000000..61893b4c0 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/soul_knife.json @@ -0,0 +1,21 @@ +{ + "attributes": { + "attack_range": 2.5, + "two_handed": true, + "pose": "bettercombat:pose_two_handed_sword", + "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/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/spear.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/spear.json new file mode 100644 index 000000000..0ae94b7fe --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/spear.json @@ -0,0 +1,20 @@ +{ + "attributes": { + "attack_range": 3.5, + "pose": "bettercombat:pose_two_handed_polearm", + "two_handed": true, + "category": "spear", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "angle": 0, + "upswing": 0.5, + "animation": "bettercombat:two_handed_stab_right", + "swing_sound": { + "id": "bettercombat:spear_stab" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/staff.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/staff.json new file mode 100644 index 000000000..f3abcaacf --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/staff.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 3, + "two_handed": true, + "category": "staff", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 0.8, + "angle": 160, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_right", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 160, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slash_horizontal_left", + "swing_sound": { + "id": "bettercombat:staff_slash" + } + }, + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1.2, + "angle": 120, + "upswing": 0.5, + "animation": "bettercombat:two_handed_slam", + "swing_sound": { + "id": "bettercombat:staff_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/sword.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/sword.json new file mode 100644 index 000000000..3e20f9839 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/sword.json @@ -0,0 +1,39 @@ +{ + "attributes": { + "attack_range": 2.5, + "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, + "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/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/trident.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/trident.json new file mode 100644 index 000000000..67d65f4a7 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/trident.json @@ -0,0 +1,14 @@ +{ + "parent": "bettercombat:spear", + "attributes" : { + "attack_range": 2.75, + "pose": "", + "two_handed": false, + "category": "trident", + "attacks": [ + { + "animation": "bettercombat:one_handed_stab" + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/twin_blade.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/twin_blade.json new file mode 100644 index 000000000..94b106e02 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/twin_blade.json @@ -0,0 +1,30 @@ +{ + "attributes": { + "attack_range": 2.5, + "pose": "bettercombat:pose_two_handed_katana", + "two_handed": true, + "category": "twin_blade", + "attacks": [ + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_switch_blade_right", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + }, + { + "hitbox": "HORIZONTAL_PLANE", + "damage_multiplier": 1, + "angle": 150, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slash_switch_blade_left", + "swing_sound": { + "id": "bettercombat:sword_slash" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/vanilla_mace.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/vanilla_mace.json new file mode 100644 index 000000000..f9e5751be --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/vanilla_mace.json @@ -0,0 +1,18 @@ +{ + "attributes": { + "attack_range": 2.5, + "category": "mace", + "attacks": [ + { + "hitbox": "VERTICAL_PLANE", + "damage_multiplier": 1, + "angle": 90, + "upswing": 0.5, + "animation": "bettercombat:one_handed_slam", + "swing_sound": { + "id": "bettercombat:mace_slam" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/wand.json b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/wand.json new file mode 100644 index 000000000..70846289a --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/weapon_attributes/wand.json @@ -0,0 +1,17 @@ +{ + "attributes": { + "attack_range": 2.5, + "category": "wand", + "attacks": [ + { + "hitbox": "FORWARD_BOX", + "damage_multiplier": 1, + "upswing": 0.5, + "animation": "bettercombat:one_handed_stab", + "swing_sound": { + "id": "bettercombat:wand_swing" + } + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-deprecated/build.gradle b/content/forgero-deprecated/build.gradle new file mode 100644 index 000000000..85c10085e --- /dev/null +++ b/content/forgero-deprecated/build.gradle @@ -0,0 +1,4 @@ +dependencies { + implementation project(":content:${rootProject.mod_id}-vanilla") + testImplementation project(":content:${rootProject.mod_id}-vanilla") +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/deprecated.png b/content/forgero-deprecated/src/main/resources/assets/forgero/deprecated.png new file mode 100644 index 000000000..9c1e018b2 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/deprecated.png differ diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/icon.png b/content/forgero-deprecated/src/main/resources/assets/forgero/icon.png new file mode 100644 index 000000000..0c8360244 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/icon.png differ diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/lang/en_us.json b/content/forgero-deprecated/src/main/resources/assets/forgero/lang/en_us.json new file mode 100644 index 000000000..44be6c48c --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/lang/en_us.json @@ -0,0 +1,117 @@ +{ + "itemGroup.forgero.gems": "Gems", + "itemGroup.forgero.trinkets": "Trinkets", + "itemGroup.forgero.materials": "Materials", + "item.forgero.dragon_scale": "Dragon Scale", + "item.forgero.gem": "Gem", + "item.forgero.soul": "Soul", + "item.forgero.totem": "Totem", + "item.forgero.undying": "Undying", + "item.forgero.emerald": "Emerald", + "item.forgero.diamond": "Diamond", + "item.forgero.redstone": "Redstone", + "item.forgero.lapis": "Lapis Lazuli", + "item.forgero.ender": "Ender", + "item.forgero.stone_heart": "Stoneheart", + "item.forgero.blazed_stone_heart": "Blazed Stoneheart", + "tag.minecraft.base_stone_nether": "Nether stones", + "tag.minecraft.base_stone_overworld": "Stones", + "item.forgero.magnetico": "Magnetico", + "item.forgero.quartz": "Quartz", + "item.forgero.tsuba_sword_guard": "Tsuba Guard", + "item.forgero.refined_sword_guard": "Refined Sword Guard", + "item.forgero.mastercrafted_sword_guard": "Mastercrafted Sword Guard", + "item.forgero.duelling_sword_guard": "Duelling Guard", + "item.forgero.agile_sword_guard": "Agile Guard", + "item.forgero.polar_bear_pelt": "Polar Bear Pelt", + "item.forgero.katana_blade": "Katana Blade", + "item.forgero.broadsword_blade": "Broadsword Blade", + "item.forgero.shortsword_blade": "Shortsword Blade", + "item.forgero.refined_sword_blade": "Refined Sword Blade", + "item.forgero.refined_pommel": "Refined Pommel", + "item.forgero.mastercrafted_pommel": "Mastercrafted Pommel", + "item.forgero.mastercrafted_sword_blade": "Mastercrafted Sword Blade", + "item.forgero.serrated_sword_blade": "Serrated Sword Blade", + "item.forgero.scimitar_blade": "Scimitar Blade", + "item.forgero.rapier_blade": "Rapier Blade", + "item.forgero.knife_blade": "Knife Blade", + "item.forgero.sacrificial_dagger_blade": "Sacrificial Dagger Blade", + "item.forgero.slanted_sword_blade": "Slanted Sword Blade", + "item.forgero.battle_axe_head": "Battle Axe Head", + "item.forgero.tree_chopper_head": "Tree Chopper Axe Head", + "item.forgero.tree_feller_head": "Tree Feller Axe Head", + "item.forgero.path_digger_shovel_head": "Path Digger Shovel Head", + "item.forgero.grave_digger_head": "Grave Digger Shovel Head", + "item.forgero.lightweight_pickaxe_head": "Lightweight Pickaxe Head", + "description.forgero.lightweight_pickaxe_head": "A light, yet powerful pickaxe head", + "item.forgero.refined_pickaxe_head": "Refined Pickaxe Head", + "item.forgero.refined_axe_head": "Refined Axe Head", + "item.forgero.refined_axe": "Refined Axe", + "item.forgero.mastercrafted_axe_head": "Mastercrafted Axe Head", + "item.forgero.mastercrafted_axe": "Mastercrafted Axe", + "item.forgero.refined_handle": "Refined Handle", + "item.forgero.ore_miner_pickaxe_head": "Ore Mining Pickaxe Head", + "item.forgero.reaper_head": "Reaper Head", + "item.forgero.refined_hoe_head": "Refined Hoe Head", + "item.forgero.mastercrafted_hoe_head": "Mastercrafted Hoe Head", + "description.forgero.refined_pickaxe_head": "A classic, but significantly improved pickaxe head", + "item.forgero.mastercrafted_pickaxe_head": "Mastercrafted Pickaxe Head", + "description.forgero.mastercrafted_pickaxe_head": "A truly masterfully designed pickaxe head, better in every way", + "item.forgero.path_mining_pickaxe_head": "Path Mining Pickaxe Head", + "description.forgero.path_mining_pickaxe_head": "A unique pickaxe head, capable of mining a perfect corridor", + "item.forgero.refined_shovel_head": "Refined Shovel Head", + "description.forgero.refined_shovel_head": "A classic, but significantly improved shovel head", + "item.forgero.mastercrafted_shovel_head": "Mastercrafted Shovel Head", + "description.forgero.mastercrafted_shovel_head": "A truly masterfully designed shovel head, better in every way", + "item.forgero.adamantite": "Adamantite", + "item.forgero.aquarium": "Aquarium", + "item.forgero.banglum": "Banglum", + "item.forgero.bronze": "Bronze", + "item.forgero.carmot": "Carmot", + "item.forgero.celestium": "Celestium", + "item.forgero.hallowed": "Hallowed", + "item.forgero.durasteel": "Durasteel", + "item.forgero.kyber": "Kyber", + "item.forgero.manganese": "Manganese", + "item.forgero.metallurgium": "Metallurgium", + "item.forgero.midasgold": "Midas Gold", + "item.forgero.mythril": "Mythril", + "item.forgero.orichalcum": "Orichalcum", + "item.forgero.osmium": "Osmium", + "item.forgero.palladium": "Palladium", + "item.forgero.prometheum": "Prometheum", + "item.forgero.platinum": "Platinum", + "item.forgero.quadrillum": "Quadrillum", + "item.forgero.runite": "Runite", + "item.forgero.silver": "Silver", + "item.forgero.star_platinum": "Star Platinum", + "item.forgero.steel": "Steel", + "item.forgero.stormyx": "Stormyx", + "item.forgero.starrite": "Starrite", + "item.forgero.tin": "Tin", + "item.forgero.atanium": "Atanium", + "item.forgero.cupronickel": "Cupronickel", + "item.forgero.invar": "Invar", + "item.forgero.nickel": "Nickel", + "item.forgero.nitinol": "Nitinol", + "item.forgero.titanium": "Titanium", + "item.forgero.titanium_gold": "Titanium Gold", + "item.forgero.constantan": "Constantan", + "item.forgero.therrassium": "Therrassium", + "feature.forgero.golden.title": "Golden", + "feature.forgero.undying_revival.title": "Totem of undying", + "feature.forgero.undying_revival.description": "Gives a one time escape from death", + "feature.forgero.magnetic": "Magnetic", + "feature.forgero.magnetic.description": "Draws items towards you", + "feature.forgero.vein_mining.title": "Vein Mining", + "feature.forgero.vein_mining.plants_in_area": "Breaks multiple plants", + "feature.forgero.vein_mining.dirt_in_area": "Breaks multiple dirt blocks", + "feature.forgero.ore_vein_mining.description": "Mines ore in a radius", + "feature.forgero.wood_vein_mining.description": "Mines wood in a radius", + "feature.forgero.pattern_mining.title": "Pattern mining", + "feature.forgero.pattern_mining.3x3-description": "Mines in a 3x3 pattern", + "feature.forgero.pattern_mining.star-description": "Mines in a 3x3 star pattern", + "feature.forgero.pattern_mining.2x1-description": "Mines in a 2x1 path", + "feature.forgero.pattern_mining.tree_felling-description": "Mines blocks in tall columns" +} + diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/lang/ko_kr.json b/content/forgero-deprecated/src/main/resources/assets/forgero/lang/ko_kr.json new file mode 100644 index 000000000..982f93644 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/lang/ko_kr.json @@ -0,0 +1,180 @@ +{ + "itemGroup.forgero.toolparts": "Tool Parts", + "itemGroup.forgero.tools": "Tools", + "advancements.forgero.root.title": "가능성의 세계", + "advancements.forgero.root.description": "Forgero의 세계를 발견하세요", + "advancements.forgero.toolpart.title": "필수적인 재료", + "advancements.forgero.toolpart.description": "이런 것들은 매우 많습니다", + "advancements.forgero.tool.title": "묶음 패키지", + "advancements.forgero.tool.description": "도구를 만드세요!", + "advancements.forgero.head.title": "유용해 보이는걸", + "advancements.forgero.head.description": "당신의 첫 번째 도구 머리를 제작하세요", + "advancements.forgero.handle.title": "붙잡아야 할 것", + "advancements.forgero.handle.description": "당신의 첫 번째 손잡이를 제작하세요", + "advancements.forgero.binding.title": "교활한 업그레이드", + "advancements.forgero.binding.description": "당신의 첫 번째 연결 끈을 제작하세요", + "advancements.forgero.schematic.title": "이걸로 뭘 만들 수 있을까", + "advancements.forgero.schematic.description": "설계도를 발견하거나 제작하세요", + "advancements.forgero.schematic_vein.title": "이것은 '정말' 유용해 보이는걸", + "advancements.forgero.schematic_vein.description": "광맥 체굴 설계도를 발견하세요", + "advancements.forgero.schematic_pattern.title": "흐음, 3x3?", + "advancements.forgero.schematic_pattern.description": "발굴 설계도를 발견하세요", + "advancements.forgero.schematic_dense.title": "두우꺼어워어", + "advancements.forgero.schematic_dense.description": "튼튼한 설계도를 발견하세요", + "advancements.forgero.gem.title": "반짝이는 업그레이드", + "advancements.forgero.gem.description": "당신의 첫 번째 보석을 만드세요", + "advancements.forgero.secondary.title": "두 개의 층!", + "advancements.forgero.secondary.description": "o' plenty의 기회들", + "item.forgero.gem": "보석", + "item.forgero.magnetico": "마그네티코", + "item.forgero.magnetico_gem": "마그네티코 보석", + "item.forgero.oak": "참나무", + "item.forgero.spruce": "가문비나무", + "item.forgero.birch": "자작나무", + "item.forgero.acacia": "아카시아나무", + "item.forgero.jungle": "정글 나무", + "item.forgero.darkoak": "짙은 참나무", + "item.forgero.stone": "돌", + "item.forgero.iron": "철", + "item.forgero.gold": "금", + "item.forgero.copper": "구리", + "item.forgero.diorite": "섬록암", + "item.forgero.granite": "화강암", + "item.forgero.andesite": "안산암", + "item.forgero.warped": "뒤틀린", + "item.forgero.crimson": "진홍빛", + "item.forgero.rabbithide": "토끼 가죽", + "item.forgero.phantommembrane": "팬텀 세포", + "item.forgero.diamond": "다이아몬드", + "item.forgero.netherite": "네더라이트", + "item.forgero.handle": "손잡이", + "item.forgero.binding": "조임쇠", + "item.forgero.head": "머리", + "item.forgero.pickaxehead": "곡괭이 머리", + "item.forgero.sword": "검", + "item.forgero.hoe": "괭이", + "item.forgero.axe": "도끼", + "item.forgero.pickaxe": "곡괭이", + "item.forgero.shovel": "삽", + "item.forgero.hoehead": "괭이 머리", + "item.forgero.swordhead": "칼날", + "item.forgero.shovelhead": "삽 머리", + "item.forgero.axehead": "도끼 머리", + "item.forgero.schematic": "설계도", + "item.forgero.dense": "튼튼한", + "item.forgero.reinforced": "보강된", + "item.forgero.vein": "광맥 체굴", + "item.forgero.pattern": "발굴", + "item.forgero.weakvein": "약한 광맥 체굴", + "item.forgero.oak_handle_default": "참나무 손잡이", + "item.forgero.birch_handle_default": "자작나무 손잡이", + "item.forgero.spruce_handle_default": "가문비나무 손잡이", + "item.forgero.stone_handle_default": "돌 손잡이", + "item.forgero.iron_handle_default": "철 손잡이", + "item.forgero.gold_handle_default": "금 손잡이", + "item.forgero.diamond_handle_default": "다이아몬드 손잡이", + "item.forgero.netherite_handle_default": "네더라이트 손잡이", + "item.forgero.oak_handle_dense": "튼튼한 참나무 손잡이", + "item.forgero.birch_handle_dense": "튼튼한 자작나무 손잡이", + "item.forgero.stone_handle_dense": "튼튼한 돌 손잡이", + "item.forgero.acacia_handle_dense": "튼튼한 아카시아 손잡이", + "item.forgero.iron_handle_dense": "튼튼한 철 손잡이", + "item.forgero.gold_handle_dense": "튼튼한 금 손잡이", + "item.forgero.diamond_handle_dense": "튼튼한 다이아몬드 손잡이", + "item.forgero.netherite_handle_dense": "튼튼한 네더라이트 손잡이", + "item.forgero.oak_handle_reinforced": "보강된 참나무 손잡이", + "item.forgero.birch_handle_reinforced": "보강된 자작나무 손잡이", + "item.forgero.stone_handle_reinforced": "보강된 돌 손잡이", + "item.forgero.acacia_handle_reinforced": "보강된 아카시아 손잡이", + "item.forgero.iron_handle_reinforced": "보강된 철 손잡이", + "item.forgero.gold_handle_reinforced": "보강된 금 손잡이", + "item.forgero.diamond_handle_reinforced": "보강된 다이아몬드 손잡이", + "item.forgero.netherite_handle_reinforced": "보강된 네더라이트 손잡이", + "item.forgero.oak_binding_default": "참나무 조임쇠", + "item.forgero.birch_binding_default": "자작나무 조임쇠", + "item.forgero.spruce_binding_default": "가문비나무 조임쇠", + "item.forgero.stone_binding_default": "돌 조임쇠", + "item.forgero.iron_binding_default": "철 조임쇠", + "item.forgero.gold_binding_default": "금 조임쇠", + "item.forgero.diamond_binding_default": "다이아몬드 조임쇠", + "item.forgero.netherite_binding_default": "네더라이트 조임쇠", + "item.forgero.oak_pickaxe_head": "참나무 곡괭이 머리", + "item.forgero.birch_pickaxe_head": "자작나무 곡괭이 머리", + "item.forgero.spruce_pickaxe_head": "가문비나무 곡괭이 머리", + "item.forgero.stone_pickaxe_head": "돌 곡괭이 머리", + "item.forgero.iron_pickaxe_head": "철 곡괭이 머리", + "item.forgero.gold_pickaxe_head": "금 곡괭이 머리", + "item.forgero.diamond_pickaxe_head": "다이아몬드 곡괭이 머리", + "item.forgero.netherite_pickaxe_head": "네더라이트 곡괭이 머리", + "item.forgero.oak_shovel_head": "참나무 삽 머리", + "item.forgero.birch_shovel_head": "자작나무 삽 머리", + "item.forgero.spruce_shovel_head": "가문비나무 삽 머리", + "item.forgero.stone_shovel_head": "돌 삽 머리", + "item.forgero.iron_shovel_head": "철 삽 머리", + "item.forgero.gold_shovel_head": "금 삽 머리", + "item.forgero.diamond_shovel_head": "다이아몬드 삽 머리", + "item.forgero.netherite_shovel_head": "네더라이트 삽 머리", + "item.forgero.iron_pickaxe": "철 곡괭이", + "item.forgero.oak_pickaxe": "참나무 곡괭이", + "item.forgero.birch_pickaxe": "자작나무 곡괭이", + "item.forgero.spruce_pickaxe": "가문비나무 곡괭이", + "item.forgero.stone_pickaxe": "돌 곡괭이", + "item.forgero.gold_pickaxe": "금 곡괭이", + "item.forgero.acacia_pickaxe": "아카시아 곡괭이", + "item.forgero.diamond_pickaxe": "다이아몬드 곡괭이", + "item.forgero.netherite_pickaxe": "네더라이트 곡괭이", + "item.forgero.iron_shovel": "철 삽", + "item.forgero.acacia_shovel": "아카시아 삽", + "item.forgero.oak_shovel": "참나무 삽", + "item.forgero.birch_shovel": "자작나무 삽", + "item.forgero.spruce_shovel": "가문비나무 삽", + "item.forgero.stone_shovel": "돌 삽", + "item.forgero.gold_shovel": "금 삽", + "item.forgero.diamond_shovel": "다이아몬드 삽", + "item.forgero.netherite_shovel": "다이아몬드 삽", + "item.forgero.netherite_shovelhead": "네더라이트 삽 머리", + "item.forgero.oak_shovelhead": "참나무 삽 머리", + "item.forgero.birch_shovelhead": "자작나무 삽 머리", + "item.forgero.spruce_shovelhead": "가문비나무 삽 머리", + "item.forgero.stone_shovelhead": "돌 삽 머리", + "item.forgero.iron_shovelhead": "철 삽 머리", + "item.forgero.gold_shovelhead": "금 삽 머리", + "item.forgero.diamond_shovelhead": "다이아몬드 삽 머리", + "item.forgero.netherite_pickaxehead": "네더라이트 삽 머리", + "item.forgero.oak_pickaxehead": "참나무 곡괭이 머리", + "item.forgero.acacia_pickaxehead": "아카시아 곡괭이 머리", + "item.forgero.birch_pickaxehead": "자작나무 곡괭이 머리", + "item.forgero.spruce_pickaxehead": "가문비나무 곡괭이 머리", + "item.forgero.stone_pickaxehead": "돌 곡괭이 머리", + "item.forgero.iron_pickaxehead": "철 곡괭이 머리", + "item.forgero.gold_pickaxehead": "금 곡괭이 머리", + "item.forgero.diamond_pickaxehead": "다이아몬드 곡괭이 머리", + "item.forgero.netherite_axehead": "네더라이트 도끼 머리", + "item.forgero.oak_axehead": "참나무 도끼 머리", + "item.forgero.acacia_axehead": "아카시아 도끼 머리", + "item.forgero.birch_axehead": "자작나무 도끼 머리", + "item.forgero.spruce_axehead": "가문비나무 도끼 머리", + "item.forgero.stone_axehead": "돌 도끼 머리", + "item.forgero.iron_axehead": "철 도끼 머리", + "item.forgero.gold_axehead": "금 도끼 머리", + "item.forgero.diamond_axehead": "다이아몬드 도끼 머리", + "item.forgero.acacia_axe": "아카시아 도끼", + "item.forgero.birch_axe": "자작나무 도끼", + "item.forgero.spruce_axe": "가문비나무 도끼", + "item.forgero.stone_axe": "돌 도끼", + "item.forgero.iron_axe": "철 도끼", + "item.forgero.gold_axe": "금 도끼", + "item.forgero.warped_axe": "뒤틀린 도끼", + "item.forgero.crimson_axe": "진홍빛 도끼", + "item.forgero.andesite_axe": "안산암 도끼", + "item.forgero.jungle_axe": "정글 나무 도끼", + "item.forgero.darkoak_axe": "짙은 참나무 도끼", + "item.forgero.diorite_axe": "섬록암 도끼", + "item.forgero.diamond_axe": "다이아몬드 도끼", + "item.forgero.netherite_axe": "네더라이트 도끼", + "item.forgero.emerald_gem": "에메랄드 보석", + "item.forgero.diamond_gem": "다이아몬드 보석", + "item.forgero.redstone_gem": "레드스톤 보석", + "item.forgero.lapis_gem": "청금석 보석", + "item.forgero.ender_gem": "엔더 보석" +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/lang/zh_cn.json b/content/forgero-deprecated/src/main/resources/assets/forgero/lang/zh_cn.json new file mode 100644 index 000000000..a2a7f4258 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/lang/zh_cn.json @@ -0,0 +1,83 @@ +{ + "itemGroup.forgero.gems": "宝石", + "itemGroup.forgero.trinkets": "饰品", + "itemGroup.forgero.materials": "材料", + "item.forgero.gem": "宝石", + "item.forgero.totem": "图腾", + "item.forgero.undying": "不死", + "item.forgero.emerald": "绿宝石", + "item.forgero.diamond": "钻石", + "item.forgero.redstone": "红石", + "item.forgero.lapis": "青金石", + "item.forgero.ender": "末影", + "item.forgero.stone_heart": "岩心", + "item.forgero.blazed_stone_heart": "炽热岩心", + "item.forgero.magnetico": "磁极核心", + "item.forgero.quartz": "石英", + "item.forgero.tsuba_sword_guard": "太刀护手", + "item.forgero.duelling_sword_guard": "战斗护手", + "item.forgero.agile_sword_guard": "敏捷护手", + "item.forgero.polar_bear_pelt": "北极熊皮", + "item.forgero.katana_blade": "太刀刀刃", + "item.forgero.broadsword_blade": "阔剑剑刃", + "item.forgero.shortsword_blade": "短剑剑刃", + "item.forgero.refined_sword_blade": "精炼剑刃", + "item.forgero.mastercrafted_sword_blade": "大师剑刃", + "item.forgero.serrated_sword_blade": "锯刃剑刃", + "item.forgero.scimitar_blade": "弯刀刀刃", + "item.forgero.rapier_blade": "双刃剑剑刃", + "item.forgero.knife_blade": "小刀刀刃", + "item.forgero.slanted_sword_blade": "斜剑剑刃", + "item.forgero.battle_axe_head": "战斧头", + "item.forgero.tree_chopper_head": "伐木斧头", + "item.forgero.tree_feller_head": "倾木斧", + "item.forgero.path_digger_shovel_head": "造路锹头", + "item.forgero.grave_digger_head": "掘砾锹头", + "item.forgero.lightweight_pickaxe_head": "轻质镐头", + "description.forgero.lightweight_pickaxe_head": "更轻，但强度丝毫不差", + "item.forgero.refined_pickaxe_head": "精炼镐头", + "item.forgero.ore_miner_pickaxe_head": "掘矿镐头", + "item.forgero.reaper_head": "镰刀头", + "item.forgero.refined_hoe_head": "精炼锄头", + "item.forgero.mastercrafted_hoe_head": "大师锄头", + "description.forgero.refined_pickaxe_head": "在经典的镐头之上略有改进", + "item.forgero.mastercrafted_pickaxe_head": "大师镐头", + "description.forgero.mastercrafted_pickaxe_head": "由大师设计的镐头，各方面性能都极其卓越", + "item.forgero.path_mining_pickaxe_head": "辟径镐头", + "description.forgero.path_mining_pickaxe_head": "一种独特的镐头，专用于开辟过道", + "item.forgero.adamantite": "精金", + "item.forgero.aquarium": "激水", + "item.forgero.banglum": "聚爆石", + "item.forgero.bronze": "青铜", + "item.forgero.carmot": "点金石", + "item.forgero.celestium": "倚天", + "item.forgero.hallowed": "神圣", + "item.forgero.durasteel": "韧钢", + "item.forgero.kyber": "凯伯", + "item.forgero.manganese": "锰", + "item.forgero.metallurgium": "炼金", + "item.forgero.midasgold": "迈达斯金", + "item.forgero.mythril": "秘银", + "item.forgero.orichalcum": "山铜", + "item.forgero.osmium": "锇", + "item.forgero.palladium": "钯金", + "item.forgero.prometheum": "钷", + "item.forgero.platinum": "铂金", + "item.forgero.quadrillum": "兆金", + "item.forgero.runite": "符石", + "item.forgero.silver": "银", + "item.forgero.star_platinum": "星辰铂金", + "item.forgero.steel": "钢", + "item.forgero.stormyx": "飓霆", + "item.forgero.starrite": "星辰", + "item.forgero.tin": "锡", + "item.forgero.atanium": "阿坦恩", + "item.forgero.cupronickel": "白铜", + "item.forgero.invar": "殷钢", + "item.forgero.nickel": "镍", + "item.forgero.nitinol": "镍钛合金", + "item.forgero.titanium": "钛", + "item.forgero.titanium_gold": "钛金", + "item.forgero.constantan": "康铜", + "item.forgero.therrassium": "特拉斯" +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/agile_sword_guard-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/agile_sword_guard-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/agile_sword_guard-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/agile_sword_guard-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/tree_chopper_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/battle_axe_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/tree_chopper_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/battle_axe_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/blazed_stone_heart-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/blazed_stone_heart-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/blazed_stone_heart-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/blazed_stone_heart-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/saber_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/broadsword_blade-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/saber_blade-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/broadsword_blade-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/diamond-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/diamond-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond-gem_upgraded.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/diamond-gem_upgraded.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond-gem_upgraded.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/diamond-gem_upgraded.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/dragon_scale.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/dragon_scale.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/dragon_scale.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/dragon_scale.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/duelling_sword_guard-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/duelling_sword_guard-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/duelling_sword_guard-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/duelling_sword_guard-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/emerald-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/emerald-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/ender-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/ender-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/ender-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/ender-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/ender-gem_upgraded.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/ender-gem_upgraded.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/ender-gem_upgraded.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/ender-gem_upgraded.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/grave_digger_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/grave_digger_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/grave_digger_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/grave_digger_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/scimitar_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/katana_blade-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/scimitar_blade-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/katana_blade-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/kimiri_sword_guard-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/kimiri_sword_guard-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/kimiri_sword_guard-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/kimiri_sword_guard-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/lapis-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/lapis-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_upgraded.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/lapis_gem_upgraded.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_upgraded.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/lapis_gem_upgraded.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lightweight_pickaxe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/lightweight_pickaxe_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/lightweight_pickaxe_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/lightweight_pickaxe_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/magnetico-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/magnetico-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/magnetico-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/magnetico-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/magnetico.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/magnetico.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/magnetico.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/magnetico.json diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_axe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_axe_head-schematic.json new file mode 100644 index 000000000..d58734f6d --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_axe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/axe_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_handle-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_handle-schematic.json new file mode 100644 index 000000000..1a6eda658 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_handle-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/handle_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_hoe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_hoe_head-schematic.json new file mode 100644 index 000000000..ada8845e3 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_hoe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/hoe_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_pickaxe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_pickaxe_head-schematic.json new file mode 100644 index 000000000..4dd1219f5 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_pickaxe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/pickaxe_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_pommel-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_pommel-schematic.json new file mode 100644 index 000000000..a1ee34c8c --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_pommel-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/pommel_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_shovel_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_shovel_head-schematic.json new file mode 100644 index 000000000..16abb632f --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_shovel_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/shovel_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_sword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_sword_blade-schematic.json new file mode 100644 index 000000000..768c874ec --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_sword_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/sword_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_sword_guard-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_sword_guard-schematic.json new file mode 100644 index 000000000..db2716bf5 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/mastercrafted_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/vellum_schematic_base", + "layer1": "forgero:item/sword_guard_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/ore_miner_pickaxe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/ore_miner_pickaxe_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/ore_miner_pickaxe_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/ore_miner_pickaxe_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/path_digger_shovel_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/path_digger_shovel_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/path_digger_shovel_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/path_digger_shovel_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/path_mining_pickaxe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/path_mining_pickaxe_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/path_mining_pickaxe_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/path_mining_pickaxe_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/polar_bear_pelt.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/polar_bear_pelt.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/polar_bear_pelt.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/polar_bear_pelt.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/quartz-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/quartz-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/serrated_sword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/rapier_blade-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/serrated_sword_blade-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/rapier_blade-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/reaper_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/reaper_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/reaper_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/reaper_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/redstone-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/redstone-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/redstone-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/redstone-gem.json diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_axe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_axe_head-schematic.json new file mode 100644 index 000000000..cda005bd6 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_axe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/axe_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/reinforced_handle-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_handle-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/reinforced_handle-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_handle-schematic.json diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_hoe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_hoe_head-schematic.json new file mode 100644 index 000000000..4bb36bbd7 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_hoe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/hoe_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_pickaxe_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_pickaxe_head-schematic.json new file mode 100644 index 000000000..0f2320755 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_pickaxe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/pickaxe_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_pommel-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_pommel-schematic.json new file mode 100644 index 000000000..85abb0764 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_pommel-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/pommel_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_shovel_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_shovel_head-schematic.json new file mode 100644 index 000000000..126b787a5 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_shovel_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/shovel_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_sword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_sword_blade-schematic.json new file mode 100644 index 000000000..1c9ae1629 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_sword_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/sword_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_sword_guard-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_sword_guard-schematic.json new file mode 100644 index 000000000..e3e1c84d3 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/refined_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/sword_guard_outline" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/reinforced_handle-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/reinforced_handle-schematic.json new file mode 100644 index 000000000..17f9d9fef --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/reinforced_handle-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/handle_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/shortsword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/saber_blade-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/shortsword_blade-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/saber_blade-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/slanted_sword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/scimitar_blade-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/slanted_sword_blade-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/scimitar_blade-schematic.json diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/serrated_sword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/serrated_sword_blade-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/serrated_sword_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/shortsword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/shortsword_blade-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/shortsword_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/slanted_sword_blade-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/slanted_sword_blade-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/slanted_sword_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/soul-totem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/soul-totem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/soul-totem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/soul-totem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/spiked_binding-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/spiked_binding-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/spiked_binding-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/spiked_binding-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/stone_heart-gem.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/stone_heart-gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/stone_heart-gem.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/stone_heart-gem.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/tree_feller_head-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/tree_chopper_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/tree_feller_head-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/tree_chopper_head-schematic.json diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/vein_axe-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/tree_feller_head-schematic.json similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/models/item/vein_axe-schematic.json rename to content/forgero-deprecated/src/main/resources/assets/forgero/models/item/tree_feller_head-schematic.json diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/tsuba_sword_guard-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/tsuba_sword_guard-schematic.json new file mode 100644 index 000000000..d9048c12b --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/tsuba_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_guard_outline_variant" + } +} diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/vein_axe-schematic.json b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/vein_axe-schematic.json new file mode 100644 index 000000000..994fd58fd --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/assets/forgero/models/item/vein_axe-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/axe_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/blazed_stone_heart_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/blazed_stone_heart_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/blazed_stone_heart_gem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/blazed_stone_heart_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/diamond_gem_stone.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/diamond_gem_stone.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/diamond_gem_stone.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/diamond_gem_stone.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/dragon_scale_palette.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/dragon_scale_palette.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/dragon_scale_palette.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/dragon_scale_palette.png diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/emerald_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/emerald_gem.png new file mode 100644 index 000000000..72027b1e4 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/emerald_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/ender_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/ender_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/ender_gem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/ender_gem.png diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/lapis_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/lapis_gem.png new file mode 100644 index 000000000..6bc0dc922 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/lapis_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/magnetico_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/magnetico_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/magnetico_gem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/magnetico_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/polar_bear_pelt_palette.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/polar_bear_pelt_palette.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/polar_bear_pelt_palette.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/polar_bear_pelt_palette.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/quartz_gem_stone.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/quartz_gem_stone.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/quartz_gem_stone.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/quartz_gem_stone.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/redstone.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/redstone.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/redstone.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/redstone.png diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/redstone_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/redstone_gem.png new file mode 100644 index 000000000..2a81f7878 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/redstone_gem.png differ diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/soul_totem_palette.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/soul_totem_palette.png new file mode 100644 index 000000000..c06a8729f Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/soul_totem_palette.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/stone_heart_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/stone_heart_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/materials/stone_heart_gem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/materials/stone_heart_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/agile_sword_guard.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/agile_sword_guard.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/agile_sword_guard.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/agile_sword_guard.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/agile_sword_guard_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/agile_sword_guard_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/agile_sword_guard_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/agile_sword_guard_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_axe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/clumpy_pickaxe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/diagonal_gem_high.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/diagonal_gem_high.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/diagonal_gem_high.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/diagonal_gem_high.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/double_headed_axe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/duelling_sword_guard.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/duelling_sword_guard.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/duelling_sword_guard.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/duelling_sword_guard.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gem_square_bottom.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/gem_square_bottom.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gem_square_bottom.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/gem_square_bottom.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hoe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/hoe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hoe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/hoe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/kimiri_sword_guard.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/kimiri_sword_guard.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/kimiri_sword_guard.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/kimiri_sword_guard.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/lightweight_pickaxe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_axe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle_grip.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle_grip.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle_grip.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_handle_grip.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_hoe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_handle.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_handle.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_handle.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_handle.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pickaxe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pommel.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pommel.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_pommel.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_pommel.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_short_handle.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_short_handle.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_short_handle.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_short_handle.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_shovel_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_blade_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_sword_guard_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_long.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_long.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_long.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_long.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_short.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_short.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_short.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/mastercrafted_tool_handle_short.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_axe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_axe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_axe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_axe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_axe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_axe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_axe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_axe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_pickaxe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/pointy_shovel_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/reaper_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/reaper_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/reaper_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/reaper_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/reaper_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/reaper_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/reaper_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/reaper_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_axe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_axe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_axe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_axe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_axe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_axe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_axe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_axe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_handle.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_handle.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_handle.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_handle.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_hoe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_hoe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_hoe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_hoe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_hoe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_hoe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_hoe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_hoe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_pickaxe_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_pommel.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_pommel.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_pommel.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_pommel.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_short_handle.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_short_handle.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_short_handle.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_short_handle.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_shovel_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_shovel_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_shovel_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_shovel_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_shovel_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_shovel_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_shovel_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_shovel_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_blade_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_blade_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_blade_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_blade_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_guard.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_guard.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_guard.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_guard.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_guard_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_guard_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_sword_guard_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_sword_guard_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_long.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_long.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_long.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_long.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_short.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_short.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_short.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/refined_tool_handle_short.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/saber_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/saber_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/saber_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/saber_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/saber_blade_grip.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/saber_blade_grip.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/saber_blade_grip.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/saber_blade_grip.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/saber_blade_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/saber_blade_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/saber_blade_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/saber_blade_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sacrificial_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/sacrificial_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sacrificial_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/sacrificial_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/scimitar_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/scimitar_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/scimitar_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/scimitar_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/scimitar_blade_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/scimitar_blade_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/scimitar_blade_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/scimitar_blade_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/serrated_sword_blade_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shortsword_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/shortsword_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shortsword_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/shortsword_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shortsword_blade_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/shortsword_blade_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shortsword_blade_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/shortsword_blade_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/slanted_sword_blade_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/spiked_binding.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/spiked_binding.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/spiked_binding.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/spiked_binding.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/spiked_binding_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/spiked_binding_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/spiked_binding_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/spiked_binding_reinforcement.png diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_gem_center.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_gem_center.png new file mode 100644 index 000000000..6a75eed30 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_gem_center.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/square_gem_small.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_gem_small.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/square_gem_small.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_gem_small.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/square_shovel_head.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_shovel_head.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/square_shovel_head.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_shovel_head.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/square_shovel_head_tip_reinforcement.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_shovel_head_tip_reinforcement.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/square_shovel_head_tip_reinforcement.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/square_shovel_head_tip_reinforcement.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shovel_soft_binding_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/sword_gem_center.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shovel_soft_binding_gem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/sword_gem_center.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tsuba_sword_guard.png b/content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/tsuba_sword_guard.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tsuba_sword_guard.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/templates/textures/tsuba_sword_guard.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/blazedstoneheartgem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/blazedstoneheartgem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/blazedstoneheartgem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/blazedstoneheartgem16.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond-sacrificial_blade.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond-sacrificial_blade.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond-sacrificial_blade.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond-sacrificial_blade.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png.mcmeta b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png.mcmeta similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png.mcmeta rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamond_gem_animated.png.mcmeta diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamondgem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamondgem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamondgem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/diamondgem16.png diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/dragon_scale.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/dragon_scale.png new file mode 100644 index 000000000..637ff0ef9 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/dragon_scale.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emeraldgem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/emeraldgem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/emeraldgem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/emeraldgem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emeraldgem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/emeraldgem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/emeraldgem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/emeraldgem16.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png.mcmeta b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png.mcmeta similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png.mcmeta rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/ender_gem_animated.png.mcmeta diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/endergem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/endergem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/endergem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/endergem16.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base_advanced.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base_advanced.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base_advanced.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base_advanced.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base_animated.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base_animated.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base_animated.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base_animated.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base_animated.png.mcmeta b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base_animated.png.mcmeta similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_base_animated.png.mcmeta rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/gem_base_animated.png.mcmeta diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapisgem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/lapisgem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapisgem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/lapisgem16.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapisgem16.png.mcmeta b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/lapisgem16.png.mcmeta similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapisgem16.png.mcmeta rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/lapisgem16.png.mcmeta diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapisgemupgraded16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/lapisgemupgraded16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapisgemupgraded16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/lapisgemupgraded16.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/magneticgem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/magneticgem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/magneticgem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/magneticgem.png diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/magnetico.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/magnetico.png new file mode 100644 index 000000000..7cbc0cdc2 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/magnetico.png differ diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/polar_bear_pelt.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/polar_bear_pelt.png new file mode 100644 index 000000000..be1e9300f Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/polar_bear_pelt.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartzgem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/quartzgem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartzgem.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/quartzgem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartzgem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/quartzgem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartzgem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/quartzgem16.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/redstonegem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/redstonegem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/redstonegem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/redstonegem16.png diff --git a/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/soul-totem.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/soul-totem.png new file mode 100644 index 000000000..f0ddc3f05 Binary files /dev/null and b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/soul-totem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/stoneheartgem16.png b/content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/stoneheartgem16.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/textures/item/stoneheartgem16.png rename to content/forgero-deprecated/src/main/resources/assets/forgero/textures/item/stoneheartgem16.png diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/leveled_soul_properties/pig.json b/content/forgero-deprecated/src/main/resources/data/forgero/leveled_soul_properties/pig.json new file mode 100644 index 000000000..be3d29c9b --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/leveled_soul_properties/pig.json @@ -0,0 +1,13 @@ +{ + "id": "minecraft:pig", + "properties": { + "attributes": [ + ], + "features": [ + { + "type": "LUCK", + "value": 1 + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/leveled_soul_properties/turtle.json b/content/forgero-deprecated/src/main/resources/data/forgero/leveled_soul_properties/turtle.json new file mode 100644 index 000000000..65f21d5b3 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/leveled_soul_properties/turtle.json @@ -0,0 +1,13 @@ +{ + "id": "minecraft:turtle", + "properties": { + "attributes": [ + { + "type": "ARMOR", + "value": 0.5, + "operation": "ADDITION", + "order": "BASE" + } + ] + } +} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_handle.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/models/mastercrafted_handle.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_handle.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/models/mastercrafted_handle.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_handle.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/models/refined_handle.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_handle.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/models/refined_handle.json diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/package.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/package.json new file mode 100644 index 000000000..e76e37ce1 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/package.json @@ -0,0 +1,11 @@ +{ + "name": "extended-handles-deprecated", + "resource_type": "PACKAGE", + "priority": 4, + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero", + "forgero-vanilla" + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/schematic/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/schematic/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/schematic/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/schematic/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_handle.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/schematic/mastercrafted_handle.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_handle.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/schematic/mastercrafted_handle.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_handle.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/schematic/refined_handle.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_handle.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-handles-deprecated/schematic/refined_handle.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/agile_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/agile_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/agile_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/agile_sword_guard.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/duelling_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/duelling_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/duelling_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/duelling_sword_guard.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/kimiri_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/kimiri_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/kimiri_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/kimiri_sword_guard.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/saber_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/saber_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/saber_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/saber_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/scimitar_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/scimitar_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/scimitar_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/scimitar_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/serrated_sword_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/serrated_sword_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/serrated_sword_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/serrated_sword_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/shortsword_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/shortsword_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/shortsword_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/shortsword_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/slanted_sword_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/slanted_sword_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/slanted_sword_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/slanted_sword_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/tsuba_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/tsuba_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/tsuba_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/models/tsuba_sword_guard.json diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/package.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/package.json new file mode 100644 index 000000000..a343831bd --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/package.json @@ -0,0 +1,12 @@ +{ + "name": "extended-swords-deprecated", + "resource_type": "PACKAGE", + "priority": 4, + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero", + "forgero-vanilla", + "minecraft-vanilla" + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/agile_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/agile_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/agile_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/agile_sword_guard.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/schematic/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/schematic/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/duelling_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/duelling_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/duelling_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/duelling_sword_guard.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/kimiri_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/kimiri_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/kimiri_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/kimiri_sword_guard.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/saber_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/saber_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/saber_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/saber_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/scimitar_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/scimitar_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/scimitar_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/scimitar_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/serrated_sword_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/serrated_sword_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/serrated_sword_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/serrated_sword_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/shortsword_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/shortsword_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/shortsword_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/shortsword_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/slanted_sword_blade.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/slanted_sword_blade.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/slanted_sword_blade.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/slanted_sword_blade.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/tsuba_sword_guard.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/tsuba_sword_guard.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/tsuba_sword_guard.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-swords-deprecated/schematic/tsuba_sword_guard.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/models/battle_axe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/battle_axe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/models/battle_axe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/battle_axe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/grave_digger_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/grave_digger_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/grave_digger_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/grave_digger_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/models/lightweight_pickaxe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/lightweight_pickaxe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/models/lightweight_pickaxe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/lightweight_pickaxe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/ore_mining_pickaxe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/ore_mining_pickaxe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/ore_mining_pickaxe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/ore_mining_pickaxe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/models/path_digger_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/path_digger_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/models/path_digger_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/path_digger_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/models/path_mining_pickaxe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/path_mining_pickaxe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/models/path_mining_pickaxe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/path_mining_pickaxe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/reaper_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/reaper_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/reaper_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/reaper_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/models/spiked_binding.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/spiked_binding.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/models/spiked_binding.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/spiked_binding.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/tree_chopper_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/tree_chopper_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/models/tree_chopper_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/tree_chopper_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/models/tree_feller_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/tree_feller_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/models/tree_feller_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/models/tree_feller_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/package.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/package.json similarity index 79% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/package.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/package.json index a3555f40c..cf72f9a5e 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/package.json +++ b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/package.json @@ -1,5 +1,5 @@ { - "name": "pattern_mining_schematics", + "name": "extended-tools-deprecated", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/schematic/battle_axe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/battle_axe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/schematic/battle_axe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/battle_axe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/grave_digger_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/grave_digger_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/grave_digger_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/grave_digger_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/schematic/lightweight_pickaxe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/lightweight_pickaxe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/schematic/lightweight_pickaxe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/lightweight_pickaxe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/ore_miner_pickaxe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/ore_miner_pickaxe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/ore_miner_pickaxe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/ore_miner_pickaxe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/path_mining_pickaxe_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/path_mining_pickaxe_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/path_mining_pickaxe_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/path_mining_pickaxe_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/pathdigger_shovel_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/pathdigger_shovel_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/pathdigger_shovel_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/pathdigger_shovel_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/reaper_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/reaper_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/reaper_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/reaper_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/schematic/spiked_binding.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/spiked_binding.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/schematic/spiked_binding.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/spiked_binding.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/tree_chopper_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/tree_chopper_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/tree_chopper_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/tree_chopper_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/tree_feller_head.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/tree_feller_head.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/schematic/tree_feller_head.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/extended-tools-deprecated/schematic/tree_feller_head.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/material/dragon_scale.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/material/dragon_scale.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/material/dragon_scale.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/material/dragon_scale.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/material/polar_bear_pelt.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/material/polar_bear_pelt.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/material/polar_bear_pelt.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/material/polar_bear_pelt.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/package.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/package.json similarity index 81% rename from content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/package.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/package.json index e9222f0c2..9cd27366c 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/package.json +++ b/content/forgero-deprecated/src/main/resources/data/forgero/packs/material-deprecated/package.json @@ -1,5 +1,5 @@ { - "name": "minecraft-extended", + "name": "material-deprecated", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", @@ -8,4 +8,4 @@ "forgero", "forgero-vanilla" ] -} \ No newline at end of file +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/default.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/minecraft-extended/default.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/items/magnetico.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/items/magnetico.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/items/magnetico.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/items/magnetico.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/package.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/package.json similarity index 81% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/package.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/package.json index 8df9d8f51..46e3e1ccd 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/package.json +++ b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/package.json @@ -1,5 +1,5 @@ { - "name": "vein_mining_schematics", + "name": "trinkets-deprecated", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/blazed_stone_heart_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/blazed_stone_heart_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/blazed_stone_heart_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/blazed_stone_heart_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/diamond_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/diamond_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/diamond_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/diamond_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/emerald.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/emerald.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/emerald.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/emerald.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/ender_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/ender_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/ender_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/ender_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/lapis_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/lapis_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/lapis_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/lapis_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/magnetico_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/magnetico_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/magnetico_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/magnetico_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/quartz_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/quartz_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/quartz_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/quartz_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/redstone_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/redstone_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/redstone_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/redstone_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/stone_heart_gem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/stone_heart_gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/gems/stone_heart_gem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/gems/stone_heart_gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/totems/soul_binding_totem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/totems/soul_binding_totem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/totems/soul_binding_totem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/totems/soul_binding_totem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/totems/undying_totem.json b/content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/totems/undying_totem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/trinket/totems/undying_totem.json rename to content/forgero-deprecated/src/main/resources/data/forgero/packs/trinkets-deprecated/trinket/totems/undying_totem.json diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/plants.json b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/plants.json new file mode 100644 index 000000000..61fb76733 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/plants.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + { + "id": "minecraft:grass", + "required": false + }, + { + "id": "minecraft:tall_grass", + "required": false + }, + { + "id": "minecraft:fern", + "required": false + }, + { + "id": "minecraft:large_fern", + "required": false + }, + { + "id": "#minecraft:crops", + "required": false + }, + { + "id": "#minecraft:leaves", + "required": false + }, + { + "id": "#minecraft:flowers", + "required": false + } + ] +} \ No newline at end of file diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_dirt.json b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_dirt.json new file mode 100644 index 000000000..fe0fb45db --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_dirt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:mineable/shovel" + ] +} diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_logs.json b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_logs.json new file mode 100644 index 000000000..b14ef417c --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_logs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:logs" + ] +} diff --git a/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_ores.json b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_ores.json new file mode 100644 index 000000000..6bd1d0e34 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/data/forgero/tags/blocks/vein_mining_ores.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "minecraft:gold_ore", + "minecraft:deepslate_gold_ore", + "minecraft:iron_ore", + "minecraft:deepslate_iron_ore", + "minecraft:coal_ore", + "minecraft:deepslate_coal_ore", + "minecraft:nether_gold_ore", + "minecraft:lapis_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:diamond_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:redstone_ore", + "minecraft:deepslate_redstone_ore", + "minecraft:emerald_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore" + ] +} \ No newline at end of file diff --git a/content/forgero-deprecated/src/main/resources/fabric.mod.json b/content/forgero-deprecated/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..84024c858 --- /dev/null +++ b/content/forgero-deprecated/src/main/resources/fabric.mod.json @@ -0,0 +1,51 @@ +{ + "schemaVersion": 1, + "id": "forgero-deprecated", + "version": "${version}", + "name": "Forgero deprecated pack", + "description": "Old Content expansion pack for forgero now deprecated", + "authors": [ + "Sigmund Granaas Sandring" + ], + "contributors": [ + "Aulluna", + "Rad233", + "identithree", + "macaroni0423", + "Steveplays28", + "JorisDeBeer" + ], + "contact": { + "homepage": "https://sigmundgranaas.com", + "sources": "https://github.com/sigmundgranaas/forgero", + "issues": "https://github.com/sigmundgranaas/forgero/issues" + }, + "license": "MIT", + "icon": "assets/forgero/deprecated.png", + "environment": "*", + "entrypoints": { + }, + "mixins": [ + ], + "depends": { + "forgero-core": "*", + "java": ">=17" + }, + "custom": { + "forgeroResource": true, + "modmenu": { + "links": { + "modmenu.discord": "https://discord.gg/v6sDsftE9N" + }, + "badges": [ + "library" + ], + "parent": { + "id": "forgero", + "name": "Forgero", + "description": "Equipment crafting expansion mod for Fabric!", + "icon": "assets/forgero/icon.png" + } + } + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/lang/en_us.json b/content/forgero-extended/src/main/resources/assets/forgero/lang/en_us.json index 44be6c48c..0bb6b4c23 100644 --- a/content/forgero-extended/src/main/resources/assets/forgero/lang/en_us.json +++ b/content/forgero-extended/src/main/resources/assets/forgero/lang/en_us.json @@ -2,29 +2,21 @@ "itemGroup.forgero.gems": "Gems", "itemGroup.forgero.trinkets": "Trinkets", "itemGroup.forgero.materials": "Materials", - "item.forgero.dragon_scale": "Dragon Scale", "item.forgero.gem": "Gem", - "item.forgero.soul": "Soul", - "item.forgero.totem": "Totem", - "item.forgero.undying": "Undying", "item.forgero.emerald": "Emerald", "item.forgero.diamond": "Diamond", "item.forgero.redstone": "Redstone", "item.forgero.lapis": "Lapis Lazuli", - "item.forgero.ender": "Ender", - "item.forgero.stone_heart": "Stoneheart", - "item.forgero.blazed_stone_heart": "Blazed Stoneheart", "tag.minecraft.base_stone_nether": "Nether stones", "tag.minecraft.base_stone_overworld": "Stones", - "item.forgero.magnetico": "Magnetico", "item.forgero.quartz": "Quartz", - "item.forgero.tsuba_sword_guard": "Tsuba Guard", "item.forgero.refined_sword_guard": "Refined Sword Guard", "item.forgero.mastercrafted_sword_guard": "Mastercrafted Sword Guard", "item.forgero.duelling_sword_guard": "Duelling Guard", "item.forgero.agile_sword_guard": "Agile Guard", "item.forgero.polar_bear_pelt": "Polar Bear Pelt", "item.forgero.katana_blade": "Katana Blade", + "item.forgero.katana": "Katana", "item.forgero.broadsword_blade": "Broadsword Blade", "item.forgero.shortsword_blade": "Shortsword Blade", "item.forgero.refined_sword_blade": "Refined Sword Blade", @@ -33,8 +25,8 @@ "item.forgero.mastercrafted_sword_blade": "Mastercrafted Sword Blade", "item.forgero.serrated_sword_blade": "Serrated Sword Blade", "item.forgero.scimitar_blade": "Scimitar Blade", - "item.forgero.rapier_blade": "Rapier Blade", "item.forgero.knife_blade": "Knife Blade", + "item.forgero.knife": "Knife", "item.forgero.sacrificial_dagger_blade": "Sacrificial Dagger Blade", "item.forgero.slanted_sword_blade": "Slanted Sword Blade", "item.forgero.battle_axe_head": "Battle Axe Head", @@ -112,6 +104,82 @@ "feature.forgero.pattern_mining.3x3-description": "Mines in a 3x3 pattern", "feature.forgero.pattern_mining.star-description": "Mines in a 3x3 star pattern", "feature.forgero.pattern_mining.2x1-description": "Mines in a 2x1 path", - "feature.forgero.pattern_mining.tree_felling-description": "Mines blocks in tall columns" + "item.forgero.entrenching_shovel_head": "Entrenching Shovel Head", + "item.forgero.entrenching_shovel": "Entrenching Shovel", + "item.forgero.felling_axe_head": "Felling Axe Head", + "item.forgero.felling_axe": "Felling Axe", + "item.forgero.hammer_head": "Hammer Head", + "item.forgero.hammer": "Hammer", + "item.forgero.mandrill_pickaxe_head": "Mandrill Pickaxe Head", + "item.forgero.mandrill_pickaxe": "Mandrill Pickaxe", + "item.forgero.sickle_blade": "Sickle Blade", + "item.forgero.sickle": "Sickle", + "item.forgero.spade_head": "Spade Head", + "item.forgero.spade": "Spade", + "item.forgero.club_head": "Club Head", + "item.forgero.club": "Club", + "item.forgero.cutlass_blade": "Cutlass Blade", + "item.forgero.cutlass": "Cutlass", + "item.forgero.cutlass_sword_guard": "Cutlass Sword Guard", + "item.forgero.mace_head": "Mace Head", + "item.forgero.mace": "Mace", + "item.forgero.rapier": "Rapier", + "item.forgero.rapier_blade": "Rapier Blade", + "item.forgero.swept_sword_guard": "Swept Guard", + "item.forgero.tsuba_sword_guard": "Tsuba Guard", + "item.forgero.half_basket_sword_guard": "Half Basket Guard", + "item.forgero.shell_sword_guard": "Shell Guard", + "item.forgero.cruciform_sword_guard": "Cruciform Guard", + "item.forgero.mechanized_sword_guard": "Mechanized Guard", + "item.forgero.rounded_sword_guard": "Rounded Guard", + "item.forgero.cutter_mattock_head": "Cutter Mattock Head", + "item.forgero.cutter_mattock": "Cutter Mattock", + "item.forgero.pick_mattock_head": "Pick Mattock Head", + "item.forgero.pick_mattock": "Pick Mattock", + "item.forgero.kunai_blade": "Kunai Blade", + "item.forgero.kunai": "Kunai", + "item.forgero.spear_head": "Spear Head", + "item.forgero.spear": "Spear", + "item.forgero.war_hammer_head": "War Hammer Head", + "item.forgero.war_hammer": "War Hammer", + "item.forgero.scythe_blade": "Scythe Blade", + "item.forgero.scythe": "Scythe", + "item.forgero.battle_axe": "Battle Axe", + "item.forgero.soft_plant": "Soft Plants", + "item.forgero.diamond_gem_1": "Diamond Gem Level 1", + "item.forgero.diamond_gem_2": "Diamond Gem Level 2", + "item.forgero.diamond_gem_3": "Diamond Gem Level 3", + "item.forgero.diamond_gem_4": "Diamond Gem Level 4", + "item.forgero.diamond_gem_5": "Diamond Gem Level 5", + "item.forgero.quartz_gem_1": "Quartz Gem Level 1", + "item.forgero.quartz_gem_2": "Quartz Gem Level 2", + "item.forgero.quartz_gem_3": "Quartz Gem Level 3", + "item.forgero.quartz_gem_4": "Quartz Gem Level 4", + "item.forgero.quartz_gem_5": "Quartz Gem Level 5", + "item.forgero.emerald_gem_1": "Emerald Gem Level 1", + "item.forgero.emerald_gem_2": "Emerald Gem Level 2", + "item.forgero.emerald_gem_3": "Emerald Gem Level 3", + "item.forgero.emerald_gem_4": "Emerald Gem Level 4", + "item.forgero.emerald_gem_5": "Emerald Gem Level 5", + "item.forgero.prismarine_gem_1": "Prismarine Gem Level 1", + "item.forgero.prismarine_gem_2": "Prismarine Gem Level 2", + "item.forgero.prismarine_gem_3": "Prismarine Gem Level 3", + "item.forgero.prismarine_gem_4": "Prismarine Gem Level 4", + "item.forgero.prismarine_gem_5": "Prismarine Gem Level 5", + "item.forgero.lapis_gem_1": "Lapis Lazuli Gem Level 1", + "item.forgero.lapis_gem_2": "Lapis Lazuli Gem Level 2", + "item.forgero.lapis_gem_3": "Lapis Lazuli Gem Level 3", + "item.forgero.lapis_gem_4": "Lapis Lazuli Gem Level 4", + "item.forgero.lapis_gem_5": "Lapis Lazuli Gem Level 5", + "item.forgero.echo_gem_1": "Echo Gem Level 1", + "item.forgero.echo_gem_2": "Echo Gem Level 2", + "item.forgero.echo_gem_3": "Echo Gem Level 3", + "item.forgero.echo_gem_4": "Echo Gem Level 4", + "item.forgero.echo_gem_5": "Echo Gem Level 5", + "item.forgero.amethyst_gem_1": "Amethyst Gem Level 1", + "item.forgero.amethyst_gem_2": "Amethyst Gem Level 2", + "item.forgero.amethyst_gem_3": "Amethyst Gem Level 3", + "item.forgero.amethyst_gem_4": "Amethyst Gem Level 4", + "item.forgero.amethyst_gem_5": "Amethyst Gem Level 5" } diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_1.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_1.json new file mode 100644 index 000000000..0eb5b4275 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/amethyst_gem_1" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_2.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_2.json new file mode 100644 index 000000000..3cb4ab756 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/amethyst_gem_2" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_3.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_3.json new file mode 100644 index 000000000..66ea89b58 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/amethyst_gem_3" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_4.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_4.json new file mode 100644 index 000000000..11333eda5 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/amethyst_gem_4" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_5.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_5.json new file mode 100644 index 000000000..fe821b9b8 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/amethyst_gem_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/amethyst_gem_5" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/basket_hilt_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/basket_hilt_sword_guard-schematic.json new file mode 100644 index 000000000..d9048c12b --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/basket_hilt_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_guard_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/club_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/club_head-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/club_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/cruciform_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/cruciform_sword_guard-schematic.json new file mode 100644 index 000000000..d9048c12b --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/cruciform_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_guard_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/cutlass_blade-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/cutlass_blade-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/cutlass_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/cutter_mattock_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/cutter_mattock_head-schematic.json new file mode 100644 index 000000000..42fa779f4 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/cutter_mattock_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base_big", + "layer1": "forgero:item/hoe_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_1.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_1.json new file mode 100644 index 000000000..4b800ce8a --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/diamond_gem_1" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_2.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_2.json new file mode 100644 index 000000000..711b13e16 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/diamond_gem_2" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_3.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_3.json new file mode 100644 index 000000000..e10e0fd48 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/diamond_gem_3" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_4.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_4.json new file mode 100644 index 000000000..d319fcc1b --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/diamond_gem_4" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_5.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_5.json new file mode 100644 index 000000000..b14996959 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/diamond_gem_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/diamond_gem_5" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_1.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_1.json new file mode 100644 index 000000000..5f3abce1d --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/echo_gem_1" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_2.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_2.json new file mode 100644 index 000000000..bc47ce377 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/echo_gem_2" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_3.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_3.json new file mode 100644 index 000000000..5f7a7d9c2 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/echo_gem_3" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_4.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_4.json new file mode 100644 index 000000000..537501392 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/echo_gem_4" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_5.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_5.json new file mode 100644 index 000000000..ac7753914 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/echo_gem_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/echo_gem_5" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_1.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_1.json new file mode 100644 index 000000000..96d7d5c4e --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/emerald_gem_1" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_2.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_2.json new file mode 100644 index 000000000..e28c0ec19 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/emerald_gem_2" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_3.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_3.json new file mode 100644 index 000000000..caf90e4a2 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/emerald_gem_3" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_4.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_4.json new file mode 100644 index 000000000..1a4e59b60 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/emerald_gem_4" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_5.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_5.json new file mode 100644 index 000000000..50ec1bb7d --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/emerald_gem_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/emerald_gem_5" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/entrenching_shovel_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/entrenching_shovel_head-schematic.json new file mode 100644 index 000000000..a7dc23000 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/entrenching_shovel_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/shovel_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/felling_axe_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/felling_axe_head-schematic.json new file mode 100644 index 000000000..994fd58fd --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/felling_axe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/axe_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/half_basket_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/half_basket_sword_guard-schematic.json new file mode 100644 index 000000000..d9048c12b --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/half_basket_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_guard_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/hammer_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/hammer_head-schematic.json new file mode 100644 index 000000000..89012a201 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/hammer_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base_big", + "layer1": "forgero:item/pickaxe_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/katana_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/katana_sword_guard-schematic.json new file mode 100644 index 000000000..e3e1c84d3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/katana_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/sword_guard_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/kunai_blade-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/kunai_blade-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/kunai_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_1.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_1.json new file mode 100644 index 000000000..6ae15c506 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/lapis_gem_1" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_2.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_2.json new file mode 100644 index 000000000..712b8ac48 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/lapis_gem_2" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_3.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_3.json new file mode 100644 index 000000000..0ddc49722 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/lapis_gem_3" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_4.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_4.json new file mode 100644 index 000000000..6557b5cc5 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/lapis_gem_4" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_5.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_5.json new file mode 100644 index 000000000..02ace603c --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/lapis_gem_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/lapis_gem_5" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/mace_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/mace_head-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/mace_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/mandrill_pickaxe_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/mandrill_pickaxe_head-schematic.json new file mode 100644 index 000000000..89012a201 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/mandrill_pickaxe_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base_big", + "layer1": "forgero:item/pickaxe_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/mechanized_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/mechanized_sword_guard-schematic.json new file mode 100644 index 000000000..e3e1c84d3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/mechanized_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/sword_guard_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/pick_mattock_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/pick_mattock_head-schematic.json new file mode 100644 index 000000000..42fa779f4 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/pick_mattock_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base_big", + "layer1": "forgero:item/hoe_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_1.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_1.json new file mode 100644 index 000000000..d9246a6fa --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/prismarine_gem_1" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_2.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_2.json new file mode 100644 index 000000000..2ca88e0a3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/prismarine_gem_2" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_3.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_3.json new file mode 100644 index 000000000..087e0a6e7 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/prismarine_gem_3" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_4.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_4.json new file mode 100644 index 000000000..1c1646cd0 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/prismarine_gem_4" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_5.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_5.json new file mode 100644 index 000000000..c349db43c --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/prismarine_gem_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/prismarine_gem_5" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_1.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_1.json new file mode 100644 index 000000000..b06e2047b --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/quartz_gem_1" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_2.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_2.json new file mode 100644 index 000000000..b310681a7 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/quartz_gem_2" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_3.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_3.json new file mode 100644 index 000000000..ad1c837eb --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/quartz_gem_3" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_4.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_4.json new file mode 100644 index 000000000..67e7ddad8 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/quartz_gem_4" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_5.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_5.json new file mode 100644 index 000000000..2be835ee1 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/quartz_gem_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/quartz_gem_5" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/rapier_blade.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/rapier_blade.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/rapier_blade.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/rapier_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/rapier_sword_guard-schematic.json new file mode 100644 index 000000000..e3e1c84d3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/rapier_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/sword_guard_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/rounded_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/rounded_sword_guard-schematic.json new file mode 100644 index 000000000..e3e1c84d3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/rounded_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/sword_guard_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/scythe_blade-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/scythe_blade-schematic.json new file mode 100644 index 000000000..42fa779f4 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/scythe_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base_big", + "layer1": "forgero:item/hoe_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/shell_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/shell_sword_guard-schematic.json new file mode 100644 index 000000000..d9048c12b --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/shell_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_guard_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/sickle_blade-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/sickle_blade-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/sickle_blade-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/spade_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/spade_head-schematic.json new file mode 100644 index 000000000..a7dc23000 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/spade_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/shovel_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/spear_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/spear_head-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/spear_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/swept_sword_guard-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/swept_sword_guard-schematic.json new file mode 100644 index 000000000..e3e1c84d3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/swept_sword_guard-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/parchment_schematic_base", + "layer1": "forgero:item/sword_guard_outline" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/models/item/war_hammer_head-schematic.json b/content/forgero-extended/src/main/resources/assets/forgero/models/item/war_hammer_head-schematic.json new file mode 100644 index 000000000..4d6a181a6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/models/item/war_hammer_head-schematic.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forgero:item/variant_schematic_base", + "layer1": "forgero:item/sword_outline_variant" + } +} diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/amethyst_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/amethyst_gem.png new file mode 100644 index 000000000..f17a85509 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/amethyst_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/diamond_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/diamond_gem.png new file mode 100644 index 000000000..5569f856f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/diamond_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/echo_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/echo_gem.png new file mode 100644 index 000000000..1f144cfc2 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/echo_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/emerald_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/emerald_gem.png index 72027b1e4..2940d07ea 100644 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/emerald_gem.png and b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/emerald_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/lapis_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/lapis_gem.png index 6bc0dc922..a60291ee3 100644 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/lapis_gem.png and b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/lapis_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/prismarine_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/prismarine_gem.png new file mode 100644 index 000000000..be3990905 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/prismarine_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/quartz_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/quartz_gem.png new file mode 100644 index 000000000..96f91d093 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/materials/quartz_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/felling_axe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/felling_axe_head.png new file mode 100644 index 000000000..b0dccf3ef Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/felling_axe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/felling_axe_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/felling_axe_head_reinforcement.png new file mode 100644 index 000000000..d88c3d35a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/felling_axe_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/hammer_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/hammer_head.png new file mode 100644 index 000000000..38a074414 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/hammer_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/hammer_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/hammer_head_reinforcement.png new file mode 100644 index 000000000..8256a3677 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/hammer_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/mandrill_pickaxe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/mandrill_pickaxe_head.png new file mode 100644 index 000000000..9601b2020 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/mandrill_pickaxe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/mandrill_pickaxe_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/mandrill_pickaxe_head_reinforcement.png new file mode 100644 index 000000000..088c68593 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/mandrill_pickaxe_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/spade_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/spade_head.png new file mode 100644 index 000000000..f3df4d01a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/spade_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/spade_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/spade_head_reinforcement.png new file mode 100644 index 000000000..e5beed20a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadmining/spade_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadsword_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadsword_blade.png deleted file mode 100644 index 078b80b01..000000000 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadsword_blade.png and /dev/null differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadsword_blade_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadsword_blade_tip_reinforcement.png deleted file mode 100644 index 2ef48c7cf..000000000 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/broadsword_blade_tip_reinforcement.png and /dev/null differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/butcher_knife.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/butcher_knife.png new file mode 100644 index 000000000..4f56a2ec2 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/butcher_knife.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/chisel_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/chisel_handle.png new file mode 100644 index 000000000..2b6789db6 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/chisel_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/chisel_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/chisel_head.png new file mode 100644 index 000000000..c45b27506 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/chisel_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/dagger_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/dagger_blade.png new file mode 100644 index 000000000..4c6f0b916 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/dagger_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/club_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/club_head.png new file mode 100644 index 000000000..1eff298ce Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/club_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/club_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/club_head_reinforcement.png new file mode 100644 index 000000000..91825cf71 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/club_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/cutlass_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/cutlass_blade.png new file mode 100644 index 000000000..cbd39ca39 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/cutlass_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/cutlass_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/cutlass_blade_reinforcement.png new file mode 100644 index 000000000..cf88f4039 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/cutlass_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/katana_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/katana_blade.png new file mode 100644 index 000000000..cb98c72b6 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/katana_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/katana_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/katana_blade_reinforcement.png new file mode 100644 index 000000000..91646af83 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/katana_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/mace_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/mace_head.png new file mode 100644 index 000000000..4c65f5d88 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/mace_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/mace_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/mace_head_reinforcement.png new file mode 100644 index 000000000..56161a98f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/mace_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/rapier_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/rapier_blade.png new file mode 100644 index 000000000..cb354a898 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/rapier_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/rapier_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/rapier_blade_reinforcement.png new file mode 100644 index 000000000..146afd511 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/exotic/rapier_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/axe_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/axe_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/axe_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/axe_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/axe_soft_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/axe_soft_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/axe_soft_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/axe_soft_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guard_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/guard_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guard_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/guard_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hoe_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/hoe_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hoe_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/hoe_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hoe_soft_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/hoe_soft_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hoe_soft_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/hoe_soft_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pickaxe_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/pickaxe_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pickaxe_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/pickaxe_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pickaxe_soft_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/pickaxe_soft_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/pickaxe_soft_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/pickaxe_soft_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shovel_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/shovel_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/shovel_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/shovel_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/shovel_soft_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/shovel_soft_binding_gem.png new file mode 100644 index 000000000..a7310373e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/shovel_soft_binding_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/soft_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/soft_binding_gem.png similarity index 100% rename from content/forgero-extended/src/main/resources/assets/forgero/templates/textures/soft_binding_gem.png rename to content/forgero-extended/src/main/resources/assets/forgero/templates/textures/gems/soft_binding_gem.png diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/cruciform_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/cruciform_sword_guard.png new file mode 100644 index 000000000..26d1cf356 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/cruciform_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/cruciform_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/cruciform_sword_guard_reinforcement.png new file mode 100644 index 000000000..7322f8516 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/cruciform_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/half_basket_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/half_basket_sword_guard.png new file mode 100644 index 000000000..efc179026 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/half_basket_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/half_basket_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/half_basket_sword_guard_reinforcement.png new file mode 100644 index 000000000..b54549074 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/half_basket_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/mechanized_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/mechanized_sword_guard.png new file mode 100644 index 000000000..3bef2e040 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/mechanized_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/mechanized_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/mechanized_sword_guard_reinforcement.png new file mode 100644 index 000000000..e3379b68e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/mechanized_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/rounded_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/rounded_sword_guard.png new file mode 100644 index 000000000..ca81df89e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/rounded_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/rounded_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/rounded_sword_guard_reinforcement.png new file mode 100644 index 000000000..5b06188b2 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/rounded_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/shell_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/shell_sword_guard.png new file mode 100644 index 000000000..26f21ec6a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/shell_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/shell_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/shell_sword_guard_reinforcement.png new file mode 100644 index 000000000..688ef90d0 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/shell_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/swept_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/swept_sword_guard.png new file mode 100644 index 000000000..f2cea2faa Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/swept_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/swept_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/swept_sword_guard_reinforcement.png new file mode 100644 index 000000000..8e66e36ed Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/swept_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/sword_gem_shell.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/sword_gem_shell.png new file mode 100644 index 000000000..8bdeaf68c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/sword_gem_shell.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/tsuba_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/tsuba_sword_guard.png new file mode 100644 index 000000000..87a4c6327 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/tsuba_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/tsuba_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/tsuba_sword_guard_reinforcement.png new file mode 100644 index 000000000..ed19d0ad0 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/guards/tsuba_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hatchet_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hatchet_blade.png new file mode 100644 index 000000000..488b23a62 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/hatchet_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/battle_axe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/battle_axe_head.png new file mode 100644 index 000000000..6378e5031 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/battle_axe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/battle_axe_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/battle_axe_head_reinforcement.png new file mode 100644 index 000000000..60b232ae9 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/battle_axe_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/broadsword_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/broadsword_blade.png new file mode 100644 index 000000000..00e9ff211 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/broadsword_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/broadsword_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/broadsword_blade_reinforcement.png new file mode 100644 index 000000000..10be18915 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/broadsword_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/entrenching_shovel_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/entrenching_shovel_head.png new file mode 100644 index 000000000..ca9a9672a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/entrenching_shovel_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/entrenching_shovel_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/entrenching_shovel_head_reinforcement.png new file mode 100644 index 000000000..417a47552 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/entrenching_shovel_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding.png new file mode 100644 index 000000000..8199e9f74 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding_gem.png new file mode 100644 index 000000000..fdff41423 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding_reinforced.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding_reinforced.png new file mode 100644 index 000000000..7e448f754 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_binding_reinforced.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_blade.png new file mode 100644 index 000000000..518075402 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_blade_reinforcement.png new file mode 100644 index 000000000..e1007b119 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_grip.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_grip.png new file mode 100644 index 000000000..39f6b443d Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_grip.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle.png new file mode 100644 index 000000000..48b241ee4 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle_mastercrafted.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle_mastercrafted.png new file mode 100644 index 000000000..c19c4f817 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle_mastercrafted.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle_reinforcement.png new file mode 100644 index 000000000..90ab86a19 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_handle_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_soft_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_soft_binding_gem.png new file mode 100644 index 000000000..3c25f5055 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/scythe_soft_binding_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding.png new file mode 100644 index 000000000..cb70b4e37 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding_gem.png new file mode 100644 index 000000000..311b8b420 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding_reinforced.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding_reinforced.png new file mode 100644 index 000000000..42e5bd3e3 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_binding_reinforced.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_blade.png new file mode 100644 index 000000000..9ad3f7d19 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_blade_reinforcement.png new file mode 100644 index 000000000..c12de1ea6 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_handle.png new file mode 100644 index 000000000..184867308 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_mastercrafted_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_mastercrafted_handle.png new file mode 100644 index 000000000..f874b31ef Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_mastercrafted_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_refined_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_refined_handle.png new file mode 100644 index 000000000..7172ed119 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/sickle_refined_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_scythe_binding.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_scythe_binding.png new file mode 100644 index 000000000..6afc4ed73 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_scythe_binding.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_sickle_binding.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_sickle_binding.png new file mode 100644 index 000000000..7ba6de76e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_sickle_binding.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_sickle_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_sickle_gem.png new file mode 100644 index 000000000..2c45c9dd9 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_sickle_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_warhammer_binding.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_warhammer_binding.png new file mode 100644 index 000000000..9f525eecd Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/soft_warhammer_binding.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_handle_grip.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_handle_grip.png new file mode 100644 index 000000000..fbbd58252 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_handle_grip.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head.png new file mode 100644 index 000000000..e6abbaf0f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head_attachment.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head_attachment.png new file mode 100644 index 000000000..d2593105b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head_attachment.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head_reinforcement.png new file mode 100644 index 000000000..105d7f61b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/spear_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/war_hammer_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/war_hammer_head.png new file mode 100644 index 000000000..c630231d4 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/war_hammer_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/war_hammer_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/war_hammer_head_reinforcement.png new file mode 100644 index 000000000..59e2deefd Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/imperial/war_hammer_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/katana_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/katana_blade.png deleted file mode 100644 index 0bbcc5a40..000000000 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/katana_blade.png and /dev/null differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/katana_blade_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/katana_blade_tip_reinforcement.png deleted file mode 100644 index 6632a68c2..000000000 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/katana_blade_tip_reinforcement.png and /dev/null differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/knife_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/knife_blade.png deleted file mode 100644 index 95c4d4230..000000000 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/knife_blade.png and /dev/null differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/knife_blade_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/knife_blade_tip_reinforcement.png deleted file mode 100644 index 8b0ce8e3a..000000000 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/knife_blade_tip_reinforcement.png and /dev/null differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/knife_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/knife_blade.png new file mode 100644 index 000000000..37983e3de Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/knife_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/knife_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/knife_blade_reinforcement.png new file mode 100644 index 000000000..cd756a694 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/knife_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_blade.png new file mode 100644 index 000000000..466d7ca12 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_blade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_blade_reinforcement.png new file mode 100644 index 000000000..d32258a1e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_blade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_handle.png new file mode 100644 index 000000000..992c3c4f6 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_rope.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_rope.png new file mode 100644 index 000000000..910dc3a89 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/kunai_rope.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/throwing_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/throwing_handle.png new file mode 100644 index 000000000..5064d1e69 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/lightweight/throwing_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_axe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_axe_head.png new file mode 100644 index 000000000..37314f791 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_axe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_axe_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_axe_head_tip_reinforcement.png new file mode 100644 index 000000000..584845a15 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_axe_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_blade.png new file mode 100644 index 000000000..91889719c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_hoe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_hoe_head.png new file mode 100644 index 000000000..8a8f1beef Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_hoe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_hoe_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_hoe_head_tip_reinforcement.png new file mode 100644 index 000000000..8c2039540 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_hoe_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pickaxe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pickaxe_head.png new file mode 100644 index 000000000..6d201e782 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pickaxe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pickaxe_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pickaxe_head_tip_reinforcement.png new file mode 100644 index 000000000..665b134ea Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pickaxe_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pommel.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pommel.png new file mode 100644 index 000000000..feb21465c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_pommel.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_shovel_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_shovel_head.png new file mode 100644 index 000000000..da73078b2 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_shovel_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_shovel_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_shovel_head_tip_reinforcement.png new file mode 100644 index 000000000..6db3fd437 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_shovel_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_blade.png new file mode 100644 index 000000000..a37a9b868 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_blade_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_blade_tip_reinforcement.png new file mode 100644 index 000000000..61d1c6bd5 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_blade_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_guard.png new file mode 100644 index 000000000..1a53e9a73 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_guard_reinforcement.png new file mode 100644 index 000000000..35c054971 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_pommel.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_pommel.png new file mode 100644 index 000000000..55021ba4b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_sword_pommel.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_tool_pommel.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_tool_pommel.png new file mode 100644 index 000000000..668e1504c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mastercrafted/mastercrafted_tool_pommel.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mechanized_sawblade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mechanized_sawblade.png new file mode 100644 index 000000000..425c9b339 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mechanized_sawblade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mechanized_sawblade_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mechanized_sawblade_reinforcement.png new file mode 100644 index 000000000..ab6091418 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/mechanized_sawblade_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_chain.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_chain.png new file mode 100644 index 000000000..aded588fc Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_chain.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_grip.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_grip.png new file mode 100644 index 000000000..a8907170a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_grip.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_handles.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_handles.png new file mode 100644 index 000000000..f86399bc8 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_handles.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_metal.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_metal.png new file mode 100644 index 000000000..28240898a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_metal.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_reinforcement.png new file mode 100644 index 000000000..7a55bc4e0 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/nunchucks_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/rapier_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/rapier_blade.png deleted file mode 100644 index 65ea9c69f..000000000 Binary files a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/rapier_blade.png and /dev/null differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_axe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_axe_head.png new file mode 100644 index 000000000..dd6f8e82a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_axe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_axe_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_axe_head_tip_reinforcement.png new file mode 100644 index 000000000..7ec8f83d8 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_axe_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_hoe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_hoe_head.png new file mode 100644 index 000000000..84969c069 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_hoe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_hoe_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_hoe_head_tip_reinforcement.png new file mode 100644 index 000000000..48b956aaf Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_hoe_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pickaxe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pickaxe_head.png new file mode 100644 index 000000000..0afc70260 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pickaxe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pickaxe_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pickaxe_head_tip_reinforcement.png new file mode 100644 index 000000000..5147ce43e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pickaxe_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pommel.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pommel.png new file mode 100644 index 000000000..50f604402 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_pommel.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_shovel_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_shovel_head.png new file mode 100644 index 000000000..7d2b20367 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_shovel_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_shovel_head_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_shovel_head_tip_reinforcement.png new file mode 100644 index 000000000..b8ff625ff Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_shovel_head_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_blade.png new file mode 100644 index 000000000..808db2a3c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_blade_tip_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_blade_tip_reinforcement.png new file mode 100644 index 000000000..28473181f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_blade_tip_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_guard.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_guard.png new file mode 100644 index 000000000..136561bb9 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_guard.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_guard_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_guard_reinforcement.png new file mode 100644 index 000000000..83b7b7279 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_guard_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_pommel.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_pommel.png new file mode 100644 index 000000000..6887d4bab Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_sword_pommel.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_tool_pommel.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_tool_pommel.png new file mode 100644 index 000000000..e5b5e199f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/refined/refined_tool_pommel.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sapper_pickaxe_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sapper_pickaxe_head.png new file mode 100644 index 000000000..83a26eb64 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sapper_pickaxe_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sapper_pickaxe_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sapper_pickaxe_head_reinforcement.png new file mode 100644 index 000000000..c5da20e90 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/sapper_pickaxe_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/short_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/short_handle.png new file mode 100644 index 000000000..9d9433c21 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/short_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tomahawk_blade.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tomahawk_blade.png new file mode 100644 index 000000000..488b23a62 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tomahawk_blade.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tomahawk_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tomahawk_head.png new file mode 100644 index 000000000..86e5ab9f8 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/tomahawk_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/cutter_mattock_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/cutter_mattock_head.png new file mode 100644 index 000000000..4ab6097df Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/cutter_mattock_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/cutter_mattock_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/cutter_mattock_head_reinforcement.png new file mode 100644 index 000000000..c9c5bcd2b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/cutter_mattock_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding.png new file mode 100644 index 000000000..d42e06732 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding_gem.png new file mode 100644 index 000000000..52fdd1b2a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding_reinforced.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding_reinforced.png new file mode 100644 index 000000000..0d30e7724 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_binding_reinforced.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_handle.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_handle.png new file mode 100644 index 000000000..a0cbe8ed9 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_handle.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_soft_binding_gem.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_soft_binding_gem.png new file mode 100644 index 000000000..2cc47f993 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/mattock_soft_binding_gem.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/pick_mattock_head.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/pick_mattock_head.png new file mode 100644 index 000000000..ba6c33405 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/pick_mattock_head.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/pick_mattock_head_reinforcement.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/pick_mattock_head_reinforcement.png new file mode 100644 index 000000000..6b5243f83 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/pick_mattock_head_reinforcement.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/soft_mattock_binding.png b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/soft_mattock_binding.png new file mode 100644 index 000000000..878ee719e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/templates/textures/utility/soft_mattock_binding.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_1.png new file mode 100644 index 000000000..2732debd0 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_2.png new file mode 100644 index 000000000..c7c8f9a1c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_3.png new file mode 100644 index 000000000..cdb2aa22b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_4.png new file mode 100644 index 000000000..6ee49bb4a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_5.png new file mode 100644 index 000000000..9343a6052 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/amethyst_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_1.png new file mode 100644 index 000000000..7245afc71 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_2.png new file mode 100644 index 000000000..091832685 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_3.png new file mode 100644 index 000000000..336780d77 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_4.png new file mode 100644 index 000000000..7f22ffa15 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_5.png new file mode 100644 index 000000000..f3af3c318 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/diamond_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_1.png new file mode 100644 index 000000000..6804dc38c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_2.png new file mode 100644 index 000000000..9662c451b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_3.png new file mode 100644 index 000000000..9bd511779 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_4.png new file mode 100644 index 000000000..870fec54a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_5.png new file mode 100644 index 000000000..1982181f3 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/echo_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_1.png new file mode 100644 index 000000000..f19c1eda9 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_2.png new file mode 100644 index 000000000..643173285 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_3.png new file mode 100644 index 000000000..0e1c67e0a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_4.png new file mode 100644 index 000000000..aaa8b62db Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_5.png new file mode 100644 index 000000000..1947cb7be Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/emerald_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_palette.aseprite b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_palette.aseprite new file mode 100644 index 000000000..b22ba739b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gem_palette.aseprite differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_1.png new file mode 100644 index 000000000..ce668ee3f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_2.png new file mode 100644 index 000000000..449c19e10 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_3.png new file mode 100644 index 000000000..a0af684ef Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_4.png new file mode 100644 index 000000000..6618b6341 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_5.png new file mode 100644 index 000000000..fbdcc25a6 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/gray_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/grey_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/grey_gem_4.png new file mode 100644 index 000000000..ad94b3611 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/grey_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/grey_gem_4.png.mcmeta b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/grey_gem_4.png.mcmeta new file mode 100644 index 000000000..890cd3237 --- /dev/null +++ b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/grey_gem_4.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"frames":[{"index": 0, "time": 3}, {"index": 1, "time": 3}, {"index": 2, "time": 3}, {"index": 3, "time": 3}, {"index": 4, "time": 3}, {"index": 5, "time": 3}, {"index": 6, "time": 3}, {"index": 7, "time": 3}, {"index": 8, "time": 3}, {"index": 9, "time": 3}, {"index": 10, "time": 3}, {"index": 11, "time": 3}]}} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_1.png new file mode 100644 index 000000000..795e30a7e Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_2.png new file mode 100644 index 000000000..82a98ae3f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_3.png new file mode 100644 index 000000000..3406a280c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_4.png new file mode 100644 index 000000000..380945017 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_5.png new file mode 100644 index 000000000..9d2d6b8bb Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/lapis_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_1.png new file mode 100644 index 000000000..10f6f7f03 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_2.png new file mode 100644 index 000000000..05cac820c Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_3.png new file mode 100644 index 000000000..c66050b5b Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_4.png new file mode 100644 index 000000000..f93d30e96 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_5.png new file mode 100644 index 000000000..6c68ad399 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/prismarine_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_1.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_1.png new file mode 100644 index 000000000..0158afe0a Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_1.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_2.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_2.png new file mode 100644 index 000000000..369733597 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_2.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_3.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_3.png new file mode 100644 index 000000000..c89d7475d Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_3.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_4.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_4.png new file mode 100644 index 000000000..ab2f71e81 Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_4.png differ diff --git a/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_5.png b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_5.png new file mode 100644 index 000000000..b5740188f Binary files /dev/null and b/content/forgero-extended/src/main/resources/assets/forgero/textures/item/quartz_gem_5.png differ diff --git a/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/diamond_gem.json b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/diamond_gem.json new file mode 100644 index 000000000..2d6ea0b01 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/diamond_gem.json @@ -0,0 +1,12 @@ +{ + "id": "diamond_gem_from_ore", + "tables": [ + "minecraft:blocks/diamond_ore", + "minecraft:blocks/deepslate_diamond_ore" + ], + "ids": [ + "forgero:diamond_gem_1" + ], + "chance": 0.025, + "rolls": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/echo_gem.json b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/echo_gem.json new file mode 100644 index 000000000..d25e51ad9 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/echo_gem.json @@ -0,0 +1,11 @@ +{ + "id": "echo_gem_from_ore", + "tables": [ + "minecraft:chests/ancient_city" + ], + "ids": [ + "forgero:echo_gem_1" + ], + "chance": 0.0125, + "rolls": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/emerald_gem.json b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/emerald_gem.json new file mode 100644 index 000000000..f8cd3d0d6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/emerald_gem.json @@ -0,0 +1,12 @@ +{ + "id": "emerald_gem_from_ore", + "tables": [ + "minecraft:blocks/emerald_ore", + "minecraft:blocks/deepslate_emerald_ore" + ], + "ids": [ + "forgero:emerald_gem_1" + ], + "chance": 0.025, + "rolls": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/lapis_gem.json b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/lapis_gem.json new file mode 100644 index 000000000..6e17d7cee --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/lapis_gem.json @@ -0,0 +1,12 @@ +{ + "id": "lapis_gem_from_ore", + "tables": [ + "minecraft:blocks/lapis_ore", + "minecraft:blocks/deepslate_lapis_ore" + ], + "ids": [ + "forgero:lapis_gem_1" + ], + "chance": 0.010, + "rolls": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/prismarine_gem.json b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/prismarine_gem.json new file mode 100644 index 000000000..0c4fecd76 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/prismarine_gem.json @@ -0,0 +1,11 @@ +{ + "id": "prismarine_gem_from_entity", + "tables": [ + "minecraft:entities/guardian" + ], + "ids": [ + "forgero:prismarine_gem_1" + ], + "chance": 0.025, + "rolls": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/quartz_gem.json b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/quartz_gem.json new file mode 100644 index 000000000..0edefab3d --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/forgero_loot/quartz_gem.json @@ -0,0 +1,11 @@ +{ + "id": "quartz_gem_from_ore", + "tables": [ + "minecraft:blocks/nether_quartz_ore" + ], + "ids": [ + "forgero:quartz_gem_1" + ], + "chance": 0.010, + "rolls": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pattern_mining_schematics/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/felling_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/felling_axe_head.json new file mode 100644 index 000000000..0e60d4283 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/felling_axe_head.json @@ -0,0 +1,42 @@ +{ + "type": "AXE_HEAD", + "models": [ + { + "name": "felling_axe_head", + "type": "GENERATE", + "template": "broadmining/felling_axe_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "axe_head_material", + "variants": [ + { + "target": [ + "model:broadmining/felling_axe_head.png" + ], + "template": "broadmining/felling_axe_head_reinforcement.png" + } + ] + }, + { + "name": "axe_dye", + "variants": [ + { + "target": [ + "model:broadmining/felling_axe_head.png" + ], + "template": "broadmining/felling_axe_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:felling_axe_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "felling_axe_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/hammer_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/hammer_head.json new file mode 100644 index 000000000..118d1e023 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/hammer_head.json @@ -0,0 +1,42 @@ +{ + "type": "PICKAXE_HEAD", + "models": [ + { + "name": "hammer_head", + "type": "GENERATE", + "template": "broadmining/hammer_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "pickaxe_head_material", + "variants": [ + { + "target": [ + "model:broadmining/hammer_head.png" + ], + "template": "broadmining/hammer_head_reinforcement.png" + } + ] + }, + { + "name": "pickaxe_dye", + "variants": [ + { + "target": [ + "model:broadmining/hammer_head.png" + ], + "template": "broadmining/hammer_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:hammer_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "hammer_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/mandrill_pickaxe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/mandrill_pickaxe_head.json new file mode 100644 index 000000000..04a87d34e --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/mandrill_pickaxe_head.json @@ -0,0 +1,42 @@ +{ + "type": "PICKAXE_HEAD", + "models": [ + { + "name": "mandrill_pickaxe_head", + "modelType": "GENERATE", + "template": "broadmining/mandrill_pickaxe_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "pickaxe_head_material", + "variants": [ + { + "target": [ + "model:broadmining/mandrill_pickaxe_head.png" + ], + "template": "broadmining/mandrill_pickaxe_head_reinforcement.png" + } + ] + }, + { + "name": "pickaxe_dye", + "variants": [ + { + "target": [ + "model:broadmining/mandrill_pickaxe_head.png" + ], + "template": "broadmining/mandrill_pickaxe_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:mandrill_pickaxe_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "mandrill_pickaxe_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/spade_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/spade_head.json new file mode 100644 index 000000000..207b4e632 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/models/spade_head.json @@ -0,0 +1,42 @@ +{ + "type": "SHOVEL_HEAD", + "models": [ + { + "name": "spade_head", + "modelType": "GENERATE", + "template": "broadmining/spade_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "shovel_head_material", + "variants": [ + { + "target": [ + "model:broadmining/spade_head.png" + ], + "template": "broadmining/spade_head_reinforcement.png" + } + ] + }, + { + "name": "shovel_dye", + "variants": [ + { + "target": [ + "model:broadmining/spade_head.png" + ], + "template": "broadmining/spade_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:spade_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "spade_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/package.json new file mode 100644 index 000000000..1cecabb52 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/package.json @@ -0,0 +1,11 @@ +{ + "name": "forgero-broad_mining", + "resource_type": "PACKAGE", + "priority": 4, + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero", + "forgero-vanilla" + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/schematic/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/schematic/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/felling_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/felling_axe_head.json new file mode 100644 index 000000000..90c3eb30a --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/felling_axe_head.json @@ -0,0 +1,109 @@ +{ + "type": "AXE_HEAD_SCHEMATIC", + "name": "felling_axe_head-schematic", + "parent": "axe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "AXE_HEAD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 3 + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.35 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.5 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + { + "type": "minecraft:block_breaking", + "selector": { + "type": "forgero:radius", + "filter": "forgero:similar_block", + "radius": 2 + }, + "speed": { + "type": "forgero:all" + }, + "predicate": { + "type": "minecraft:block", + "tag": "forgero:vein_mining_logs" + }, + "title": "feature.forgero.vein_mining.title", + "description": "feature.forgero.wood_vein_mining.description" + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "axe", + "to": "felling_axe" + }, + "better_compat_attribute_container": "forgero:axe" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/hammer_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/hammer_head.json new file mode 100644 index 000000000..e8f76e9b7 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/hammer_head.json @@ -0,0 +1,115 @@ +{ + "type": "PICKAXE_HEAD_SCHEMATIC", + "name": "hammer_head-schematic", + "parent": "pickaxe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "PICKAXE_HEAD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 3 + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.25 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.55 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.15 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + { + "type": "minecraft:block_breaking", + "selector": { + "type": "forgero:pattern", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "filter": "forgero:can_mine" + }, + "speed": "forgero:all", + "predicate": { + "type": "forgero:can_mine" + }, + "title": "feature.forgero.pattern_mining.title", + "description": "feature.forgero.pattern_mining.3x3-description" + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "pickaxe", + "to": "hammer" + }, + "better_compat_attribute_container": "forgero:hammer" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/mandrill_pickaxe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/mandrill_pickaxe_head.json new file mode 100644 index 000000000..f8c95db73 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/mandrill_pickaxe_head.json @@ -0,0 +1,113 @@ +{ + "type": "PICKAXE_HEAD_SCHEMATIC", + "name": "mandrill_pickaxe_head-schematic", + "parent": "pickaxe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "PICKAXE_HEAD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 3 + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.45 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.75 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + { + "type": "minecraft:block_breaking", + "selector": { + "type": "forgero:radius", + "filter": [ + "forgero:can_mine", + { + "type": "minecraft:block", + "tag": "forgero:vein_mining_ores" + } + ], + "radius": 10 + }, + "speed": "forgero:all", + "predicate": { + "type": "minecraft:block", + "tag": "forgero:vein_mining_ores" + }, + "title": "feature.forgero.vein_mining.title", + "description": "feature.forgero.ore_vein_mining.description" + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "pickaxe", + "to": "mandrill_pickaxe" + }, + "better_compat_attribute_container": "forgero:pickaxe" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/spade_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/spade_head.json new file mode 100644 index 000000000..5525dfe4d --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-broad_mining/schematic/spade_head.json @@ -0,0 +1,116 @@ +{ + "type": "SHOVEL_HEAD_SCHEMATIC", + "name": "spade_head-schematic", + "parent": "shovel_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SHOVEL_HEAD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 3 + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.35 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.55 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.15 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + { + "type": "minecraft:block_breaking", + "selector": { + "type": "forgero:pattern", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "depth": 1, + "direction": "multi", + "filter": "forgero:can_mine" + }, + "speed": "forgero:all", + "predicate": { + "type": "forgero:can_mine" + }, + "title": "feature.forgero.pattern_mining.title", + "description": "feature.forgero.pattern_mining.3x3-description" + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "shovel", + "to": "spade" + } + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/models/handle.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/models/handle.json deleted file mode 100644 index 42466e938..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/models/handle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "HANDLE", - "models": [ - { - "name": "handle", - "variants": [ - { - "target": [ - "type:CLUB" - ], - "template": "axe_handle.png" - } - ] - } - ] -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club_head_schematic.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club_head_schematic.json deleted file mode 100644 index 297f47709..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club_head_schematic.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "WEAPON_HEAD_SCHEMATIC", - "name": "CLUB_HEAD_SCHEMATIC" -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/club_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/club_head.json new file mode 100644 index 000000000..6eec63a56 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/club_head.json @@ -0,0 +1,50 @@ +{ + "type": "SIMPLE_WEAPON_HEAD", + "models": [ + { + "name": "club_head", + "type": "GENERATE", + "template": "exotic/club_head.png", + "palette": "WOOD", + "order": 20 + }, + { + "name": "simple_weapon_head_material", + "type": "GENERATE", + "palette": "MATERIAL", + "template": "exotic/club_head_reinforcement.png", + "order": 30 + }, + { + "name": "simple_weapon_head_dye", + "template": "exotic/club_head.png", + "type": "GENERATE", + "palette": "DYE", + "order": 25 + }, + { + "target": [ + "type:WOOD", + "type:SIMPLE_WEAPON_HEAD_SCHEMATIC" + ], + "modelType": "BASED_COMPOSITE", + "template": "club_head" + }, + { + "target": [ + "type:MATERIAL", + "slot:0" + ], + "modelType": "UPGRADE", + "template": "simple_weapon_head_material" + }, + { + "target": [ + "type:DYE", + "slot:1" + ], + "modelType": "UPGRADE", + "template": "simple_weapon_head_dye" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/cutlass_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/cutlass_blade.json new file mode 100644 index 000000000..0dff5f4bb --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/cutlass_blade.json @@ -0,0 +1,42 @@ +{ + "type": "SWORD_BLADE", + "models": [ + { + "name": "cutlass_blade", + "type": "GENERATE", + "template": "exotic/cutlass_blade.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "sword_blade_material", + "variants": [ + { + "target": [ + "model:exotic/cutlass_blade.png" + ], + "template": "exotic/cutlass_blade_reinforcement.png" + } + ] + }, + { + "name": "sword_blade_dye", + "variants": [ + { + "target": [ + "model:exotic/cutlass_blade.png" + ], + "template": "exotic/cutlass_blade.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:cutlass_blade-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "cutlass_blade" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/katana_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/katana_blade.json similarity index 69% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/katana_blade.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/katana_blade.json index fb2891f12..c1edda1c6 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/katana_blade.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/katana_blade.json @@ -3,19 +3,19 @@ "models": [ { "name": "katana_blade", - "template": "katana_blade.png", "type": "GENERATE", + "template": "exotic/katana_blade.png", "palette": "TOOL_MATERIAL", - "order": 40 + "order": 20 }, { "name": "sword_blade_material", "variants": [ { "target": [ - "model:katana_blade.png" + "model:exotic/katana_blade.png" ], - "template": "katana_blade_tip_reinforcement.png" + "template": "exotic/katana_blade_reinforcement.png" } ] }, @@ -24,9 +24,9 @@ "variants": [ { "target": [ - "model:katana_blade.png" + "model:exotic/katana_blade.png" ], - "template": "katana_blade.png" + "template": "exotic/katana_blade.png" } ] }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/mace_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/mace_head.json new file mode 100644 index 000000000..7a082e94a --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/mace_head.json @@ -0,0 +1,42 @@ +{ + "type": "SIMPLE_WEAPON_HEAD", + "models": [ + { + "name": "mace_head", + "type": "GENERATE", + "template": "exotic/mace_head.png", + "palette": "METAL", + "order": 20 + }, + { + "name": "simple_weapon_head_material", + "variants": [ + { + "target": [ + "model:exotic/mace_head.png" + ], + "template": "exotic/mace_head_reinforcement.png" + } + ] + }, + { + "name": "simple_weapon_head_dye", + "variants": [ + { + "target": [ + "model:exotic/mace_head.png" + ], + "template": "exotic/mace_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:mace_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "mace_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/knife_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/rapier_blade.json similarity index 59% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/knife_blade.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/rapier_blade.json index 8d1a32bbc..094af0993 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/knife_blade.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/models/rapier_blade.json @@ -2,9 +2,9 @@ "type": "SWORD_BLADE", "models": [ { - "name": "knife_blade", - "template": "knife_blade.png", + "name": "rapier_blade", "type": "GENERATE", + "template": "exotic/rapier_blade.png", "palette": "TOOL_MATERIAL", "order": 20 }, @@ -13,9 +13,9 @@ "variants": [ { "target": [ - "model:knife_blade.png" + "model:exotic/rapier_blade.png" ], - "template": "knife_blade_tip_reinforcement.png" + "template": "exotic/rapier_blade_reinforcement.png" } ] }, @@ -24,19 +24,19 @@ "variants": [ { "target": [ - "model:knife_blade.png" + "model:exotic/rapier_blade.png" ], - "template": "knife_blade.png" + "template": "exotic/rapier_blade.png" } ] }, { "target": [ "type:TOOL_MATERIAL", - "id:knife_blade-schematic" + "id:rapier_blade-schematic" ], "modelType": "BASED_COMPOSITE", - "template": "knife_blade" + "template": "rapier_blade" } ] } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/package.json similarity index 85% rename from content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/package.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/package.json index b4f3ff28f..74cdaf349 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/axe-additions/package.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/package.json @@ -1,5 +1,5 @@ { - "name": "axe-additions", + "name": "forgero-exotic", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", @@ -9,4 +9,4 @@ "forgero-vanilla", "minecraft-vanilla" ] -} \ No newline at end of file +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/club_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/club_head.json new file mode 100644 index 000000000..d663b054f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/club_head.json @@ -0,0 +1,104 @@ +{ + "type": "SIMPLE_WEAPON_HEAD_SCHEMATIC", + "name": "club_head-schematic", + "parent": "simple_weapon_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SIMPLE_WEAPON_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "WOOD", + "unique": true, + "amount": 3 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "WOOD", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 2 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 2 + }, + { + "id": "variant-schematic-attack_speed-composite", + "type": "ATTACK_SPEED", + "value": 1 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.5 + } + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "spear", + "to": "club" + }, + "better_compat_attribute_container": "forgero:mace" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/cutlass_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/cutlass_blade.json new file mode 100644 index 000000000..26ba8be0c --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/cutlass_blade.json @@ -0,0 +1,104 @@ +{ + "type": "SWORD_BLADE_SCHEMATIC", + "name": "cutlass_blade-schematic", + "parent": "sword_blade_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_BLADE", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 2 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.2 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 1.6 + }, + { + "id": "variant-schematic-attack_speed-composite", + "type": "ATTACK_SPEED", + "value": 1 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.25 + } + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 2, + "context": "LOCAL" + }, + "name_replacement": { + "from": "sword", + "to": "cutlass" + }, + "better_compat_attribute_container": "forgero:cutlass" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/katana_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/katana_blade.json new file mode 100644 index 000000000..4b06d9686 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/katana_blade.json @@ -0,0 +1,104 @@ +{ + "type": "SWORD_BLADE_SCHEMATIC", + "name": "katana_blade-schematic", + "parent": "sword_blade_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_BLADE", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 2 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.3 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 1.4 + }, + { + "id": "variant-schematic-attack_speed-composite", + "type": "ATTACK_SPEED", + "value": 1 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.75 + } + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 2, + "context": "LOCAL" + }, + "name_replacement": { + "from": "sword", + "to": "katana" + }, + "better_compat_attribute_container": "forgero:katana" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/mace_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/mace_head.json new file mode 100644 index 000000000..87b26381a --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/mace_head.json @@ -0,0 +1,104 @@ +{ + "type": "SIMPLE_WEAPON_HEAD_SCHEMATIC", + "name": "mace_head-schematic", + "parent": "simple_weapon_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SIMPLE_WEAPON_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "METAL", + "unique": true, + "amount": 4 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "METAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 2 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 2.2 + }, + { + "id": "variant-schematic-attack_speed-composite", + "type": "ATTACK_SPEED", + "value": 1 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.75 + } + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 4, + "context": "LOCAL" + }, + "name_replacement": { + "from": "spear", + "to": "mace" + }, + "better_compat_attribute_container": "forgero:mace" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/rapier_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/rapier_blade.json new file mode 100644 index 000000000..66bc2d066 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-exotic/schematic/rapier_blade.json @@ -0,0 +1,111 @@ +{ + "type": "SWORD_BLADE_SCHEMATIC", + "name": "rapier_blade-schematic", + "parent": "sword_blade_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_BLADE", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 2 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 1.2 + }, + { + "id": "variant-schematic-attack_speed-composite", + "type": "ATTACK_SPEED", + "value": 1 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.45 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-reach", + "type": "forgero:reach", + "value": 5.25 + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 2, + "context": "LOCAL" + }, + "name_replacement": { + "from": "sword", + "to": "rapier" + }, + "better_compat_attribute_container": "forgero:rapier" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/models/pommel.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/models/pommel.json deleted file mode 100644 index d6d552d6c..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/models/pommel.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "type": "POMMEL", - "models": [ - { - "target": [ - "type:METAL", - "id:pommel-schematic" - ], - "modelType": "BASED_COMPOSITE", - "template": "handle_pommel" - }, - { - "name": "handle_pommel", - "template": "pommel.png", - "type": "GENERATE", - "palette": "METAL", - "order": 60, - "offset": [ - 5, - 5 - ], - "variants": [ - { - "target": [ - "type:SWORD" - ], - "offset": [ - -1, - -1 - ] - } - ] - }, - { - "name": "pommel_dye", - "template": "pommel.png", - "type": "GENERATE", - "palette": "DYE", - "order": 65, - "offset": [ - 5, - 5 - ], - "variants": [ - { - "target": [ - "type:SWORD" - ], - "offset": [ - -1, - -1 - ] - } - ] - }, - { - "target": [ - "type:DYE", - "slot:0" - ], - "modelType": "UPGRADE", - "template": "pommel_dye" - } - ] -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_1.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_1.json new file mode 100644 index 000000000..9215ca6aa --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_1.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "amethyst_gem_1", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_LEVEL", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 1 + } + ] + }, + "palette": { + "name": "amethyst_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_2.json new file mode 100644 index 000000000..c75599d90 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_2.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "amethyst_gem_2", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_LEVEL", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 2 + } + ] + }, + "palette": { + "name": "amethyst_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_3.json new file mode 100644 index 000000000..b5513c45a --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_3.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "amethyst_gem_3", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_LEVEL", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 3 + } + ] + }, + "palette": { + "name": "amethyst_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_4.json new file mode 100644 index 000000000..3db27df99 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_4.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "amethyst_gem_4", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_LEVEL", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 4 + } + ] + }, + "palette": { + "name": "amethyst_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_5.json new file mode 100644 index 000000000..5c4f4ce1c --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/amethyst/amethyst_gem_5.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "amethyst_gem_5", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_LEVEL", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 5 + } + ] + }, + "palette": { + "name": "amethyst_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_1.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_1.json new file mode 100644 index 000000000..f52e2f701 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_1.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "diamond_gem_1", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "DURABILITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 250 + } + ] + }, + "palette": { + "name": "diamond_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_2.json new file mode 100644 index 000000000..68f61cbe4 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_2.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "diamond_gem_2", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "DURABILITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 750 + } + ] + }, + "palette": { + "name": "diamond_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_3.json new file mode 100644 index 000000000..44d6293b4 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_3.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "diamond_gem_3", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "DURABILITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 1250 + } + ] + }, + "palette": { + "name": "diamond_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_4.json new file mode 100644 index 000000000..d0a29e03f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_4.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "diamond_gem_4", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "DURABILITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 1750 + } + ] + }, + "palette": { + "name": "diamond_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_5.json new file mode 100644 index 000000000..ed8b80aa0 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/diamond/diamond_gem_5.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "diamond_gem_5", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "DURABILITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 2250 + } + ] + }, + "palette": { + "name": "diamond_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_1.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_1.json new file mode 100644 index 000000000..e55c881ed --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_1.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "echo_gem_1", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_SPEED", + "order": "BASE", + "context": "UPGRADE", + "category": "ALL", + "operation": "ADDITION", + "value": 1 + } + ] + }, + "palette": { + "name": "echo_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_2.json new file mode 100644 index 000000000..e76bacfc7 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_2.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "echo_gem_2", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 2 + } + ] + }, + "palette": { + "name": "echo_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_3.json new file mode 100644 index 000000000..a4bee5741 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_3.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "echo_gem_3", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 3 + } + ] + }, + "palette": { + "name": "echo_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_4.json new file mode 100644 index 000000000..37220e485 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_4.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "echo_gem_4", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 4 + } + ] + }, + "palette": { + "name": "echo_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_5.json new file mode 100644 index 000000000..dfc3990ac --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/echo/echo_gem_5.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "echo_gem_5", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "MINING_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 5 + } + ] + }, + "palette": { + "name": "echo_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_1.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_1.json new file mode 100644 index 000000000..7f51a1072 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_1.json @@ -0,0 +1,32 @@ +{ + "type": "GEM", + "name": "emerald_gem_1", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 0.15 + } + ] + }, + "palette": { + "name": "emerald_gem" + } +} + diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_2.json new file mode 100644 index 000000000..fae7a4adc --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_2.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "emerald_gem_2", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 0.3 + } + ] + }, + "palette": { + "name": "emerald_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_3.json new file mode 100644 index 000000000..ae1ea8bd3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_3.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "emerald_gem_3", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 0.45 + } + ] + }, + "palette": { + "name": "emerald_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_4.json new file mode 100644 index 000000000..7729a9f88 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_4.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "emerald_gem_4", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 0.6 + } + ] + }, + "palette": { + "name": "emerald_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_5.json new file mode 100644 index 000000000..261382171 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/emerald/emerald_gem_5.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "emerald_gem_5", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_SPEED", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 0.75 + } + ] + }, + "palette": { + "name": "emerald_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_1.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_1.json new file mode 100644 index 000000000..3ef2a38c7 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_1.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "lapis_gem_1", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "forgero:reach", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 0.5 + } + ] + }, + "palette": { + "name": "lapis_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_2.json new file mode 100644 index 000000000..05e4b027e --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_2.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "lapis_gem_2", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "forgero:reach", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 1 + } + ] + }, + "palette": { + "name": "lapis_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_3.json new file mode 100644 index 000000000..d77c39a8b --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_3.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "lapis_gem_3", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "forgero:reach", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 1.5 + } + ] + }, + "palette": { + "name": "lapis_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_4.json new file mode 100644 index 000000000..056145b96 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_4.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "lapis_gem_4", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "forgero:reach", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 2 + } + ] + }, + "palette": { + "name": "lapis_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_5.json new file mode 100644 index 000000000..3e02313ec --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/lapis/lapis_gem_5.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "lapis_gem_5", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "forgero:reach", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 2.5 + } + ] + }, + "palette": { + "name": "lapis_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_1.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_1.json new file mode 100644 index 000000000..55f3d9170 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_1.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "prismarine_gem_1", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_DAMAGE", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 1 + } + ] + }, + "palette": { + "name": "prismarine_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_2.json new file mode 100644 index 000000000..fffb8e77f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_2.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "prismarine_gem_2", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_DAMAGE", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 2 + } + ] + }, + "palette": { + "name": "prismarine_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_3.json new file mode 100644 index 000000000..530a93f61 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_3.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "prismarine_gem_3", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_DAMAGE", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 3 + } + ] + }, + "palette": { + "name": "prismarine_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_4.json new file mode 100644 index 000000000..35797ec7f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_4.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "prismarine_gem_4", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_DAMAGE", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 4 + } + ] + }, + "palette": { + "name": "prismarine_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_5.json new file mode 100644 index 000000000..b0c12f68c --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/prismarine/prismarine_gem_5.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "prismarine_gem_5", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ATTACK_DAMAGE", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 5 + } + ] + }, + "palette": { + "name": "prismarine_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_1.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_1.json new file mode 100644 index 000000000..479c63d59 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_1.json @@ -0,0 +1,32 @@ +{ + "type": "GEM", + "name": "quartz_gem_1", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ARMOR", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 1 + } + ] + }, + "palette": { + "name": "quartz_gem" + } +} + diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_2.json new file mode 100644 index 000000000..7314299f7 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_2.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "quartz_gem_2", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ARMOR", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 2 + } + ] + }, + "palette": { + "name": "quartz_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_3.json new file mode 100644 index 000000000..a9307b7ea --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_3.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "quartz_gem_3", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ARMOR", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 3 + } + ] + }, + "palette": { + "name": "quartz_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_4.json new file mode 100644 index 000000000..dbcf8a7de --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_4.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "quartz_gem_4", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ARMOR", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 4 + } + ] + }, + "palette": { + "name": "quartz_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_5.json new file mode 100644 index 000000000..b3b28b024 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/gems/quartz/quartz_gem_5.json @@ -0,0 +1,31 @@ +{ + "type": "GEM", + "name": "quartz_gem_5", + "container": { + "type": "CREATE", + "id": "this" + }, + "properties": { + "attributes": [ + { + "type": "RARITY", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 30 + }, + { + "type": "ARMOR", + "context": "UPGRADE", + "order": "BASE", + "category": "ALL", + "operation": "ADDITION", + "value": 5 + } + ] + }, + "palette": { + "name": "quartz_gem" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/package.json similarity index 83% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/package.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/package.json index 96a608d8e..033662c60 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/package.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/package.json @@ -1,5 +1,5 @@ { - "name": "forgero-extended", + "name": "forgero-gems", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", @@ -8,4 +8,4 @@ "forgero", "forgero-vanilla" ] -} \ No newline at end of file +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/type/default.json similarity index 95% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/type/default.json index 76715c201..fda08b6c9 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/default.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/type/default.json @@ -1,3 +1,3 @@ { "resource_type": "TYPE_DEFINITION" -} \ No newline at end of file +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/type/trinket/gem.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/type/gem/gem.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-trinkets/type/trinket/gem.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-gems/type/gem/gem.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/default.json new file mode 100644 index 000000000..886f71ba2 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/default.json @@ -0,0 +1,7 @@ +{ + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero" + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/cruciform_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/cruciform_sword_guard.json new file mode 100644 index 000000000..67dada1d1 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/cruciform_sword_guard.json @@ -0,0 +1,42 @@ +{ + "type": "SWORD_GUARD", + "models": [ + { + "name": "cruciform_sword_guard", + "template": "guards/cruciform_sword_guard.png", + "type": "GENERATE", + "palette": "TOOL_MATERIAL", + "order": 60 + }, + { + "name": "sword_guard_reinforcement", + "variants": [ + { + "target": [ + "model:guards/cruciform_sword_guard.png" + ], + "template": "guards/cruciform_sword_guard_reinforcement.png" + } + ] + }, + { + "name": "sword_guard_dye", + "variants": [ + { + "target": [ + "model:guards/cruciform_sword_guard.png" + ], + "template": "guards/cruciform_sword_guard.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:cruciform_sword_guard-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "cruciform_sword_guard" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/half_basket_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/half_basket_sword_guard.json new file mode 100644 index 000000000..3c9e7a350 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/half_basket_sword_guard.json @@ -0,0 +1,42 @@ +{ + "type": "SWORD_GUARD", + "models": [ + { + "name": "half_basket_sword_guard", + "template": "guards/half_basket_sword_guard.png", + "type": "GENERATE", + "palette": "TOOL_MATERIAL", + "order": 60 + }, + { + "name": "sword_guard_reinforcement", + "variants": [ + { + "target": [ + "model:guards/half_basket_sword_guard.png" + ], + "template": "guards/half_basket_sword_guard_reinforcement.png" + } + ] + }, + { + "name": "sword_guard_dye", + "variants": [ + { + "target": [ + "model:guards/half_basket_sword_guard.png" + ], + "template": "guards/half_basket_sword_guard.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:half_basket_sword_guard-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "half_basket_sword_guard" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/mechanized_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/mechanized_sword_guard.json new file mode 100644 index 000000000..a1ad3335f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/mechanized_sword_guard.json @@ -0,0 +1,42 @@ +{ + "type": "SWORD_GUARD", + "models": [ + { + "name": "mechanized_sword_guard", + "template": "guards/mechanized_sword_guard.png", + "type": "GENERATE", + "palette": "TOOL_MATERIAL", + "order": 60 + }, + { + "name": "sword_guard_reinforcement", + "variants": [ + { + "target": [ + "model:guards/mechanized_sword_guard.png" + ], + "template": "guards/mechanized_sword_guard_reinforcement.png" + } + ] + }, + { + "name": "sword_guard_dye", + "variants": [ + { + "target": [ + "model:guards/mechanized_sword_guard.png" + ], + "template": "guards/mechanized_sword_guard.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:mechanized_sword_guard-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "mechanized_sword_guard" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/rounded_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/rounded_sword_guard.json new file mode 100644 index 000000000..a7d909d81 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/rounded_sword_guard.json @@ -0,0 +1,42 @@ +{ + "type": "SWORD_GUARD", + "models": [ + { + "name": "rounded_sword_guard", + "template": "guards/rounded_sword_guard.png", + "type": "GENERATE", + "palette": "TOOL_MATERIAL", + "order": 60 + }, + { + "name": "sword_guard_reinforcement", + "variants": [ + { + "target": [ + "model:guards/rounded_sword_guard.png" + ], + "template": "guards/rounded_sword_guard_reinforcement.png" + } + ] + }, + { + "name": "sword_guard_dye", + "variants": [ + { + "target": [ + "model:guards/rounded_sword_guard.png" + ], + "template": "guards/rounded_sword_guard.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:rounded_sword_guard-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "rounded_sword_guard" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/shell_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/shell_sword_guard.json new file mode 100644 index 000000000..40fe05efb --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/shell_sword_guard.json @@ -0,0 +1,53 @@ +{ + "type": "SWORD_GUARD", + "models": [ + { + "name": "shell_sword_guard", + "template": "guards/shell_sword_guard.png", + "type": "GENERATE", + "palette": "TOOL_MATERIAL", + "order": 60 + }, + { + "name": "sword_guard_reinforcement", + "variants": [ + { + "target": [ + "model:guards/shell_sword_guard.png" + ], + "template": "guards/shell_sword_guard_reinforcement.png" + } + ] + }, + { + "name": "sword_guard_dye", + "variants": [ + { + "target": [ + "model:guards/shell_sword_guard.png" + ], + "template": "guards/shell_sword_guard.png" + } + ] + }, + { + "name": "guard_gem", + "variants": [ + { + "target": [ + "model:guards/shell_sword_guard.png" + ], + "template": "guards/sword_gem_shell.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:shell_sword_guard-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "shell_sword_guard" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/swept_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/swept_sword_guard.json new file mode 100644 index 000000000..1e6197837 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/swept_sword_guard.json @@ -0,0 +1,42 @@ +{ + "type": "SWORD_GUARD", + "models": [ + { + "name": "swept_sword_guard", + "template": "guards/swept_sword_guard.png", + "type": "GENERATE", + "palette": "TOOL_MATERIAL", + "order": 60 + }, + { + "name": "sword_guard_reinforcement", + "variants": [ + { + "target": [ + "model:guards/swept_sword_guard.png" + ], + "template": "guards/swept_sword_guard_reinforcement.png" + } + ] + }, + { + "name": "sword_guard_dye", + "variants": [ + { + "target": [ + "model:guards/swept_sword_guard.png" + ], + "template": "guards/swept_sword_guard.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:swept_sword_guard-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "swept_sword_guard" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/tsuba_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/tsuba_sword_guard.json new file mode 100644 index 000000000..bc8b7e032 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/models/tsuba_sword_guard.json @@ -0,0 +1,42 @@ +{ + "type": "SWORD_GUARD", + "models": [ + { + "name": "tsuba_sword_guard", + "template": "guards/tsuba_sword_guard.png", + "type": "GENERATE", + "palette": "TOOL_MATERIAL", + "order": 60 + }, + { + "name": "sword_guard_reinforcement", + "variants": [ + { + "target": [ + "model:guards/tsuba_sword_guard.png" + ], + "template": "guards/tsuba_sword_guard_reinforcement.png" + } + ] + }, + { + "name": "sword_guard_dye", + "variants": [ + { + "target": [ + "model:guards/tsuba_sword_guard.png" + ], + "template": "guards/tsuba_sword_guard.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:tsuba_sword_guard-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "tsuba_sword_guard" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/package.json similarity index 85% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/package.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/package.json index 0185d4af4..05415d197 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/package.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/package.json @@ -1,5 +1,5 @@ { - "name": "sword-additions", + "name": "forgero-guards", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", @@ -9,4 +9,4 @@ "forgero-vanilla", "minecraft-vanilla" ] -} \ No newline at end of file +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/cruciform_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/cruciform_sword_guard.json new file mode 100644 index 000000000..b368364a0 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/cruciform_sword_guard.json @@ -0,0 +1,95 @@ +{ + "type": "SWORD_GUARD_SCHEMATIC", + "name": "cruciform_sword_guard-schematic", + "parent": "sword_guard-schematic", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_GUARD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL" + }, + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "TRINKET", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.45 + }, + { + "id": "variant-schematic-armor-composite", + "type": "ARMOR", + "value": 0.5 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.35 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": "2" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/default.json new file mode 100644 index 000000000..c211083e3 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/default.json @@ -0,0 +1,3 @@ +{ + "resource_type": "SCHEMATIC" +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/half_basket_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/half_basket_sword_guard.json new file mode 100644 index 000000000..3337ff7fb --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/half_basket_sword_guard.json @@ -0,0 +1,95 @@ +{ + "type": "SWORD_GUARD_SCHEMATIC", + "name": "half_basket_sword_guard-schematic", + "parent": "sword_guard-schematic", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_GUARD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL" + }, + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "TRINKET", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.75 + }, + { + "id": "variant-schematic-armor-composite", + "type": "ARMOR", + "value": 1.5 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.65 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": "2" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/mechanized_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/mechanized_sword_guard.json new file mode 100644 index 000000000..daa82e704 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/mechanized_sword_guard.json @@ -0,0 +1,100 @@ +{ + "type": "SWORD_GUARD_SCHEMATIC", + "name": "mechanized_sword_guard-schematic", + "parent": "sword_guard-schematic", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_GUARD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL" + }, + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "TRINKET", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.2 + }, + { + "id": "variant-schematic-armor-composite", + "type": "ARMOR", + "value": 0 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.2 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "attack_damage", + "value": 0.15 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": "2" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/rounded_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/rounded_sword_guard.json new file mode 100644 index 000000000..65c86bb91 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/rounded_sword_guard.json @@ -0,0 +1,100 @@ +{ + "type": "SWORD_GUARD_SCHEMATIC", + "name": "rounded_sword_guard-schematic", + "parent": "sword_guard-schematic", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_GUARD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL" + }, + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "TRINKET", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.4 + }, + { + "id": "variant-schematic-armor-composite", + "type": "ARMOR", + "value": 0.25 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.46 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "attack_damage", + "value": 0 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": "2" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/shell_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/shell_sword_guard.json new file mode 100644 index 000000000..194e5368e --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/shell_sword_guard.json @@ -0,0 +1,100 @@ +{ + "type": "SWORD_GUARD_SCHEMATIC", + "name": "shell_sword_guard-schematic", + "parent": "sword_guard-schematic", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_GUARD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL" + }, + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "TRINKET", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.15 + }, + { + "id": "variant-schematic-armor-composite", + "type": "ARMOR", + "value": -0.25 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.15 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "attack_damage", + "value": 0.20 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": "2" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/swept_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/swept_sword_guard.json new file mode 100644 index 000000000..fddf1ed2f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/swept_sword_guard.json @@ -0,0 +1,95 @@ +{ + "type": "SWORD_GUARD_SCHEMATIC", + "name": "swept_sword_guard-schematic", + "parent": "sword_guard-schematic", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_GUARD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL" + }, + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "TRINKET", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.55 + }, + { + "id": "variant-schematic-armor-composite", + "type": "ARMOR", + "value": 0.75 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.35 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": "2" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/tsuba_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/tsuba_sword_guard.json new file mode 100644 index 000000000..57a331100 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-guards/schematic/tsuba_sword_guard.json @@ -0,0 +1,100 @@ +{ + "type": "SWORD_GUARD_SCHEMATIC", + "name": "tsuba_sword_guard-schematic", + "parent": "sword_guard-schematic", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_GUARD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL" + }, + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "TRINKET", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.23 + }, + { + "id": "variant-schematic-armor-composite", + "type": "ARMOR", + "value": -0.10 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.175 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "attack_damage", + "value": 0.175 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": "2" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/battle_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/battle_axe_head.json new file mode 100644 index 000000000..9fdbac11a --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/battle_axe_head.json @@ -0,0 +1,42 @@ +{ + "type": "AXE_HEAD", + "models": [ + { + "name": "battle_axe_head", + "type": "GENERATE", + "template": "imperial/battle_axe_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "axe_head_material", + "variants": [ + { + "target": [ + "model:imperial/battle_axe_head.png" + ], + "template": "imperial/battle_axe_head_reinforcement.png" + } + ] + }, + { + "name": "axe_dye", + "variants": [ + { + "target": [ + "model:imperial/battle_axe_head.png" + ], + "template": "imperial/battle_axe_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:battle_axe_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "battle_axe_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/broadsword_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/broadsword_blade.json similarity index 69% rename from content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/broadsword_blade.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/broadsword_blade.json index 2def262bd..5637c4f1b 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/broadsword_blade.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/broadsword_blade.json @@ -3,8 +3,8 @@ "models": [ { "name": "broadsword_blade", - "template": "broadsword_blade.png", "type": "GENERATE", + "template": "imperial/broadsword_blade.png", "palette": "TOOL_MATERIAL", "order": 20 }, @@ -13,9 +13,9 @@ "variants": [ { "target": [ - "model:broadsword_blade.png" + "model:imperial/broadsword_blade.png" ], - "template": "broadsword_blade_tip_reinforcement.png" + "template": "imperial/broadsword_blade_reinforcement.png" } ] }, @@ -24,9 +24,9 @@ "variants": [ { "target": [ - "model:broadsword_blade.png" + "model:imperial/broadsword_blade.png" ], - "template": "broadsword_blade.png" + "template": "imperial/broadsword_blade.png" } ] }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/entrenching_shovel_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/entrenching_shovel_head.json new file mode 100644 index 000000000..64bd0b1e5 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/entrenching_shovel_head.json @@ -0,0 +1,42 @@ +{ + "type": "SHOVEL_HEAD", + "models": [ + { + "name": "entrenching_shovel_head", + "modelType": "GENERATE", + "template": "imperial/entrenching_shovel_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "shovel_head_material", + "variants": [ + { + "target": [ + "model:imperial/entrenching_shovel_head.png" + ], + "template": "imperial/entrenching_shovel_head_reinforcement.png" + } + ] + }, + { + "name": "shovel_dye", + "variants": [ + { + "target": [ + "model:imperial/entrenching_shovel_head.png" + ], + "template": "imperial/entrenching_shovel_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:entrenching_shovel_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "entrenching_shovel_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/imperial_binding_mixin.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/imperial_binding_mixin.json new file mode 100644 index 000000000..2587b95dc --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/imperial_binding_mixin.json @@ -0,0 +1,185 @@ +{ + "type": "BINDING", + "models": [ + { + "name": "soft_binding", + "variants": [ + { + "target": [ + "type:CLUB", + "model:imperial/war_hammer_head.png" + ], + "template": "imperial/soft_warhammer_binding.png" + } + ] + }, + { + "name": "soft_binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/soft_sickle_binding.png" + } + ] + }, + { + "name": "soft_binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/soft_sickle_gem.png" + } + ] + }, + { + "name": "soft_binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/soft_sickle_binding.png" + } + ] + }, + { + "name": "binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_binding.png" + } + ] + }, + { + "name": "binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_binding.png" + } + ] + }, + { + "name": "binding_material", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_binding_reinforced.png" + } + ] + }, + { + "name": "binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_binding_gem.png" + } + ] + }, + { + "name": "soft_binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/soft_scythe_binding.png" + } + ] + }, + { + "name": "soft_binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_soft_binding_gem.png" + } + ] + }, + { + "name": "soft_binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/soft_scythe_binding.png" + } + ] + }, + { + "name": "binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_binding.png" + } + ] + }, + { + "name": "binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_binding.png" + } + ] + }, + { + "name": "binding_material", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_binding_reinforced.png" + } + ] + }, + { + "name": "binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_binding_gem.png" + } + ] + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/imperial_handle_mixin.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/imperial_handle_mixin.json new file mode 100644 index 000000000..1f7e87528 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/imperial_handle_mixin.json @@ -0,0 +1,101 @@ +{ + "type": "HANDLE", + "models": [ + { + "name": "handle", + "variants": [ + { + "target": [ + "type:SPEAR", + "model:imperial/spear_head.png" + ], + "template": "handle.png" + } + ] + }, + { + "name": "handle_dye", + "variants": [ + { + "target": [ + "type:SPEAR", + "model:imperial/spear_head.png" + ], + "template": "handle.png" + } + ] + }, + { + "name": "handle", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_handle.png" + } + ] + }, + { + "name": "handle_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_handle.png" + } + ] + }, + { + "name": "grip", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_grip.png" + } + ] + }, + { + "name": "grip", + "variants": [ + { + "target": [ + "type:SPEAR", + "model:imperial/spear_head.png" + ], + "template": "imperial/spear_handle_grip.png" + } + ] + }, + { + "name": "handle", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_handle.png" + } + ] + }, + { + "name": "handle_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_handle.png" + } + ] + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/scythe_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/scythe_blade.json new file mode 100644 index 000000000..4e1298d64 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/scythe_blade.json @@ -0,0 +1,42 @@ +{ + "type": "HOE_HEAD", + "models": [ + { + "name": "scythe_blade", + "modelType": "GENERATE", + "template": "imperial/scythe_blade.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "hoe_dye", + "variants": [ + { + "target": [ + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_blade.png" + } + ] + }, + { + "name": "hoe_head_material", + "variants": [ + { + "target": [ + "model:imperial/scythe_blade.png" + ], + "template": "imperial/scythe_blade_reinforcement.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:scythe_blade-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "scythe_blade" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/sickle_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/sickle_blade.json new file mode 100644 index 000000000..e1ac1eccb --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/sickle_blade.json @@ -0,0 +1,42 @@ +{ + "type": "HOE_HEAD", + "models": [ + { + "name": "sickle_blade", + "type": "GENERATE", + "template": "imperial/sickle_blade.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "hoe_head_material", + "variants": [ + { + "target": [ + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_blade_reinforcement.png" + } + ] + }, + { + "name": "hoe_dye", + "variants": [ + { + "target": [ + "model:imperial/sickle_blade.png" + ], + "template": "imperial/sickle_blade.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:sickle_blade-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "sickle_blade" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/spear_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/spear_head.json new file mode 100644 index 000000000..cb72fcd92 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/spear_head.json @@ -0,0 +1,42 @@ +{ + "type": "SIMPLE_WEAPON_HEAD", + "models": [ + { + "name": "spear_head", + "modelType": "GENERATE", + "template": "imperial/spear_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "simple_weapon_head_material", + "variants": [ + { + "target": [ + "model:imperial/spear_head.png" + ], + "template": "imperial/spear_head_reinforcement.png" + } + ] + }, + { + "name": "simple_weapon_head_dye", + "variants": [ + { + "target": [ + "model:imperial/spear_head.png" + ], + "template": "imperial/spear_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:spear_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "spear_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/war_hammer_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/war_hammer_head.json new file mode 100644 index 000000000..09f5c8ccf --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/models/war_hammer_head.json @@ -0,0 +1,42 @@ +{ + "type": "SIMPLE_WEAPON_HEAD", + "models": [ + { + "name": "war_hammer_head", + "type": "GENERATE", + "template": "imperial/war_hammer_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "simple_weapon_head_material", + "variants": [ + { + "target": [ + "model:imperial/war_hammer_head.png" + ], + "template": "imperial/war_hammer_head_reinforcement.png" + } + ] + }, + { + "name": "simple_weapon_head_dye", + "variants": [ + { + "target": [ + "model:imperial/war_hammer_head.png" + ], + "template": "imperial/war_hammer_head.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:war_hammer_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "war_hammer_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/package.json similarity index 84% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/package.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/package.json index bcb1fc5b7..237a9d5ec 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/package.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/package.json @@ -1,5 +1,5 @@ { - "name": "forgero-club-types", + "name": "forgero-imperial", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/battle_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/battle_axe_head.json new file mode 100644 index 000000000..b573ad020 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/battle_axe_head.json @@ -0,0 +1,116 @@ +{ + "type": "AXE_HEAD_SCHEMATIC", + "name": "battle_axe_head-schematic", + "parent": "axe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "AXE_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 4 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 0.25 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "ATTACK_DAMAGE", + "value": 1.8 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.6 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.6 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": { + "value": 4, + "context": "LOCAL" + }, + "better_compat_attribute_container": "forgero:double_axe", + "name_replacement": { + "from": "axe", + "to": "battle_axe" + } + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/broadsword_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/broadsword_blade.json new file mode 100644 index 000000000..18c5edd81 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/broadsword_blade.json @@ -0,0 +1,111 @@ +{ + "type": "SWORD_BLADE_SCHEMATIC", + "name": "broadsword_blade-schematic", + "parent": "sword_blade_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SWORD_BLADE", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 3 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "ATTACK_DAMAGE", + "value": 1.8 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.15 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.45 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "sword", + "to": "broadsword" + }, + "better_compat_attribute_container": "forgero:claymore" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/vein_mining_schematics/schematic/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/entrenching_shovel_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/entrenching_shovel_head.json new file mode 100644 index 000000000..8f82c00c8 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/entrenching_shovel_head.json @@ -0,0 +1,128 @@ +{ + "type": "SHOVEL_HEAD_SCHEMATIC", + "name": "entrenching_shovel_head-schematic", + "parent": "shovel_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SHOVEL_HEAD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.3 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 1.35 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.45 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.15 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-reach", + "type": "forgero:reach", + "value": 4 + }, + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + { + "type": "minecraft:block_effectiveness", + "tags": [ + "minecraft:mineable/sword" + ] + }, + { + "type": "minecraft:block_breaking", + "selector": { + "type": "forgero:pattern", + "pattern": [ + "x", + "x" + ], + "depth": 1, + "direction": "multi", + "filter": "forgero:can_mine" + }, + "speed": "forgero:all", + "predicate": { + "type": "forgero:can_mine" + }, + "title": "feature.forgero.pattern_mining.title", + "description": "feature.forgero.pattern_mining.2x1-description" + } + ] + }, + "custom_data": { + "ingredient_count": "2", + "name_replacement": { + "from": "shovel", + "to": "entrenching_shovel" + }, + "better_compat_attribute_container": "forgero:axe" +} +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/scythe_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/scythe_blade.json new file mode 100644 index 000000000..e11ddcc52 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/scythe_blade.json @@ -0,0 +1,145 @@ +{ + "type": "HOE_HEAD_SCHEMATIC", + "name": "scythe_blade-schematic", + "parent": "hoe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "HOE_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 2 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.2 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 1.65 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.35 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.2 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + }, + { + "id": "variant-reach-composite", + "type": "forgero:reach", + "value": 5.5 + } + ], + "features": [ + { + "type": "minecraft:block_effectiveness", + "tags": [ + "minecraft:mineable/sword" + ] + }, + { + "type": "minecraft:block_breaking", + "selector": { + "type": "forgero:radius", + "radius": 5, + "filter": { + "type": "minecraft:block", + "tag": "forgero:plants" + } + }, + "speed": "forgero:instant", + "predicate": { + "type": "minecraft:block", + "tag": "forgero:plants" + }, + "title": "feature.forgero.vein_mining.title", + "description": "feature.forgero.vein_mining.plants_in_area" + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 2, + "context": "LOCAL" + }, + "name_replacement": { + "from": "hoe", + "to": "scythe" + }, + "better_compat_attribute_container": "forgero:scythe" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/sickle_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/sickle_blade.json new file mode 100644 index 000000000..516745aaf --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/sickle_blade.json @@ -0,0 +1,127 @@ +{ + "type": "HOE_HEAD_SCHEMATIC", + "name": "sickle_blade-schematic", + "parent": "hoe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "HOE_HEAD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.4 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 1.35 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.15 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.85 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + }, + { + "id": "variant-reach-composite", + "type": "forgero:reach", + "value": 3.5 + } + ], + "features": [ + { + "type": "minecraft:block_effectiveness", + "tags": [ + "minecraft:mineable/sword" + ] + }, + { + "type": "minecraft:block_breaking", + "selector": { + "type": "forgero:radius", + "radius": 3, + "filter": { + "type": "minecraft:block", + "tag": "forgero:plants" + } + }, + "speed": "forgero:instant", + "predicate": { + "type": "minecraft:block", + "tag": "forgero:plants" + }, + "title": "feature.forgero.vein_mining.title", + "description": "feature.forgero.vein_mining.plants_in_area" + } + ] + }, + "custom_data": { + "ingredient_count": "2", + "name_replacement": { + "from": "hoe", + "to": "sickle" + }, + "better_compat_attribute_container": "forgero:sickle" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/spear_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/spear_head.json new file mode 100644 index 000000000..e9dd8e224 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/spear_head.json @@ -0,0 +1,136 @@ +{ + "type": "SIMPLE_WEAPON_HEAD_SCHEMATIC", + "name": "spear_head-schematic", + "parent": "simple_weapon_head_base", + "resource_type": "DEFAULT", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SIMPLE_WEAPON_HEAD", + "target": "CREATE", + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 1.65 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.35 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.2 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + }, + { + "id": "schematic-reach", + "type": "forgero:reach", + "value": 6 + }, + { + "id": "sprinting-attack_damage", + "type": "ATTACK_DAMAGE", + "order": "END", + "operation": "MULTIPLICATION", + "value": 1.5, + "predicate": { + "type": "minecraft:entity", + "flag": { + "is_sprinting": true + } + } + } + ], + "features": [ + { + "type": "minecraft:on_use", + "max_use_time": 72000, + "use_action": "SPEAR", + "use": [ + { + "type": "minecraft:consume" + } + ], + "on_stop": [ + { + "type": "forgero:throw", + "velocity_multiplier": 2, + "instability": "2" + }, + { + "type": "minecraft:play_sound", + "sound": "minecraft:item.trident.throw" + }, + { + "type": "minecraft:consume_stack", + "count": 1 + } + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 2, + "context": "LOCAL" + }, + "better_compat_attribute_container": "forgero:spear" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/war_hammer_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/war_hammer_head.json new file mode 100644 index 000000000..e82dd4940 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-imperial/schematic/war_hammer_head.json @@ -0,0 +1,116 @@ +{ + "type": "SIMPLE_WEAPON_HEAD_SCHEMATIC", + "name": "war_hammer_head-schematic", + "parent": "simple_weapon_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SIMPLE_WEAPON_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 4 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 0.25 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "ATTACK_DAMAGE", + "value": 2.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.9 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.85 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + ] + }, + "custom_data": { + "ingredient_count": { + "value": 4, + "context": "LOCAL" + }, + "name_replacement": { + "from": "spear", + "to": "war_hammer" + }, + "better_compat_attribute_container": "forgero:mace" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/default.json new file mode 100644 index 000000000..717ffa5f6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/default.json @@ -0,0 +1,7 @@ +{ + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero" + ] +} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/knife_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/knife_blade.json new file mode 100644 index 000000000..c34252df2 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/knife_blade.json @@ -0,0 +1,42 @@ +{ + "type": "SIMPLE_WEAPON_HEAD", + "models": [ + { + "name": "knife_blade", + "type": "GENERATE", + "template": "lightweight/knife_blade.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "simple_weapon_head_material", + "variants": [ + { + "target": [ + "model:lightweight/knife_blade.png" + ], + "template": "lightweight/knife_blade_reinforcement.png" + } + ] + }, + { + "name": "simple_weapon_head_dye", + "variants": [ + { + "target": [ + "model:lightweight/knife_blade.png" + ], + "template": "lightweight/knife_blade.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:knife_blade-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "knife_blade" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/kunai_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/kunai_blade.json new file mode 100644 index 000000000..9db12c01b --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/kunai_blade.json @@ -0,0 +1,57 @@ +{ + "type": "SIMPLE_WEAPON_HEAD", + "models": [ + { + "name": "kunai_blade", + "type": "GENERATE", + "template": "lightweight/kunai_blade.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "simple_weapon_head_material", + "variants": [ + { + "target": [ + "model:lightweight/kunai_blade.png" + ], + "template": "lightweight/kunai_blade_reinforcement.png" + } + ] + }, + { + "name": "simple_weapon_head_dye", + "variants": [ + { + "target": [ + "model:lightweight/kunai_blade.png" + ], + "template": "lightweight/kunai_blade.png" + } + ] + }, + { + "name": "kunai_rope", + "type": "GENERATE", + "template": "lightweight/kunai_rope.png", + "palette": "SLOT_MATERIAL", + "order": 15 + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:kunai_blade-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "kunai_blade" + }, + { + "target": [ + "type:SLOT_MATERIAL", + "slot:2" + ], + "modelType": "BASED_COMPOSITE", + "template": "kunai_rope" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/lightweight_handle_mixin.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/lightweight_handle_mixin.json new file mode 100644 index 000000000..54a206b9f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/models/lightweight_handle_mixin.json @@ -0,0 +1,65 @@ +{ + "type": "HANDLE", + "models": [ + { + "name": "handle", + "variants": [ + { + "target": [ + "type:SIMPLE_WEAPON", + "model:lightweight/kunai_blade.png" + ], + "template": "lightweight/kunai_handle.png" + } + ] + }, + { + "name": "handle_dye", + "variants": [ + { + "target": [ + "type:SIMPLE_WEAPON", + "model:lightweight/kunai_handle.png" + ], + "template": "lightweight/kunai_handle.png" + } + ] + }, + { + "name": "grip", + "variants": [ + { + "target": [ + "type:HANDLE", + "model:lightweight/kunai_handle.png" + ], + "template": "lightweight/kunai_rope.png" + } + ] + }, + { + "name": "handle_dye", + "variants": [ + { + "target": [ + "type:SIMPLE_WEAPON", + "model:lightweight/throwing_handle.png" + ], + "template": "lightweight/throwing_handle.png" + } + ] + }, + { + "name": "handle", + "variants": [ + { + "target": [ + "type:SIMPLE_WEAPON", + "model:lightweight/knife_blade.png" + ], + "template": "lightweight/throwing_handle.png" + } + ] + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/package.json similarity index 84% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/package.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/package.json index a9077c444..bc1c5515f 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/package.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/package.json @@ -1,5 +1,5 @@ { - "name": "forgero-spear-types", + "name": "forgero-lightweight", "resource_type": "PACKAGE", "priority": 4, "namespace": "forgero", diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/default.json new file mode 100644 index 000000000..a6297d8bd --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/default.json @@ -0,0 +1,3 @@ +{ + "resource_type": "SCHEMATIC" +} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/knife_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/knife_blade.json new file mode 100644 index 000000000..33c10b12c --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/knife_blade.json @@ -0,0 +1,155 @@ +{ + "type": "SIMPLE_WEAPON_HEAD_SCHEMATIC", + "name": "knife_blade-schematic", + "parent": "simple_weapon_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SIMPLE_WEAPON_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 1 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "ATTACK_DAMAGE", + "value": 1.15 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 0.85 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.8 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + }, + { + "id": "variant-reach-composite", + "type": "forgero:reach", + "value": 2.5 + }, + { + "id": "sneaking-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "order": "END", + "operation": "MULTIPLICATION", + "value": 1.5, + "predicate": { + "type": "minecraft:entity", + "flag": { + "is_sneaking": true + } + } + } + ], + "features": [ + { + "type": "minecraft:on_use", + "max_use_time": 62000, + "use_action": "SPEAR", + "use": [ + { + "type": "minecraft:consume" + } + ], + "on_stop": [ + { + "type": "forgero:throw", + "velocity_multiplier": "2.5", + "instability": "2", + "spin_type": "VERTICAL" + }, + { + "type": "minecraft:play_sound", + "sound": "minecraft:item.trident.throw" + }, + { + "type": "minecraft:consume_stack", + "count": 1 + } + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 1, + "context": "LOCAL" + }, + "name_replacement": { + "from": "spear", + "to": "knife" + }, + "better_compat_attribute_container": "forgero:dagger" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/kunai_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/kunai_blade.json new file mode 100644 index 000000000..67ec4b5fe --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-lightweight/schematic/kunai_blade.json @@ -0,0 +1,141 @@ +{ + "type": "SIMPLE_WEAPON_HEAD_SCHEMATIC", + "name": "kunai_blade-schematic", + "parent": "simple_weapon_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "SIMPLE_WEAPON_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 1 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "ATTACK_DAMAGE", + "value": 1.4 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.1 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 0.45 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + }, + { + "id": "variant-reach-composite", + "type": "forgero:reach", + "value": 2.5 + } + ], + "features": [ + { + "type": "minecraft:on_use", + "max_use_time": 55000, + "use_action": "SPEAR", + "use": [ + { + "type": "minecraft:consume" + } + ], + "on_stop": [ + { + "type": "forgero:throw", + "velocity_multiplier": "2.5", + "instability": "2" + }, + { + "type": "minecraft:play_sound", + "sound": "minecraft:item.trident.throw" + }, + { + "type": "minecraft:consume_stack", + "count": 1 + } + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 1, + "context": "LOCAL" + }, + "name_replacement": { + "from": "spear", + "to": "kunai" + }, + "better_compat_attribute_container": "forgero:dagger" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_axe_head.json index 1761b4ec3..ee1004167 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_axe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_axe_head.json @@ -6,9 +6,9 @@ "variants": [ { "target": [ - "model:mastercrafted_axe_head.png" + "model:mastercrafted/mastercrafted_axe_head.png" ], - "template": "mastercrafted_axe_head_tip_reinforcement.png" + "template": "mastercrafted/mastercrafted_axe_head_tip_reinforcement.png" } ] }, @@ -17,16 +17,16 @@ "variants": [ { "target": [ - "model:mastercrafted_axe_head.png" + "model:mastercrafted/mastercrafted_axe_head.png" ], - "template": "mastercrafted_axe_head.png" + "template": "mastercrafted/mastercrafted_axe_head.png" } ] }, { "name": "mastercrafted_axe_head", "modelType": "GENERATE", - "template": "mastercrafted_axe_head.png", + "template": "mastercrafted/mastercrafted_axe_head.png", "palette": "TOOL_MATERIAL", "order": 20 }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_hoe_head_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_hoe_head_head.json index 8bb6e25f6..bb3754375 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_hoe_head_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_hoe_head_head.json @@ -6,9 +6,9 @@ "variants": [ { "target": [ - "model:mastercrafted_hoe_head.png" + "model:mastercrafted/mastercrafted_hoe_head.png" ], - "template": "mastercrafted_hoe_head_tip_reinforcement.png" + "template": "mastercrafted/mastercrafted_hoe_head_tip_reinforcement.png" } ] }, @@ -17,16 +17,16 @@ "variants": [ { "target": [ - "model:mastercrafted_hoe_head.png" + "model:mastercrafted/mastercrafted_hoe_head.png" ], - "template": "mastercrafted_hoe_head.png" + "template": "mastercrafted/mastercrafted_hoe_head.png" } ] }, { "name": "mastercrafted_hoe_head", "modelType": "GENERATE", - "template": "mastercrafted_hoe_head.png", + "template": "mastercrafted/mastercrafted_hoe_head.png", "palette": "TOOL_MATERIAL", "order": 20, "offset": [ diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pickaxe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pickaxe_head.json index 207f5e2e9..8d2eb4908 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pickaxe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pickaxe_head.json @@ -3,21 +3,19 @@ "models": [ { "name": "pickaxe_head_material", - "type": "GENERATE", - "palette": "MATERIAL", "variants": [ { "target": [ - "model:mastercrafted_pickaxe_head.png" + "model:mastercrafted/mastercrafted_pickaxe_head.png" ], - "template": "mastercrafted_pickaxe_head_tip_reinforcement.png" + "template": "mastercrafted/mastercrafted_pickaxe_head_tip_reinforcement.png" } ] }, { "name": "mastercrafted_pickaxe_head", "type": "GENERATE", - "template": "mastercrafted_pickaxe_head.png", + "template": "mastercrafted/mastercrafted_pickaxe_head.png", "palette": "TOOL_MATERIAL", "order": 20 }, @@ -26,9 +24,9 @@ "variants": [ { "target": [ - "model:mastercrafted_pickaxe_head.png" + "model:mastercrafted/mastercrafted_pickaxe_head.png" ], - "template": "mastercrafted_pickaxe_head.png" + "template": "mastercrafted/mastercrafted_pickaxe_head.png" } ] }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pommel.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pommel.json index 57726a89f..23fb47b98 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pommel.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_pommel.json @@ -1,75 +1,81 @@ { "type": "POMMEL", "models": [ - { - "target": [ - "type:METAL", - "id:mastercrafted_pommel-schematic" - ], - "modelType": "BASED_COMPOSITE", - "template": "mastercrafted_pommel" - }, { "name": "mastercrafted_pommel", - "template": "mastercrafted_pommel.png", + "template": "mastercrafted/mastercrafted_pommel.png", "type": "GENERATE", "palette": "METAL", "order": 60, - "offset": [ - 5, - 5 - ], "variants": [ + { + "target": [ + "type:HOE" + ], + "template": "mastercrafted/mastercrafted_tool_pommel.png" + }, + { + "target": [ + "type:PICKAXE" + ], + "template": "mastercrafted/mastercrafted_tool_pommel.png" + }, + { + "target": [ + "type:AXE" + ], + "template": "mastercrafted/mastercrafted_tool_pommel.png" + }, + { + "target": [ + "type:SHOVEL" + ], + "template": "mastercrafted/mastercrafted_tool_pommel.png" + }, { "target": [ "type:SWORD" ], - "offset": [ - -1, - -1 - ] + "template": "mastercrafted/mastercrafted_sword_pommel.png" }, { "target": [ "type:HANDLE" - ] + ], + "template": "mastercrafted/mastercrafted_tool_pommel.png" } ] }, { - "name": "mastercrafted_pommel_dye", - "template": "mastercrafted_pommel.png", - "type": "GENERATE", - "palette": "DYE", - "order": 65, - "offset": [ - 5, - 5 - ], + "name": "pommel_dye", "variants": [ { "target": [ - "type:SWORD" + "model:mastercrafted/mastercrafted_pommel.png" ], - "offset": [ - -1, - -1 - ] + "template": "mastercrafted/mastercrafted_pommel.png" }, { "target": [ - "type:HANDLE" - ] + "model:mastercrafted/mastercrafted_tool_pommel.png" + ], + "template": "mastercrafted/mastercrafted_tool_pommel.png" + }, + { + "target": [ + "model:mastercrafted/mastercrafted_sword_pommel.png" + ], + "template": "mastercrafted/mastercrafted_sword_pommel.png" } ] }, { "target": [ - "type:DYE", - "slot:0" + "type:METAL", + "id:mastercrafted_pommel-schematic" ], - "modelType": "UPGRADE", - "template": "mastercrafted_pommel_dye" + "modelType": "BASED_COMPOSITE", + "template": "mastercrafted_pommel" } ] } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_shovel_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_shovel_head.json index 4abff7d6b..f659dbc2a 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_shovel_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_shovel_head.json @@ -6,9 +6,9 @@ "variants": [ { "target": [ - "model:mastercrafted_shovel_head.png" + "model:mastercrafted/mastercrafted_shovel_head.png" ], - "template": "mastercrafted_shovel_head_tip_reinforcement.png" + "template": "mastercrafted/mastercrafted_shovel_head_tip_reinforcement.png" } ] }, @@ -17,16 +17,16 @@ "variants": [ { "target": [ - "model:mastercrafted_shovel_head.png" + "model:mastercrafted/mastercrafted_shovel_head.png" ], - "template": "mastercrafted_shovel_head.png" + "template": "mastercrafted/mastercrafted_shovel_head.png" } ] }, { "name": "mastercrafted_shovel_head", "modelType": "GENERATE", - "template": "mastercrafted_shovel_head.png", + "template": "mastercrafted/mastercrafted_shovel_head.png", "palette": "TOOL_MATERIAL", "order": 20 }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_blade.json index 2d77075f5..e554e45cd 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_blade.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_blade.json @@ -3,7 +3,7 @@ "models": [ { "name": "mastercrafted_blade", - "template": "mastercrafted_sword_blade.png", + "template": "mastercrafted/mastercrafted_sword_blade.png", "type": "GENERATE", "palette": "TOOL_MATERIAL", "order": 20 @@ -13,9 +13,9 @@ "variants": [ { "target": [ - "model:mastercrafted_sword_blade.png" + "model:mastercrafted/mastercrafted_sword_blade.png" ], - "template": "mastercrafted_sword_blade_tip_reinforcement.png" + "template": "mastercrafted/mastercrafted_sword_blade_tip_reinforcement.png" } ] }, @@ -24,9 +24,9 @@ "variants": [ { "target": [ - "model:mastercrafted_sword_blade.png" + "model:mastercrafted/mastercrafted_sword_blade.png" ], - "template": "mastercrafted_sword_blade.png" + "template": "mastercrafted/mastercrafted_sword_blade.png" } ] }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_guard.json index 979c7d51f..102f917a9 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_guard.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/models/mastercrafted_sword_guard.json @@ -6,9 +6,9 @@ "variants": [ { "target": [ - "model:mastercrafted_sword_guard.png" + "model:mastercrafted/mastercrafted_sword_guard.png" ], - "template": "mastercrafted_sword_guard_reinforcement.png" + "template": "mastercrafted/mastercrafted_sword_guard_reinforcement.png" } ] }, @@ -17,15 +17,15 @@ "variants": [ { "target": [ - "model:mastercrafted_sword_guard.png" + "model:mastercrafted/mastercrafted_sword_guard.png" ], - "template": "mastercrafted_sword_guard.png" + "template": "mastercrafted/mastercrafted_sword_guard.png" } ] }, { "name": "mastercrafted_sword_guard", - "template": "mastercrafted_sword_guard.png", + "template": "mastercrafted/mastercrafted_sword_guard.png", "type": "GENERATE", "palette": "TOOL_MATERIAL", "order": 60 diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_axe_head.json index cf89506d9..747045d3c 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_axe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_axe_head.json @@ -47,22 +47,22 @@ "order": "BASE", "attributes": [ { - "id": "refined-schematic-rarity-composite", + "id": "mastercrafted-schematic-rarity-composite", "type": "RARITY", "value": 1.5 }, { - "id": "refined-schematic-attack_damage-composite", + "id": "mastercrafted-schematic-attack_damage-composite", "type": "ATTACK_DAMAGE", "value": 1.5 }, { - "id": "refined-schematic-mining_speed-composite", + "id": "mastercrafted-schematic-mining_speed-composite", "type": "MINING_SPEED", "value": 1.5 }, { - "id": "refined-schematic-durability-composite", + "id": "mastercrafted-schematic-durability-composite", "type": "DURABILITY", "value": 1.5 } @@ -76,11 +76,12 @@ "order": "BASE", "category": "LOCAL", "operation": "ADDITION", - "value": 75 + "value": 100 } ] }, "custom_data": { "ingredient_count": "3" - } + }, + "better_compat_attribute_container": "forgero:axe" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_hoe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_hoe_head.json index 57ee24b3f..c47644d49 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_hoe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_hoe_head.json @@ -47,22 +47,17 @@ "order": "BASE", "attributes": [ { - "id": "refined-schematic-rarity-composite", + "id": "mastercrafted-schematic-rarity-composite", "type": "RARITY", "value": 1.5 }, { - "id": "refined-schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "value": 1.5 - }, - { - "id": "refined-schematic-mining_speed-composite", + "id": "mastercrafted-schematic-mining_speed-composite", "type": "MINING_SPEED", "value": 1.5 }, { - "id": "refined-schematic-durability-composite", + "id": "mastercrafted-schematic-durability-composite", "type": "DURABILITY", "value": 1.5 } @@ -76,38 +71,17 @@ "order": "BASE", "operation": "ADDITION", "category": "LOCAL", - "value": 75 + "value": 100 } ], "features": [ - { - "type": "minecraft:block_breaking", - "selector": { - "type": "forgero:pattern", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "filter": { - "type": "minecraft:block", - "tag": "forgero:plants" - } - }, - "predicate": { - "type": "minecraft:block", - "tag": "forgero:plants" - }, - "speed": "forgero:instant", - "title": "feature.forgero.pattern_mining.title", - "description": "feature.forgero.pattern_mining.3x3-description" - } ] }, "custom_data": { "ingredient_count": { "value": 2, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:pickaxe" } } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pickaxe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pickaxe_head.json index be3f7dff3..478c00bd0 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pickaxe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pickaxe_head.json @@ -47,22 +47,17 @@ "order": "BASE", "attributes": [ { - "id": "refined-schematic-rarity-composite", + "id": "mastercrafted-schematic-rarity-composite", "type": "RARITY", "value": 1.5 }, { - "id": "refined-schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "value": 1.5 - }, - { - "id": "refined-schematic-mining_speed-composite", + "id": "mastercrafted-schematic-mining_speed-composite", "type": "MINING_SPEED", "value": 1.5 }, { - "id": "refined-schematic-durability-composite", + "id": "mastercrafted-schematic-durability-composite", "type": "DURABILITY", "value": 1.5 } @@ -76,7 +71,7 @@ "order": "BASE", "category": "LOCAL", "operation": "ADDITION", - "value": 75 + "value": 100 } ] }, @@ -84,6 +79,7 @@ "ingredient_count": { "value": 3, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:pickaxe" } } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pommel.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pommel.json index 09f841c88..2d42dfed4 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pommel.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_pommel.json @@ -38,12 +38,12 @@ "order": "BASE", "attributes": [ { - "id": "refined-schematic-rarity-composite", + "id": "mastercrafted-schematic-rarity-composite", "type": "RARITY", "value": 1.5 }, { - "id": "refined-schematic-durability-composite", + "id": "mastercrafted-schematic-durability-composite", "type": "DURABILITY", "value": 1.5 } @@ -57,7 +57,7 @@ "order": "BASE", "context": "LOCAL", "operation": "ADDITION", - "value": 75 + "value": 100 } ] }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_shovel_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_shovel_head.json index 54df2a4ed..e87bf256c 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_shovel_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_shovel_head.json @@ -47,22 +47,17 @@ "order": "BASE", "attributes": [ { - "id": "refined-schematic-rarity-composite", + "id": "mastercrafted-schematic-rarity-composite", "type": "RARITY", "value": 1.5 }, { - "id": "refined-schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "value": 1.5 - }, - { - "id": "refined-schematic-mining_speed-composite", + "id": "mastercrafted-schematic-mining_speed-composite", "type": "MINING_SPEED", "value": 1.5 }, { - "id": "refined-schematic-durability-composite", + "id": "mastercrafted-schematic-durability-composite", "type": "DURABILITY", "value": 1.5 } @@ -76,7 +71,7 @@ "order": "BASE", "operation": "ADDITION", "category": "LOCAL", - "value": 75 + "value": 100 } ], "features": [ @@ -85,5 +80,6 @@ }, "custom_data": { "ingredient_count": "2" - } + }, + "better_compat_attribute_container": "forgero:hammer" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_blade.json index 1f585fb07..0c22f5c85 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_blade.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_blade.json @@ -46,17 +46,17 @@ "order": "BASE", "attributes": [ { - "id": "refined-schematic-rarity-composite", + "id": "mastercrafted-schematic-rarity-composite", "type": "RARITY", "value": 1.5 }, { - "id": "refined-schematic-attack_damage-composite", + "id": "mastercrafted-schematic-attack_damage-composite", "type": "ATTACK_DAMAGE", "value": 1.5 }, { - "id": "refined-schematic-durability-composite", + "id": "mastercrafted-schematic-durability-composite", "type": "DURABILITY", "value": 1.5 } @@ -70,7 +70,7 @@ "order": "BASE", "operation": "ADDITION", "category": "LOCAL", - "value": 75 + "value": 100 } ] }, @@ -78,6 +78,7 @@ "ingredient_count": { "value": 3, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:sword" } } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_guard.json index 0760ee2ba..03327c407 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_guard.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-mastercrafted/schematic/mastercrafted_sword_guard.json @@ -54,18 +54,13 @@ "order": "BASE", "attributes": [ { - "id": "refined-schematic-rarity-composite", + "id": "mastercrafted-schematic-rarity-composite", "type": "RARITY", "value": 1.5 }, { - "id": "refined-schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "value": 1.5 - }, - { - "id": "refined-schematic-mining_speed-composite", - "type": "ARMOR", + "id": "mastercrafted-schematic-durability-composite", + "type": "DURABILITY", "value": 1.5 } ] @@ -78,7 +73,7 @@ "order": "BASE", "category": "LOCAL", "operation": "ADDITION", - "value": 75 + "value": 100 } ] }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_axe_head.json index 9886ff8ec..7426b7998 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_axe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_axe_head.json @@ -6,9 +6,9 @@ "variants": [ { "target": [ - "model:refined_axe_head.png" + "model:refined/refined_axe_head.png" ], - "template": "refined_axe_head_tip_reinforcement.png" + "template": "refined/refined_axe_head_tip_reinforcement.png" } ] }, @@ -17,16 +17,16 @@ "variants": [ { "target": [ - "model:refined_axe_head.png" + "model:refined/refined_axe_head.png" ], - "template": "refined_axe_head.png" + "template": "refined/refined_axe_head.png" } ] }, { "name": "refined_axe_head", "modelType": "GENERATE", - "template": "refined_axe_head.png", + "template": "refined/refined_axe_head.png", "palette": "TOOL_MATERIAL", "order": 20 }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_hoe_head_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_hoe_head_head.json index c9190897c..0097c6174 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_hoe_head_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_hoe_head_head.json @@ -6,9 +6,9 @@ "variants": [ { "target": [ - "model:refined_hoe_head.png" + "model:refined/refined_hoe_head.png" ], - "template": "refined_hoe_head_tip_reinforcement.png" + "template": "refined/refined_hoe_head_tip_reinforcement.png" } ] }, @@ -17,16 +17,16 @@ "variants": [ { "target": [ - "model:refined_hoe_head.png" + "model:refined/refined_hoe_head.png" ], - "template": "refined_hoe_head.png" + "template": "refined/refined_hoe_head.png" } ] }, { "name": "refined_hoe_head", "modelType": "GENERATE", - "template": "refined_hoe_head.png", + "template": "refined/refined_hoe_head.png", "palette": "TOOL_MATERIAL", "order": 20 }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pickaxe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pickaxe_head.json index 1c4c50eca..a0aa87d5a 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pickaxe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pickaxe_head.json @@ -8,9 +8,9 @@ "variants": [ { "target": [ - "model:refined_pickaxe_head.png" + "model:refined/refined_pickaxe_head.png" ], - "template": "refined_pickaxe_head_tip_reinforcement.png" + "template": "refined/refined_pickaxe_head_tip_reinforcement.png" } ] }, @@ -19,16 +19,16 @@ "variants": [ { "target": [ - "model:refined_pickaxe_head.png" + "model:refined/refined_pickaxe_head.png" ], - "template": "refined_pickaxe_head.png" + "template": "refined/refined_pickaxe_head.png" } ] }, { "name": "refined_pickaxe_head", "type": "GENERATE", - "template": "refined_pickaxe_head.png", + "template": "refined/refined_pickaxe_head.png", "palette": "TOOL_MATERIAL", "order": 20 }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pommel.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pommel.json index ffd8f5bdb..6b5c70b1c 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pommel.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_pommel.json @@ -3,55 +3,69 @@ "models": [ { "name": "refined_pommel", - "template": "refined_pommel.png", + "template": "refined/refined_pommel.png", "type": "GENERATE", "palette": "METAL", "order": 60, - "offset": [ - 5, - 5 - ], "variants": [ + { + "target": [ + "type:HOE" + ], + "template": "refined/refined_tool_pommel.png" + }, + { + "target": [ + "type:PICKAXE" + ], + "template": "refined/refined_tool_pommel.png" + }, + { + "target": [ + "type:AXE" + ], + "template": "refined/refined_tool_pommel.png" + }, + { + "target": [ + "type:SHOVEL" + ], + "template": "refined/refined_tool_pommel.png" + }, { "target": [ "type:SWORD" ], - "offset": [ - -1, - -1 - ] + "template": "refined/refined_sword_pommel.png" }, { "target": [ "type:HANDLE" - ] + ], + "template": "refined/refined_tool_pommel.png" } ] }, { - "name": "refined_pommel_dye", - "template": "refined_pommel.png", - "type": "GENERATE", - "palette": "DYE", - "order": 65, - "offset": [ - 5, - 5 - ], + "name": "pommel_dye", "variants": [ { "target": [ - "type:SWORD" + "model:refined/refined_pommel.png" ], - "offset": [ - -1, - -1 - ] + "template": "refined/refined_pommel.png" }, { "target": [ - "type:HANDLE" - ] + "model:refined/refined_tool_pommel.png" + ], + "template": "refined/refined_tool_pommel.png" + }, + { + "target": [ + "model:refined/refined_sword_pommel.png" + ], + "template": "refined/refined_sword_pommel.png" } ] }, @@ -62,14 +76,6 @@ ], "modelType": "BASED_COMPOSITE", "template": "refined_pommel" - }, - { - "target": [ - "type:DYE", - "slot:0" - ], - "modelType": "UPGRADE", - "template": "refined_pommel_dye" } ] } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_shovel_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_shovel_head.json index 7b5420d4d..aafb005a5 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_shovel_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_shovel_head.json @@ -6,9 +6,9 @@ "variants": [ { "target": [ - "model:refined_shovel_head.png" + "model:refined/refined_shovel_head.png" ], - "template": "refined_shovel_head_tip_reinforcement.png" + "template": "refined/refined_shovel_head_tip_reinforcement.png" } ] }, @@ -17,16 +17,16 @@ "variants": [ { "target": [ - "model:refined_shovel_head.png" + "model:refined/refined_shovel_head.png" ], - "template": "refined_shovel_head.png" + "template": "refined/refined_shovel_head.png" } ] }, { "name": "refined_shovel_head", "modelType": "GENERATE", - "template": "refined_shovel_head.png", + "template": "refined/refined_shovel_head.png", "palette": "TOOL_MATERIAL", "order": 20 }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_blade.json index 418b550d7..2296b62df 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_blade.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_blade.json @@ -3,7 +3,7 @@ "models": [ { "name": "refined_blade", - "template": "refined_sword_blade.png", + "template": "refined/refined_sword_blade.png", "type": "GENERATE", "palette": "TOOL_MATERIAL", "order": 20 @@ -13,9 +13,9 @@ "variants": [ { "target": [ - "model:refined_sword_blade.png" + "model:refined/refined_sword_blade.png" ], - "template": "refined_sword_blade_tip_reinforcement.png" + "template": "refined/refined_sword_blade_tip_reinforcement.png" } ] }, @@ -24,9 +24,9 @@ "variants": [ { "target": [ - "model:refined_sword_blade.png" + "model:refined/refined_sword_blade.png" ], - "template": "refined_sword_blade.png" + "template": "refined/refined_sword_blade.png" } ] }, diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_guard.json index 678741152..7c9f519db 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_guard.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/models/refined_sword_guard.json @@ -3,7 +3,7 @@ "models": [ { "name": "refined_sword_guard", - "template": "refined_sword_guard.png", + "template": "refined/refined_sword_guard.png", "type": "GENERATE", "palette": "TOOL_MATERIAL", "order": 60 @@ -13,9 +13,9 @@ "variants": [ { "target": [ - "model:refined_sword_guard.png" + "model:refined/refined_sword_guard.png" ], - "template": "refined_sword_guard_reinforcement.png" + "template": "refined/refined_sword_guard_reinforcement.png" } ] }, @@ -24,9 +24,9 @@ "variants": [ { "target": [ - "model:refined_sword_guard.png" + "model:refined/refined_sword_guard.png" ], - "template": "refined_sword_guard.png" + "template": "refined/refined_sword_guard.png" } ] }, @@ -37,14 +37,6 @@ ], "modelType": "BASED_COMPOSITE", "template": "refined_sword_guard" - }, - { - "target": [ - "type:MATERIAL", - "slot:0" - ], - "modelType": "UPGRADE", - "template": "sword_guard_reinforcement" } ] } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_axe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_axe_head.json index 7e3a9fa29..6fec428cc 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_axe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_axe_head.json @@ -49,22 +49,22 @@ { "id": "refined-schematic-rarity-composite", "type": "RARITY", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-attack_damage-composite", "type": "ATTACK_DAMAGE", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-mining_speed-composite", "type": "MINING_SPEED", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-durability-composite", "type": "DURABILITY", - "value": 1.3 + "value": 1.25 } ] } @@ -82,5 +82,6 @@ }, "custom_data": { "ingredient_count": "3" - } + }, + "better_compat_attribute_container": "forgero:axe" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_hoe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_hoe_head.json index ef26c9d6f..5ff2a7f84 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_hoe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_hoe_head.json @@ -49,22 +49,17 @@ { "id": "refined-schematic-rarity-composite", "type": "RARITY", - "value": 1.3 - }, - { - "id": "refined-schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-mining_speed-composite", "type": "MINING_SPEED", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-durability-composite", "type": "DURABILITY", - "value": 1.3 + "value": 1.25 } ] } @@ -101,6 +96,7 @@ "ingredient_count": { "value": 2, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:pickaxe" } } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pickaxe_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pickaxe_head.json index a2e65a7c9..4bd74f268 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pickaxe_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pickaxe_head.json @@ -49,22 +49,17 @@ { "id": "refined-schematic-rarity-composite", "type": "RARITY", - "value": 1.3 - }, - { - "id": "refined-schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-mining_speed-composite", "type": "MINING_SPEED", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-durability-composite", "type": "DURABILITY", - "value": 1.3 + "value": 1.25 } ] } @@ -84,6 +79,7 @@ "ingredient_count": { "value": 3, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:pickaxe" } } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pommel.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pommel.json index 797ba5140..c9ad83db6 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pommel.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_pommel.json @@ -39,12 +39,12 @@ { "id": "refined-schematic-rarity-composite", "type": "RARITY", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-durability-composite", "type": "DURABILITY", - "value": 1.3 + "value": 1.25 } ] } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_shovel_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_shovel_head.json index 1322df2cf..60c4d6c86 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_shovel_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_shovel_head.json @@ -49,22 +49,17 @@ { "id": "refined-schematic-rarity-composite", "type": "RARITY", - "value": 1.3 - }, - { - "id": "refined-schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-mining_speed-composite", "type": "MINING_SPEED", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-durability-composite", "type": "DURABILITY", - "value": 1.3 + "value": 1.25 } ] } @@ -85,5 +80,6 @@ }, "custom_data": { "ingredient_count": "2" - } + }, + "better_compat_attribute_container": "forgero:hammer" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_blade.json index 4e94e8f13..f49d66cc0 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_blade.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_blade.json @@ -49,22 +49,17 @@ { "id": "refined-schematic-rarity-composite", "type": "RARITY", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-attack_damage-composite", "type": "ATTACK_DAMAGE", - "value": 1.3 - }, - { - "id": "refined-schematic-mining_speed-composite", - "type": "MINING_SPEED", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-durability-composite", "type": "DURABILITY", - "value": 1.3 + "value": 1.25 } ] } @@ -77,13 +72,6 @@ "operation": "ADDITION", "category": "LOCAL", "value": 50 - }, - { - "id": "refined_sword_blade_schematic-attack_speed-composite", - "type": "ATTACK_SPEED", - "context": "COMPOSITE", - "operation": "ADDITION", - "value": 0.1 } ] }, @@ -91,6 +79,7 @@ "ingredient_count": { "value": 3, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:sword" } } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_guard.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_guard.json index b6e83b3ba..ed1a221a1 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_guard.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-refined/schematic/refined_sword_guard.json @@ -56,17 +56,12 @@ { "id": "refined-schematic-rarity-composite", "type": "RARITY", - "value": 1.3 + "value": 1.25 }, { "id": "refined-schematic-durability-composite", "type": "DURABILITY", - "value": 1.3 - }, - { - "id": "refined-schematic-armor-composite", - "type": "ARMOR", - "value": 1.3 + "value": 1.25 } ] } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/default.json new file mode 100644 index 000000000..717ffa5f6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/default.json @@ -0,0 +1,7 @@ +{ + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero" + ] +} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/models/handle.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/models/handle.json similarity index 85% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/models/handle.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/models/handle.json index 74f4cf8b7..6ed612123 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/models/handle.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/models/handle.json @@ -6,7 +6,7 @@ "variants": [ { "target": [ - "type:SPEAR" + "type:SIMPLE_WEAPON" ], "template": "axe_handle.png" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/models/club.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/models/simple_weapon.json similarity index 62% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/models/club.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/models/simple_weapon.json index 27e213a33..90c9f1ce2 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/models/club.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/models/simple_weapon.json @@ -1,9 +1,9 @@ { - "type": "CLUB", + "type": "SIMPLE_WEAPON", "models": [ { "target": [ - "type:CLUB" + "type:SIMPLE_WEAPON" ], "modelType": "COMPOSITE" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/package.json new file mode 100644 index 000000000..e627f4050 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/package.json @@ -0,0 +1,12 @@ +{ + "name": "forgero-simple_weapon-type", + "resource_type": "PACKAGE", + "priority": 4, + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero", + "forgero-vanilla", + "minecraft-vanilla" + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/schematic/simple_weapon_head_base.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/schematic/simple_weapon_head_base.json new file mode 100644 index 000000000..516498192 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/schematic/simple_weapon_head_base.json @@ -0,0 +1,84 @@ +{ + "name": "simple_weapon_base", + "resource_type": "ABSTRACT", + "properties": { + "grouped_attributes": [ + { + "context": "LOCAL", + "operation": "ADDITION", + "order": "BASE", + "attributes": [ + ] + }, + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "schematic-rarity-composite", + "type": "RARITY", + "value": 1 + }, + { + "id": "schematic-durability-composite", + "type": "DURABILITY", + "value": 1 + }, + { + "id": "schematic-attack_speed-composite_multiplier", + "type": "ATTACK_SPEED", + "value": 1 + }, + { + "id": "schematic-attack_damage-composite_multiplier", + "type": "ATTACK_DAMAGE", + "value": 1 + }, + { + "id": "schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1 + }, + { + "id": "schematic-weight-composite", + "type": "WEIGHT", + "value": 1 + } + ] + }, + { + "context": "COMPOSITE", + "operation": "ADDITION", + "order": "BASE", + "attributes": [ + { + "id": "schematic-attack_speed-composite", + "type": "ATTACK_SPEED", + "value": -4 + }, + { + "id": "schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 2 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-reach", + "type": "forgero:reach", + "value": 4.5 + } + ], + "features": [ + { + "type": "minecraft:block_effectiveness", + "tags": [ + "minecraft:mineable/sword" + ] + } + ] + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/default.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/default.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/default.json diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon.json similarity index 50% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon.json index e253423f9..4f9f84f57 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon.json @@ -1,4 +1,4 @@ { "parent": "WEAPON", - "name": "CLUB" + "name": "SIMPLE_WEAPON" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon_head.json similarity index 50% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club_head.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon_head.json index 933678517..1e884a2a5 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/type/club_head.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon_head.json @@ -1,4 +1,4 @@ { "parent": "WEAPON_HEAD", - "name": "CLUB_HEAD" + "name": "SIMPLE_WEAPON_HEAD" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear_head_schematic.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon_head_schematic.json similarity index 50% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear_head_schematic.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon_head_schematic.json index 0dabe0fcb..1aecbe60a 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear_head_schematic.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/type/simple_weapon_head_schematic.json @@ -1,4 +1,4 @@ { "parent": "WEAPON_HEAD_SCHEMATIC", - "name": "SPEAR_HEAD_SCHEMATIC" + "name": "SIMPLE_WEAPON_HEAD_SCHEMATIC" } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/weapon/club.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/weapon/simple_weapon.json similarity index 76% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/weapon/club.json rename to content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/weapon/simple_weapon.json index e82cb2f41..fe1e1df1e 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-club-types/weapon/club.json +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-simple_weapon-type/weapon/simple_weapon.json @@ -1,13 +1,13 @@ { - "type": "CLUB", - "name": "club", + "type": "SIMPLE_WEAPON", + "name": "simple_weapon", "resource_type": "CONSTRUCT_TEMPLATE", "container": { "type": "CREATE", "id": "this" }, "construct": { - "type": "CLUB", + "type": "SIMPLE_WEAPON", "target": "CREATE", "recipes": [ { @@ -15,7 +15,7 @@ "ingredients": [ { "unique": true, - "type": "CLUB_HEAD" + "type": "SIMPLE_WEAPON_HEAD" }, { "type": "HANDLE" @@ -25,7 +25,7 @@ ], "components": [ { - "type": "CLUB_HEAD" + "type": "SIMPLE_WEAPON_HEAD" }, { "type": "HANDLE" diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/models/spear.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/models/spear.json deleted file mode 100644 index 591baa666..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/models/spear.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "SPEAR", - "models": [ - { - "target": [ - "type:SPEAR" - ], - "modelType": "COMPOSITE" - } - ] -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear.json deleted file mode 100644 index 1b1b4671a..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "WEAPON", - "name": "SPEAR" -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear_head.json deleted file mode 100644 index 0a74157e7..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/type/spear_head.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "WEAPON_HEAD", - "name": "SPEAR_HEAD" -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/weapon/spear.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/weapon/spear.json deleted file mode 100644 index 6c958f8e3..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-spear-types/weapon/spear.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "SPEAR", - "name": "spear", - "resource_type": "CONSTRUCT_TEMPLATE", - "container": { - "type": "CREATE", - "id": "this" - }, - "construct": { - "type": "SPEAR", - "target": "CREATE", - "recipes": [ - { - "crafting_type": "STATE_CRAFTING_RECIPE", - "ingredients": [ - { - "unique": true, - "type": "SPEAR_HEAD" - }, - { - "type": "HANDLE" - } - ] - } - ], - "components": [ - { - "type": "SPEAR_HEAD" - }, - { - "type": "HANDLE" - } - ], - "slots": [ - ] - }, - "model": { - "type": "COMPOSITE" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/default.json new file mode 100644 index 000000000..717ffa5f6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/default.json @@ -0,0 +1,7 @@ +{ + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero" + ] +} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/cutter_mattock_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/cutter_mattock_head.json new file mode 100644 index 000000000..f78c14e1c --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/cutter_mattock_head.json @@ -0,0 +1,42 @@ +{ + "type": "HOE_HEAD", + "models": [ + { + "name": "cutter_mattock_head", + "type": "GENERATE", + "template": "utility/cutter_mattock_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "hoe_dye", + "variants": [ + { + "target": [ + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/cutter_mattock_head.png" + } + ] + }, + { + "name": "hoe_head_material", + "variants": [ + { + "target": [ + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/cutter_mattock_head_reinforcement.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:cutter_mattock_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "cutter_mattock_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/pick_mattock_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/pick_mattock_head.json new file mode 100644 index 000000000..7c2932db2 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/pick_mattock_head.json @@ -0,0 +1,42 @@ +{ + "type": "HOE_HEAD", + "models": [ + { + "name": "pick_mattock_head", + "type": "GENERATE", + "template": "utility/pick_mattock_head.png", + "palette": "TOOL_MATERIAL", + "order": 20 + }, + { + "name": "hoe_dye", + "variants": [ + { + "target": [ + "model:utility/pick_mattock_head.png" + ], + "template": "utility/pick_mattock_head.png" + } + ] + }, + { + "name": "hoe_head_material", + "variants": [ + { + "target": [ + "model:utility/pick_mattock_head.png" + ], + "template": "utility/pick_mattock_head_reinforcement.png" + } + ] + }, + { + "target": [ + "type:TOOL_MATERIAL", + "id:pick_mattock_head-schematic" + ], + "modelType": "BASED_COMPOSITE", + "template": "pick_mattock_head" + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/utility_binding_mixin.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/utility_binding_mixin.json new file mode 100644 index 000000000..69146369a --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/utility_binding_mixin.json @@ -0,0 +1,174 @@ +{ + "type": "TOOL_BINDING", + "models": [ + { + "name": "soft_binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/soft_mattock_binding.png" + + } + ] + }, + { + "name": "soft_binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/mattock_soft_binding_gem.png" + } + ] + }, + { + "name": "soft_binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/soft_mattock_binding.png" + } + ] + }, + { + "name": "binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/mattock_binding.png" + } + ] + }, + { + "name": "binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/mattock_binding.png" + } + ] + }, + { + "name": "binding_material", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/mattock_binding_reinforced.png" + } + ] + }, + { + "name": "binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/mattock_binding_gem.png" + } + ] + }, + { + "name": "soft_binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/soft_mattock_binding.png" + } + ] + }, + { + "name": "soft_binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/mattock_soft_binding_gem.png" + } + ] + }, + { + "name": "soft_binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/soft_mattock_binding.png" + } + ] + }, + { + "name": "binding", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/mattock_binding.png" + } + ] + }, + { + "name": "binding_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/mattock_binding.png" + } + ] + }, + { + "name": "binding_material", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/mattock_binding_reinforced.png" + } + ] + }, + { + "name": "binding_gem", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/mattock_binding_gem.png" + } + ] + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/utility_handle_mixin.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/utility_handle_mixin.json new file mode 100644 index 000000000..2a1e47faa --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/models/utility_handle_mixin.json @@ -0,0 +1,53 @@ +{ + "type": "HANDLE", + "models": [ + { + "name": "handle", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/mattock_handle.png" + } + ] + }, + { + "name": "handle_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/cutter_mattock_head.png" + ], + "template": "utility/mattock_handle.png" + } + ] + }, + { + "name": "handle", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/mattock_handle.png" + } + ] + }, + { + "name": "handle_dye", + "variants": [ + { + "target": [ + "type:HOE", + "model:utility/pick_mattock_head.png" + ], + "template": "utility/mattock_handle.png" + } + ] + } + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/package.json new file mode 100644 index 000000000..8a9547972 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/package.json @@ -0,0 +1,12 @@ +{ + "name": "forgero-utility", + "resource_type": "PACKAGE", + "priority": 4, + "namespace": "forgero", + "dependencies": [ + "minecraft", + "forgero", + "forgero-vanilla", + "minecraft-vanilla" + ] +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/cutter_mattock_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/cutter_mattock_head.json new file mode 100644 index 000000000..27d728e91 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/cutter_mattock_head.json @@ -0,0 +1,117 @@ +{ + "type": "HOE_HEAD_SCHEMATIC", + "name": "cutter_mattock_head-schematic", + "parent": "hoe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "HOE_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 3 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.25 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.20 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.35 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + } + ], + "features": [ + { + "type": "minecraft:block_effectiveness", + "tags": [ + "minecraft:mineable/axe" + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "hoe", + "to": "cutter_mattock" + }, + "better_compat_attribute_container": "forgero:pickaxe" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/default.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/default.json new file mode 100644 index 000000000..a6297d8bd --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/default.json @@ -0,0 +1,3 @@ +{ + "resource_type": "SCHEMATIC" +} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/pick_mattock_head.json b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/pick_mattock_head.json new file mode 100644 index 000000000..b4926cf49 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-utility/schematic/pick_mattock_head.json @@ -0,0 +1,125 @@ +{ + "type": "HOE_HEAD_SCHEMATIC", + "name": "pick_mattock_head-schematic", + "parent": "hoe_head_base", + "container": { + "type": "CREATE", + "id": "this" + }, + "construct": { + "type": "HOE_HEAD", + "target": "CREATE", + "recipes": [ + { + "crafting_type": "SCHEMATIC_PART_CRAFTING", + "ingredients": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true, + "amount": 3 + } + ] + } + ], + "components": [ + { + "id": "this" + }, + { + "type": "TOOL_MATERIAL", + "unique": true + } + ], + "slots": [ + { + "upgrade_type": "SMITHING", + "category": [ + "OFFENSIVE" + ], + "description": "reinforcement", + "type": "UPGRADE_MATERIAL", + "tier": 1 + }, + { + "upgrade_type": "SMITHING", + "category": [ + "UTILITY" + ], + "description": "cosmetic", + "type": "DYE", + "tier": 1 + } + ] + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "operation": "MULTIPLICATION", + "order": "BASE", + "attributes": [ + { + "id": "variant-schematic-rarity-composite", + "type": "RARITY", + "value": 1.375 + }, + { + "id": "variant-schematic-mining_speed-composite", + "type": "MINING_SPEED", + "value": 1.45 + }, + { + "id": "variant-schematic-durability-composite", + "type": "DURABILITY", + "value": 1.35 + }, + { + "id": "variant-schematic-weight-composite", + "type": "WEIGHT", + "value": 1.25 + } + ] + } + ], + "attributes": [ + { + "id": "schematic-rarity-local", + "type": "RARITY", + "order": "BASE", + "category": "LOCAL", + "operation": "ADDITION", + "value": 75 + }, + { + "id": "schematic-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "order": "END", + "context": "COMPOSITE", + "operation": "FORCE", + "value": 1 + } + ], + "features": [ + { + "type": "minecraft:block_effectiveness", + "tags": [ + "minecraft:mineable/pickaxe" + ] + } + ] + }, + "custom_data": { + "ingredient_count": { + "value": 3, + "context": "LOCAL" + }, + "name_replacement": { + "from": "hoe", + "to": "pick_mattock" + }, + "better_compat_attribute_container": "forgero:pickaxe" + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/package.json b/content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/package.json deleted file mode 100644 index a016303c8..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/pickaxe-additions/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "pickaxe-additions", - "resource_type": "PACKAGE", - "priority": 4, - "namespace": "forgero", - "dependencies": [ - "minecraft", - "forgero", - "forgero-vanilla", - "minecraft-vanilla", - "forgero-extended" - ] -} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/rapier_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/rapier_blade.json deleted file mode 100644 index a2a13226c..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/models/rapier_blade.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "SWORD_BLADE", - "models": [ - { - "name": "rapier_blade", - "template": "rapier_blade.png", - "type": "GENERATE", - "palette": "TOOL_MATERIAL", - "order": 20 - }, - { - "name": "sword_blade_dye", - "variants": [ - { - "target": [ - "model:rapier_blade.png" - ], - "template": "rapier_blade.png" - } - ] - }, - { - "target": [ - "type:TOOL_MATERIAL", - "id:rapier_blade-schematic" - ], - "modelType": "BASED_COMPOSITE", - "template": "rapier_blade" - } - ] -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/broadsword_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/broadsword_blade.json deleted file mode 100644 index c65c2ad2b..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/broadsword_blade.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "SWORD_BLADE_SCHEMATIC", - "name": "broadsword_blade-schematic", - "parent": "sword_blade_base", - "container": { - "type": "CREATE", - "id": "this" - }, - "construct": { - "type": "SWORD_BLADE", - "target": "CREATE", - "components": [ - { - "id": "this" - }, - { - "type": "TOOL_MATERIAL", - "unique": true - } - ], - "slots": [ - { - "upgrade_type": "SMITHING", - "category": [ - "OFFENSIVE" - ], - "description": "reinforcement", - "type": "UPGRADE_MATERIAL", - "tier": 1 - }, - { - "upgrade_type": "SMITHING", - "category": [ - "UTILITY" - ], - "description": "cosmetic", - "type": "DYE", - "tier": 1 - } - ] - }, - "properties": { - "attributes": [ - { - "id": "schematic-rarity-local", - "type": "RARITY", - "order": "BASE", - "context": "LOCAL", - "operation": "ADDITION", - "value": 50 - }, - { - "id": "schematic-rarity-composite", - "type": "RARITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.25 - }, - { - "id": "schematic-durability-composite", - "type": "DURABILITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.25 - }, - { - "id": "schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 2.4 - }, - { - "id": "schematic-weight-composite", - "type": "WEIGHT", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.25 - } - ] - }, - "custom_data": { - "ingredient_count": { - "value": 4, - "context": "LOCAL" - }, - "better_compat_attribute_container": "bettercombat:claymore" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/katana_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/katana_blade.json deleted file mode 100644 index db1ad40f3..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/katana_blade.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "SWORD_BLADE_SCHEMATIC", - "name": "katana_blade-schematic", - "parent": "sword_blade_base", - "container": { - "type": "CREATE", - "id": "this" - }, - "construct": { - "type": "SWORD_BLADE", - "target": "CREATE", - "components": [ - { - "id": "this" - }, - { - "type": "TOOL_MATERIAL", - "unique": true - } - ], - "slots": [ - { - "upgrade_type": "SMITHING", - "category": [ - "OFFENSIVE" - ], - "description": "reinforcement", - "type": "UPGRADE_MATERIAL", - "tier": 1 - }, - { - "upgrade_type": "SMITHING", - "category": [ - "UTILITY" - ], - "description": "cosmetic", - "type": "DYE", - "tier": 1 - } - ] - }, - "properties": { - "attributes": [ - { - "id": "schematic-rarity-local", - "type": "RARITY", - "order": "BASE", - "context": "LOCAL", - "operation": "ADDITION", - "value": 50 - }, - { - "id": "schematic-rarity-composite", - "type": "RARITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.25 - }, - { - "id": "schematic-durability-composite", - "type": "DURABILITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 0.85 - }, - { - "id": "schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 2 - }, - { - "id": "schematic-weight-composite", - "type": "WEIGHT", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 0.85 - } - ] - }, - "custom_data": { - "ingredient_count": { - "value": 2, - "context": "LOCAL" - }, - "better_compat_attribute_container": "bettercombat:katana" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/knife_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/knife_blade.json deleted file mode 100644 index e303caccd..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/knife_blade.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "type": "SWORD_BLADE_SCHEMATIC", - "name": "knife_blade-schematic", - "parent": "sword_blade_base", - "container": { - "type": "CREATE", - "id": "this" - }, - "construct": { - "type": "SWORD_BLADE", - "target": "CREATE", - "components": [ - { - "id": "this" - }, - { - "type": "TOOL_MATERIAL", - "unique": true - } - ], - "slots": [ - { - "upgrade_type": "SMITHING", - "category": [ - "OFFENSIVE" - ], - "description": "reinforcement", - "type": "UPGRADE_MATERIAL", - "tier": 1 - }, - { - "upgrade_type": "SMITHING", - "category": [ - "UTILITY" - ], - "description": "cosmetic", - "type": "DYE", - "tier": 1 - } - ] - }, - "properties": { - "attributes": [ - { - "id": "schematic-rarity-local", - "type": "RARITY", - "order": "BASE", - "context": "LOCAL", - "operation": "ADDITION", - "value": 50 - }, - { - "id": "schematic-reach", - "type": "forgero:reach", - "value": 3.5 - }, - { - "id": "sneaking-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "order": "BASE", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.5, - "predicate": { - "type": "minecraft:entity", - "flag": { - "is_sneaking": true - } - } - }, - { - "id": "schematic-rarity-composite", - "type": "RARITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.25 - }, - { - "id": "schematic-durability-composite", - "type": "DURABILITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 0.75 - }, - { - "id": "schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.25 - }, - { - "id": "schematic-weight-composite", - "type": "WEIGHT", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 0.25 - } - ] - }, - "custom_data": { - "ingredient_count": { - "value": 1, - "context": "LOCAL" - }, - "name_replacement": { - "from": "sword", - "to": "knife" - }, - "better_compat_attribute_container": "bettercombat:dagger" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/rapier_blade.json b/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/rapier_blade.json deleted file mode 100644 index 4cae929a5..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/packs/sword-additions/schematic/rapier_blade.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "SWORD_BLADE_SCHEMATIC", - "name": "rapier_blade-schematic", - "parent": "sword_blade_base", - "container": { - "type": "CREATE", - "id": "this" - }, - "construct": { - "type": "SWORD_BLADE", - "target": "CREATE", - "components": [ - { - "id": "this" - }, - { - "type": "TOOL_MATERIAL", - "unique": true - } - ], - "slots": [ - { - "upgrade_type": "SMITHING", - "category": [ - "OFFENSIVE" - ], - "description": "reinforcement", - "type": "UPGRADE_MATERIAL", - "tier": 1 - }, - { - "upgrade_type": "SMITHING", - "category": [ - "UTILITY" - ], - "description": "cosmetic", - "type": "DYE", - "tier": 1 - } - ] - }, - "properties": { - "attributes": [ - { - "id": "schematic-rarity-local", - "type": "RARITY", - "context": "BASE", - "category": "LOCAL", - "operation": "ADDITION", - "value": 50 - }, - { - "id": "schematic-rarity-composite", - "type": "RARITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.25 - }, - { - "id": "schematic-durability-composite", - "type": "DURABILITY", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 0.85 - }, - { - "id": "schematic-attack_damage-composite", - "type": "ATTACK_DAMAGE", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 1.5 - }, - { - "id": "schematic-weight-composite", - "type": "WEIGHT", - "context": "COMPOSITE", - "operation": "MULTIPLICATION", - "value": 0.75 - } - ] - }, - "custom_data": { - "ingredient_count": { - "value": 2, - "context": "LOCAL" - }, - "better_compat_attribute_container": "bettercombat:rapier" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/2_material_parts.json b/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/2_material_parts.json index d1104442d..9f0061ca7 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/2_material_parts.json +++ b/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/2_material_parts.json @@ -6,19 +6,7 @@ "type": "TOOL_MATERIAL" }, "variant": [ - "tsuba_sword_guard", - "shortsword_blade", - "rapier_blade", - "knife_blade", - "kimiri_sword_guard", - "katana_blade", - "duelling_sword_guard", - "agile_sword_guard", - "path_digger_shovel_head", - "reaper_head", - "grave_digger_head", - "lightweight_pickaxe_head", - "spiked_binding" + ] }, "type": "forgero:schematic_part_crafting", diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/3_material_parts.json b/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/3_material_parts.json index ba94a26ba..0f742c7d0 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/3_material_parts.json +++ b/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/3_material_parts.json @@ -6,14 +6,7 @@ "type": "TOOL_MATERIAL" }, "variant": [ - "path_mining_pickaxe_head", - "tree_feller_head", - "ore_miner_pickaxe_head", - "tree_chopper_head", - "saber_blade", - "scimitar_blade", - "serrated_sword_blade", - "slanted_sword_blade" + ] }, "type": "forgero:schematic_part_crafting", diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/4_material_parts.json b/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/4_material_parts.json index 5df811851..25fa98dad 100644 --- a/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/4_material_parts.json +++ b/content/forgero-extended/src/main/resources/data/forgero/recipe_generators/unique_schematic_recipes/4_material_parts.json @@ -6,8 +6,7 @@ "type": "TOOL_MATERIAL" }, "variant": [ - "broadsword_blade", - "battle_axe_head" + ] }, "type": "forgero:schematic_part_crafting", diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_2.json new file mode 100644 index 000000000..681751354 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#O#", + "###" + ], + "key": { + "#": { + "item": "minecraft:amethyst_shard" + }, + "O": { + "item": "forgero:amethyst_gem_1" + } + }, + "result": { + "item": "forgero:amethyst_gem_2", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_3.json new file mode 100644 index 000000000..99345456f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_3.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "forgero:amethyst_gem_2" + }, + "result": "forgero:amethyst_gem_3", + "count": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_4.json new file mode 100644 index 000000000..fd855facd --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:amethyst_gem_3" + }, + { + "item": "minecraft:dragon_breath" + } + ], + "result": { + "item": "forgero:amethyst_gem_4", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_5.json new file mode 100644 index 000000000..caad1a0c2 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/amethyst_gem_5.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:amethyst_gem_4" + }, + { + "item": "minecraft:nether_star" + } + ], + "result": { + "item": "forgero:amethyst_gem_5", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/blazed_stoneheart_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/blazed_stoneheart_gem.json deleted file mode 100644 index c70bf9067..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/blazed_stoneheart_gem.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diamond" - }, - { - "item": "minecraft:netherrack" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:blazed_stone_heart-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/blazed_stoneheart_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/blazed_stoneheart_gem_upgrade.json deleted file mode 100644 index dc1559288..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/blazed_stoneheart_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:blazed_stone_heart-gem" - }, - "addition": { - "item": "forgero:blazed_stone_heart-gem" - }, - "result": { - "item": "forgero:blazed_stone_heart-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem.json deleted file mode 100644 index 334a54625..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diamond" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:diamond-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_2.json new file mode 100644 index 000000000..7c3b699e4 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#O#", + "###" + ], + "key": { + "#": { + "item": "minecraft:diamond" + }, + "O": { + "item": "forgero:diamond_gem_1" + } + }, + "result": { + "item": "forgero:diamond_gem_2", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_3.json new file mode 100644 index 000000000..33bfb358f --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_3.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "forgero:diamond_gem_2" + }, + "result": "forgero:diamond_gem_3", + "count": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_4.json new file mode 100644 index 000000000..cc57cf010 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:diamond_gem_3" + }, + { + "item": "minecraft:dragon_breath" + } + ], + "result": { + "item": "forgero:diamond_gem_4", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_5.json new file mode 100644 index 000000000..3e06d8c7e --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_5.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:diamond_gem_4" + }, + { + "item": "minecraft:nether_star" + } + ], + "result": { + "item": "forgero:diamond_gem_5", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_upgrade.json deleted file mode 100644 index e7e40573c..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/diamond_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:diamond-gem" - }, - "addition": { - "item": "forgero:diamond-gem" - }, - "result": { - "item": "forgero:diamond-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_2.json new file mode 100644 index 000000000..bec6938c1 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#O#", + "###" + ], + "key": { + "#": { + "item": "minecraft:echo_shard" + }, + "O": { + "item": "forgero:echo_gem_1" + } + }, + "result": { + "item": "forgero:echo_gem_2", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_3.json new file mode 100644 index 000000000..2f403f7dd --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_3.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "forgero:echo_gem_2" + }, + "result": "forgero:echo_gem_3", + "count": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_4.json new file mode 100644 index 000000000..e9d1a3424 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:echo_gem_3" + }, + { + "item": "minecraft:dragon_breath" + } + ], + "result": { + "item": "forgero:echo_gem_4", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_5.json new file mode 100644 index 000000000..bb29b1b39 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/echo_gem_5.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:echo_gem_4" + }, + { + "item": "minecraft:nether_star" + } + ], + "result": { + "item": "forgero:echo_gem_5", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem.json deleted file mode 100644 index 886f8c436..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:emerald" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:emerald-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_2.json new file mode 100644 index 000000000..4852769f4 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#O#", + "###" + ], + "key": { + "#": { + "item": "minecraft:emerald" + }, + "O": { + "item": "forgero:emerald_gem_1" + } + }, + "result": { + "item": "forgero:emerald_gem_2", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_3.json new file mode 100644 index 000000000..b4a080860 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_3.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "forgero:emerald_gem_2" + }, + "result": "forgero:emerald_gem_3", + "count": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_4.json new file mode 100644 index 000000000..1183bbdc6 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:emerald_gem_3" + }, + { + "item": "minecraft:dragon_breath" + } + ], + "result": { + "item": "forgero:emerald_gem_4", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_5.json new file mode 100644 index 000000000..c996936a9 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_5.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:emerald_gem_4" + }, + { + "item": "minecraft:nether_star" + } + ], + "result": { + "item": "forgero:emerald_gem_5", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_upgrade.json deleted file mode 100644 index 2b234fa37..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/emerald_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:emerald-gem" - }, - "addition": { - "item": "forgero:emerald-gem" - }, - "result": { - "item": "forgero:emerald-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/ender_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/ender_gem_upgrade.json deleted file mode 100644 index b3c9a71e1..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/ender_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:ender-gem" - }, - "addition": { - "item": "forgero:ender-gem" - }, - "result": { - "item": "forgero:ender-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/ender_pearl_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/ender_pearl_gem.json deleted file mode 100644 index 0f669d8ec..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/ender_pearl_gem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:ender_pearl" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:ender-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem.json deleted file mode 100644 index 9c34e87ef..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:lapis_lazuli" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:lapis-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_2.json new file mode 100644 index 000000000..0056d9385 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#O#", + "###" + ], + "key": { + "#": { + "item": "minecraft:lapis_lazuli" + }, + "O": { + "item": "forgero:lapis_gem_1" + } + }, + "result": { + "item": "forgero:lapis_gem_2", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_3.json new file mode 100644 index 000000000..0ac691d6d --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_3.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "forgero:lapis_gem_2" + }, + "result": "forgero:lapis_gem_3", + "count": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_4.json new file mode 100644 index 000000000..df617162b --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:lapis_gem_3" + }, + { + "item": "minecraft:dragon_breath" + } + ], + "result": { + "item": "forgero:lapis_gem_4", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_5.json new file mode 100644 index 000000000..05a0f8820 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_5.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:lapis_gem_4" + }, + { + "item": "minecraft:nether_star" + } + ], + "result": { + "item": "forgero:lapis_gem_5", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_upgrade.json deleted file mode 100644 index 67c3b637f..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/lapis_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:lapis-gem" - }, - "addition": { - "item": "forgero:lapis-gem" - }, - "result": { - "item": "forgero:lapis-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico.json deleted file mode 100644 index b368001ff..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#W#", - " # " - ], - "key": { - "W": { - "item": "minecraft:conduit" - }, - "#": { - "item": "minecraft:copper_ingot" - } - }, - "result": { - "item": "forgero:magnetico", - "count": 1 - } -} \ No newline at end of file diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico_gem.json deleted file mode 100644 index 06327482a..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico_gem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "forgero:magnetico" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:magnetico-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico_gem_upgrade.json deleted file mode 100644 index df50a6c7d..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/magnetico_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:magnetico-gem" - }, - "addition": { - "item": "forgero:magnetico-gem" - }, - "result": { - "item": "forgero:magnetico-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_2.json new file mode 100644 index 000000000..6b7e4f079 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#O#", + "###" + ], + "key": { + "#": { + "item": "minecraft:prismarine_shard" + }, + "O": { + "item": "forgero:prismarine_gem_1" + } + }, + "result": { + "item": "forgero:prismarine_gem_2", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_3.json new file mode 100644 index 000000000..fbb13747a --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_3.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "forgero:prismarine_gem_2" + }, + "result": "forgero:prismarine_gem_3", + "count": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_4.json new file mode 100644 index 000000000..239acfb98 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:prismarine_gem_3" + }, + { + "item": "minecraft:dragon_breath" + } + ], + "result": { + "item": "forgero:prismarine_gem_4", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_5.json new file mode 100644 index 000000000..bd8807f8e --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/prismarine_gem_5.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:prismarine_gem_4" + }, + { + "item": "minecraft:nether_star" + } + ], + "result": { + "item": "forgero:prismarine_gem_5", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem.json deleted file mode 100644 index edd0db8c6..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:quartz" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:quartz-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_2.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_2.json new file mode 100644 index 000000000..328f2c843 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#O#", + "###" + ], + "key": { + "#": { + "item": "minecraft:quartz" + }, + "O": { + "item": "forgero:quartz_gem_1" + } + }, + "result": { + "item": "forgero:quartz_gem_2", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_3.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_3.json new file mode 100644 index 000000000..23c8485aa --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_3.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "forgero:quartz_gem_2" + }, + "result": "forgero:quartz_gem_3", + "count": 1 +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_4.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_4.json new file mode 100644 index 000000000..ce7b9c132 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_4.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:quartz_gem_3" + }, + { + "item": "minecraft:dragon_breath" + } + ], + "result": { + "item": "forgero:quartz_gem_4", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_5.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_5.json new file mode 100644 index 000000000..0f53c8016 --- /dev/null +++ b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_5.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "forgero:quartz_gem_4" + }, + { + "item": "minecraft:nether_star" + } + ], + "result": { + "item": "forgero:quartz_gem_5", + "count": 1 + } +} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_upgrade.json deleted file mode 100644 index 56ab67c96..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/quartz_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:quartz-gem" - }, - "addition": { - "item": "forgero:quartz-gem" - }, - "result": { - "item": "forgero:quartz-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/redstone_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/redstone_gem.json deleted file mode 100644 index 60f89f85f..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/redstone_gem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:redstone" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:redstone-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/redstone_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/redstone_gem_upgrade.json deleted file mode 100644 index 369fc8a61..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/redstone_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:redstone-gem" - }, - "addition": { - "item": "forgero:redstone-gem" - }, - "result": { - "item": "forgero:redstone-gem" - } -} - diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/stoneheart_gem.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/stoneheart_gem.json deleted file mode 100644 index 62747e26c..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/stoneheart_gem.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diamond" - }, - { - "tag": "minecraft:stone_tool_materials" - }, - { - "item": "minecraft:amethyst_shard" - } - ], - "result": { - "item": "forgero:stone_heart-gem" - } -} diff --git a/content/forgero-extended/src/main/resources/data/forgero/recipes/stoneheart_gem_upgrade.json b/content/forgero-extended/src/main/resources/data/forgero/recipes/stoneheart_gem_upgrade.json deleted file mode 100644 index 253f37245..000000000 --- a/content/forgero-extended/src/main/resources/data/forgero/recipes/stoneheart_gem_upgrade.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "forgero:gem_upgrade_recipe", - "base": { - "item": "forgero:stone_heart-gem" - }, - "addition": { - "item": "forgero:stone_heart-gem" - }, - "result": { - "item": "forgero:stone_heart-gem" - } -} - diff --git a/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/pommel.png b/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/pommel.png index 0d8986cd4..ccad64c1f 100644 Binary files a/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/pommel.png and b/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/pommel.png differ diff --git a/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/sword_pommel.png b/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/sword_pommel.png new file mode 100644 index 000000000..bc05534d5 Binary files /dev/null and b/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/sword_pommel.png differ diff --git a/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/tool_pommel.png b/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/tool_pommel.png new file mode 100644 index 000000000..4025c1a07 Binary files /dev/null and b/content/forgero-vanilla/src/main/resources/assets/forgero/templates/textures/tool_pommel.png differ diff --git a/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/hoe_outline_variant.png b/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/hoe_outline_variant.png index 7b4752de2..e574a6aef 100644 Binary files a/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/hoe_outline_variant.png and b/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/hoe_outline_variant.png differ diff --git a/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/pickaxe_outline_variant.png b/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/pickaxe_outline_variant.png index 7f1346dd8..0b18429ae 100644 Binary files a/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/pickaxe_outline_variant.png and b/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/pickaxe_outline_variant.png differ diff --git a/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/variant_schematic_base_big.png b/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/variant_schematic_base_big.png new file mode 100644 index 000000000..6670700a3 Binary files /dev/null and b/content/forgero-vanilla/src/main/resources/assets/forgero/textures/item/variant_schematic_base_big.png differ diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/binding.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/binding.json index 68a060656..fed73b4f7 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/binding.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/binding.json @@ -104,32 +104,32 @@ "name": "binding_gem", "type": "GENERATE", "palette": "TRINKET", - "template": "binding_gem.png", + "template": "gems/binding_gem.png", "order": 90, "variants": [ { "target": [ "type:AXE" ], - "template": "axe_binding_gem.png" + "template": "gems/axe_binding_gem.png" }, { "target": [ "type:PICKAXE" ], - "template": "pickaxe_binding_gem.png" + "template": "gems/pickaxe_binding_gem.png" }, { "target": [ "type:HOE" ], - "template": "hoe_binding_gem.png" + "template": "gems/hoe_binding_gem.png" }, { "target": [ "type:SHOVEL" ], - "template": "shovel_binding_gem.png" + "template": "gems/shovel_binding_gem.png" } ] }, diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/handle.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/handle.json index e00a83c43..4058e2d43 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/handle.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/handle.json @@ -91,6 +91,12 @@ "type:SWORD" ], "template": "short_handle.png" + }, + { + "target": [ + "type:WEAPON" + ], + "template": "axe_handle.png" } ] }, @@ -113,10 +119,18 @@ { "target": [ "type:DYE", - "slot:1" + "slot:2" ], "modelType": "UPGRADE", "template": "handle_dye" + }, + { + "target": [ + "type:POMMEL", + "slot:1" + ], + "modelType": "UPGRADE", + "template": "handle_pommel" } ] } diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/pommel.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/pommel.json new file mode 100644 index 000000000..d0d3f1f9d --- /dev/null +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/pommel.json @@ -0,0 +1,111 @@ +{ + "type": "POMMEL", + "models": [ + { + "name": "pommel", + "template": "pommel.png", + "type": "GENERATE", + "palette": "METAL", + "order": 60, + "variants": [ + { + "target": [ + "type:HOE" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:PICKAXE" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:AXE" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:SHOVEL" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:SWORD" + ], + "template": "sword_pommel.png" + }, + { + "target": [ + "type:HANDLE" + ], + "template": "tool_pommel.png" + } + ] + }, + { + "name": "pommel_dye", + "template": "pommel.png", + "type": "GENERATE", + "palette": "DYE", + "order": 65, + "variants": [ + { + "target": [ + "type:HOE" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:PICKAXE" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:AXE" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:SHOVEL" + ], + "template": "tool_pommel.png" + }, + { + "target": [ + "type:SWORD" + ], + "template": "sword_pommel.png" + }, + { + "target": [ + "type:HANDLE" + ], + "template": "tool_pommel.png" + } + ] + }, + { + "target": [ + "type:METAL", + "type:POMMEL_SCHEMATIC" + ], + "modelType": "BASED_COMPOSITE", + "template": "pommel" + }, + { + "target": [ + "type:DYE", + "slot:0" + ], + "modelType": "UPGRADE", + "template": "pommel_dye" + } + ] +} diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/soft_binding.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/soft_binding.json index 838605987..6a9c9d4e7 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/soft_binding.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/soft_binding.json @@ -38,32 +38,32 @@ "name": "soft_binding_gem", "type": "GENERATE", "palette": "TRINKET", - "template": "soft_binding_gem.png", + "template": "gems/soft_binding_gem.png", "order": 50, "variants": [ { "target": [ "type:AXE" ], - "template": "axe_soft_binding_gem.png" + "template": "gems/axe_soft_binding_gem.png" }, { "target": [ "type:PICKAXE" ], - "template": "pickaxe_soft_binding_gem.png" + "template": "gems/pickaxe_soft_binding_gem.png" }, { "target": [ "type:HOE" ], - "template": "hoe_soft_binding_gem.png" + "template": "gems/hoe_soft_binding_gem.png" }, { "target": [ "type:SHOVEL" ], - "template": "shovel_soft_binding_gem.png" + "template": "gems/shovel_soft_binding_gem.png" } ] }, diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/sword_guard.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/sword_guard.json index 5f7da1463..d9718eb9a 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/sword_guard.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/models/sword_guard.json @@ -12,7 +12,7 @@ "name": "guard_gem", "type": "GENERATE", "palette": "TRINKET", - "template": "guard_gem.png", + "template": "gems/guard_gem.png", "order": 75 }, { diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/axe_head.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/axe_head.json index a0d705179..704e4b3ea 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/axe_head.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/axe_head.json @@ -62,6 +62,7 @@ "ingredient_count": { "value": 3, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:axe" } } diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/handle.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/handle.json index 92dce4fa8..15e6aec6d 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/handle.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/handle.json @@ -27,6 +27,15 @@ "description": "grip", "tier": 1 }, + { + "upgrade_type": "SMITHING", + "description": "pummel", + "category": [ + "OFFENSIVE" + ], + "type": "POMMEL", + "tier": 1 + }, { "upgrade_type": "SMITHING", "category": [ diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/hoe_head.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/hoe_head.json index 80f2f3c39..779edd095 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/hoe_head.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/hoe_head.json @@ -72,6 +72,7 @@ "ingredient_count": { "value": 2, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:pickaxe" } } diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/pickaxe_head.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/pickaxe_head.json index 46ab5c5c5..4801cb764 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/pickaxe_head.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/pickaxe_head.json @@ -64,6 +64,7 @@ "ingredient_count": { "value": 3, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:pickaxe" } } diff --git a/content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/schematic/pommel.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/pommel.json similarity index 100% rename from content/forgero-extended/src/main/resources/data/forgero/packs/forgero-extended/schematic/pommel.json rename to content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/pommel.json diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/shovel_head.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/shovel_head.json index 638104f44..445dad289 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/shovel_head.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/shovel_head.json @@ -64,6 +64,7 @@ "ingredient_count": { "value": 1, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:hammer" } } diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/sword_blade.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/sword_blade.json index df773c576..4d9917565 100644 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/sword_blade.json +++ b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/schematic/sword_blade.json @@ -26,7 +26,7 @@ "OFFENSIVE" ], "description": "reinforcement", - "type": "MATERIAL" + "type": "UPGRADE_MATERIAL" }, { "upgrade_type": "SMITHING", @@ -65,6 +65,7 @@ "ingredient_count": { "value": 2, "context": "LOCAL" - } + }, + "better_compat_attribute_container": "forgero:sword" } } diff --git a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/tool/weapon.json b/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/tool/weapon.json deleted file mode 100644 index 6a0144597..000000000 --- a/content/forgero-vanilla/src/main/resources/data/forgero/packs/forgero-vanilla/tool/weapon.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "WEAPON", - "name": "weapon", - "resource_type": "CONSTRUCT_TEMPLATE", - "container": { - "type": "CREATE", - "id": "this" - }, - "construct": { - "type": "WEAPON", - "target": "CREATE", - "recipes": [ - { - "crafting_type": "STATE_CRAFTING_RECIPE", - "ingredients": [ - { - "unique": true, - "type": "WEAPON_HEAD" - }, - { - "type": "HANDLE" - } - ] - } - ], - "components": [ - { - "type": "WEAPON_HEAD" - }, - { - "type": "HANDLE" - } - ], - "slots": [ - ] - }, - "model": { - "type": "COMPOSITE" - } -} diff --git a/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPostInit.java b/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPostInit.java index 0612f161c..c2296d1d5 100644 --- a/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPostInit.java +++ b/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPostInit.java @@ -21,6 +21,7 @@ import com.sigmundgranaas.forgero.core.property.v2.attribute.attributes.Durability; import com.sigmundgranaas.forgero.core.property.v2.attribute.attributes.MiningLevel; import com.sigmundgranaas.forgero.core.property.v2.attribute.attributes.MiningSpeed; +import com.sigmundgranaas.forgero.core.property.v2.attribute.attributes.Rarity; import com.sigmundgranaas.forgero.core.property.v2.attribute.attributes.Reach; import com.sigmundgranaas.forgero.core.property.v2.attribute.attributes.Weight; import com.sigmundgranaas.forgero.core.state.Identifiable; @@ -138,14 +139,14 @@ private void registerRecipeGenerators(StateService stateService) { } private void registerToolTipFilters() { - var defaults = List.of(AttackDamage.KEY, MiningSpeed.KEY, Durability.KEY, MiningLevel.KEY, AttackSpeed.KEY, Armor.KEY, Weight.KEY, Reach.KEY); - defaults.stream() - .map(TooltipAttributeRegistry.attributeBuilder()::attribute) - .forEach(TooltipAttributeRegistry.AttributeBuilder::register); - - TooltipAttributeRegistry.attributeBuilder().attribute("RARITY").condition(container -> !ForgeroConfigurationLoader.configuration.hideRarity).register(); + var defaults = List.of(AttackDamage.KEY, MiningSpeed.KEY, Durability.KEY, MiningLevel.KEY, AttackSpeed.KEY, Armor.KEY, Reach.KEY, Weight.KEY); + defaults.stream().map(TooltipAttributeRegistry.attributeBuilder()::attribute).forEach(TooltipAttributeRegistry.AttributeBuilder::register); + TooltipAttributeRegistry.attributeBuilder().attribute(Rarity.KEY).condition(container -> !ForgeroConfigurationLoader.configuration.hideRarity).register(); var swords = List.of(AttackDamage.KEY, AttackSpeed.KEY, Durability.KEY, Armor.KEY, Weight.KEY, Reach.KEY); + TooltipAttributeRegistry.filterBuilder().attributes(swords).type(Type.SWORD_BLADE).register(); + TooltipAttributeRegistry.filterBuilder().attributes(swords).type(Type.SWORD).register(); + TooltipAttributeRegistry.attributeBuilder().attribute("RARITY").condition(container -> !ForgeroConfigurationLoader.configuration.hideRarity).register(); TooltipAttributeRegistry.filterBuilder().attributes(swords).type(Type.WEAPON_HEAD).register(); TooltipAttributeRegistry.filterBuilder().attributes(swords).type(Type.WEAPON).register(); diff --git a/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPreInit.java b/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPreInit.java index 527b0d7b7..e11d2b951 100644 --- a/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPreInit.java +++ b/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/initialization/ForgeroPreInit.java @@ -90,7 +90,6 @@ import com.sigmundgranaas.forgero.minecraft.common.handler.use.ThrowableHandler; import com.sigmundgranaas.forgero.minecraft.common.handler.use.UseHandler; import com.sigmundgranaas.forgero.minecraft.common.item.BuildableStateConverter; -import com.sigmundgranaas.forgero.minecraft.common.item.GemItemRegistrar; import com.sigmundgranaas.forgero.minecraft.common.item.ItemRegistries; import com.sigmundgranaas.forgero.minecraft.common.item.RegistryUtils; import com.sigmundgranaas.forgero.minecraft.common.item.tool.DynamicToolItemRegistrationHandler; @@ -168,7 +167,6 @@ private void registerItemConverters() { converterRegistry.register("forgero:default", baseConverter); RegistryUtils.register(converterRegistry, new DynamicWeaponItemRegistrationHandler(baseConverter)); RegistryUtils.register(converterRegistry, new DynamicToolItemRegistrationHandler(baseConverter)); - RegistryUtils.register(converterRegistry, new GemItemRegistrar(baseConverter)); } private void registerPredicateBuilders() { diff --git a/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/item/ItemGroups.java b/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/item/ItemGroups.java index fac82c622..808a19af0 100644 --- a/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/item/ItemGroups.java +++ b/fabric/forgero-fabric-core/src/main/java/com/sigmundgranaas/forgero/fabric/item/ItemGroups.java @@ -50,7 +50,7 @@ private static ItemStack createPartIcon() { } private static ItemStack createTrinketIcon() { - return new ItemStack(Registries.ITEM.get(new Identifier("forgero:redstone-gem"))); + return new ItemStack(Registries.ITEM.get(new Identifier("forgero:diamond_gem_5"))); } static { diff --git a/fabric/forgero-fabric-core/src/main/resources/assets/forgero/lang/en_us.json b/fabric/forgero-fabric-core/src/main/resources/assets/forgero/lang/en_us.json index 9a04a2914..5e49b9a7d 100644 --- a/fabric/forgero-fabric-core/src/main/resources/assets/forgero/lang/en_us.json +++ b/fabric/forgero-fabric-core/src/main/resources/assets/forgero/lang/en_us.json @@ -19,6 +19,7 @@ "item.forgero.mining_level": "Mining level", "item.forgero.rarity": "Rarity", "item.forgero.mining_speed": "Mining speed", + "item.forgero.forgero:reach": "Reach", "item.forgero.armor": "Armor", "item.forgero.forgero:reach": "Reach", "item.forgero.slots": "Slots", diff --git a/fabric/forgero-fabric-core/src/main/resources/data/forgero/advancements/forgero/root.json b/fabric/forgero-fabric-core/src/main/resources/data/forgero/advancements/forgero/root.json deleted file mode 100644 index 7eed5f8ed..000000000 --- a/fabric/forgero-fabric-core/src/main/resources/data/forgero/advancements/forgero/root.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "display": { - "icon": { - "item": "forgero:diamond-pickaxe" - }, - "title": { - "translate": "advancements.forgero.root.title" - }, - "description": { - "translate": "advancements.forgero.root.description" - }, - "frame": "task", - "show_toast": true, - "announce_to_chat": true, - "hidden": false, - "background": "minecraft:textures/gui/advancements/backgrounds/stone.png" - }, - "criteria": { - "default": { - "trigger": "minecraft:inventory_changed", - "conditions": {} - } - }, - "rewards": { - "loot": [ - "forgero:grant_book_on_advancement" - ] - }, - "requirements": [ - [ - "default" - ] - ] -} diff --git a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/item/GemItem.java b/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/item/GemItem.java deleted file mode 100644 index bb814ab80..000000000 --- a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/item/GemItem.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.sigmundgranaas.forgero.minecraft.common.item; - -import java.util.List; - -import com.sigmundgranaas.forgero.core.customdata.DataContainer; -import com.sigmundgranaas.forgero.core.state.LeveledState; -import com.sigmundgranaas.forgero.core.state.State; -import com.sigmundgranaas.forgero.core.type.Type; -import com.sigmundgranaas.forgero.core.util.match.MatchContext; -import com.sigmundgranaas.forgero.core.util.match.Matchable; -import com.sigmundgranaas.forgero.minecraft.common.service.StateService; -import com.sigmundgranaas.forgero.minecraft.common.tooltip.Writer; -import com.sigmundgranaas.forgero.minecraft.common.tooltip.v2.DefaultWriter; - -import net.minecraft.client.item.TooltipContext; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; -import net.minecraft.world.World; - -public class GemItem extends Item implements StateItem { - private final State DEFAULT; - private final StateService service; - - public GemItem(Settings settings, State defaultState, StateService service) { - super(settings); - this.DEFAULT = defaultState; - this.service = service; - } - - @Override - public State defaultState() { - return DEFAULT; - } - - @Override - public Text getName() { - return Writer.nameToTranslatableText(DEFAULT); - } - - @Override - public void appendTooltip(ItemStack itemStack, World world, List tooltip, TooltipContext tooltipContext) { - new DefaultWriter(dynamicState(itemStack)).write(tooltip, tooltipContext); - super.appendTooltip(itemStack, world, tooltip, tooltipContext); - } - - @Override - public Text getName(ItemStack stack) { - var state = service.convert(stack).orElse(DEFAULT); - var text = Text.empty(); - if (state instanceof LeveledState leveledState) { - text.append(Text.literal(String.format("Level %s ", leveledState.level()))); - } - text.append(Writer.nameToTranslatableText(DEFAULT)); - return text; - } - - - @Override - public String name() { - return DEFAULT.name(); - } - - @Override - public String nameSpace() { - return DEFAULT.nameSpace(); - } - - @Override - public Type type() { - return DEFAULT.type(); - } - - @Override - public boolean test(Matchable match, MatchContext context) { - return DEFAULT.test(match, context); - } - - - @Override - public DataContainer customData() { - return defaultState().customData(); - } -} diff --git a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/item/GemItemRegistrar.java b/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/item/GemItemRegistrar.java deleted file mode 100644 index 4012d111d..000000000 --- a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/item/GemItemRegistrar.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.sigmundgranaas.forgero.minecraft.common.item; - -import static com.sigmundgranaas.forgero.minecraft.common.item.RegistryUtils.typeMatcher; - -import com.sigmundgranaas.forgero.core.state.StateProvider; -import com.sigmundgranaas.forgero.core.registry.GenericRegistry; -import com.sigmundgranaas.forgero.core.registry.RankableConverter; -import com.sigmundgranaas.forgero.core.registry.Registerable; -import com.sigmundgranaas.forgero.minecraft.common.service.StateService; - -import net.minecraft.item.Item; - -public class GemItemRegistrar implements Registerable> { - private final BuildableStateConverter defaultStateConverter; - - public GemItemRegistrar(BuildableStateConverter defaultStateConverter) { - this.defaultStateConverter = defaultStateConverter; - } - - @Override - public void register(GenericRegistry> registry) { - var base = defaultStateConverter.toBuilder() - .priority(1) - .build(); - - registry.register("forgero:gem", base.toBuilder() - .matcher(typeMatcher("GEM")) - .item(this::gem) - .build()); - } - - private Item gem(StateProvider provider, Item.Settings settings) { - return new GemItem(settings, provider.get(), StateService.INSTANCE); - } -} diff --git a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/SingleLootEntry.java b/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/SingleLootEntry.java index 813f3d2b9..84497ac8f 100644 --- a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/SingleLootEntry.java +++ b/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/SingleLootEntry.java @@ -33,6 +33,7 @@ public class SingleLootEntry implements LootEntry { public static LootEntry of(LootEntryData data) { StateFilter filter = StateFilter.builder() .types(data.types()) + .ids(data.ids()) .lowerRarity(data.lower_rarity_limit()) .upperRarity(data.upper_rarity_limit()) .build(); diff --git a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/StateFilter.java b/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/StateFilter.java index 964b279b4..8b7e0f12a 100644 --- a/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/StateFilter.java +++ b/fabric/minecraft-common/src/main/java/com/sigmundgranaas/forgero/minecraft/common/loot/StateFilter.java @@ -24,8 +24,10 @@ public class StateFilter { private int upperRarity = 0; @Builder.Default private int lowerRarity = 0; + @Builder.Default private List types = new ArrayList<>(); + @Builder.Default private List ids = new ArrayList<>(); @@ -53,23 +55,26 @@ public List filter() { .filter(this::filter) .forEach(states::add); - return states.stream().map(Identifiable::identifier).map(id -> Registries.ITEM.get(new Identifier(id))).toList(); - } + return states.stream().map(Identifiable::identifier).map(id -> Registries.ITEM.get(new Identifier(id))).toList(); + } private boolean filter(State state) { - if (state.stream().applyAttribute(Rarity.KEY) < lowerRarity) { - return false; + if (upperRarity != 0) { + if (state.stream().applyAttribute(Rarity.KEY) < lowerRarity) { + return false; + } + + if (state.stream().applyAttribute(Rarity.KEY) > upperRarity) { + return false; + } } - if (state.stream().applyAttribute(Rarity.KEY) > upperRarity) { - return false; - } if (exclusion.stream().anyMatch(exclusion -> stringMatch(exclusion, state))) { return false; } - return include.size() == 0 || include.stream().anyMatch(include -> stringMatch(include, state)); + return include.isEmpty() || include.stream().anyMatch(include -> stringMatch(include, state)); } private boolean stringMatch(String match, State state) { diff --git a/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/configuration/ForgeroConfiguration.java b/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/configuration/ForgeroConfiguration.java index bbe059fca..aefecab65 100644 --- a/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/configuration/ForgeroConfiguration.java +++ b/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/configuration/ForgeroConfiguration.java @@ -13,7 +13,13 @@ public class ForgeroConfiguration implements ForgeroConfigurationData { @NotNull public List disabledResources = Collections.emptyList(); @NotNull - public List disabledPacks = Collections.emptyList(); + public List disabledPacks = List.of( + "forgero:extended-handles-deprecated", + "forgero:extended-swords-deprecated", + "forgero:extended-tools-deprecated", + "forgero:material-deprecated", + "forgero:trinkets-deprecated" + ); // Recipes, upgrades, and loot @NotNull diff --git a/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/resource/data/v2/data/LootEntryData.java b/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/resource/data/v2/data/LootEntryData.java index f9b6414e5..171c68262 100644 --- a/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/resource/data/v2/data/LootEntryData.java +++ b/forgero-core/src/main/java/com/sigmundgranaas/forgero/core/resource/data/v2/data/LootEntryData.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; +import java.util.Objects; import com.google.gson.annotations.SerializedName; import lombok.Builder; @@ -16,6 +17,7 @@ public class LootEntryData { @Builder.Default private String id = EMPTY_IDENTIFIER; + @Builder.Default @SerializedName(value = "targets", alternate = {"target_tables", "tables"}) private List targets = Collections.emptyList(); @@ -23,6 +25,9 @@ public class LootEntryData { @Builder.Default private List types = Collections.emptyList(); + @Builder.Default + private List ids = Collections.emptyList(); + @Builder.Default private int priority = 0; @Builder.Default @@ -33,4 +38,12 @@ public class LootEntryData { private float chance = 1f; @Builder.Default private int rolls = 1; + + public List ids() { + return Objects.requireNonNullElse(ids, Collections.emptyList()); + } + + public List types() { + return Objects.requireNonNullElse(types, Collections.emptyList()); + } } diff --git a/settings.gradle b/settings.gradle index fdbbc25f3..cb4518e6b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,6 +16,7 @@ include("content:${mod_id}-extended") include("content:${mod_id}-vanilla") include("content:${mod_id}-compat") include("content:${mod_id}-structures") +include("content:${mod_id}-deprecated") // Fabric include "fabric"