Skip to content

Commit

Permalink
add charging animation to staffs
Browse files Browse the repository at this point in the history
  • Loading branch information
@RCXcrafter @KnightMiner
RCXcrafter authored and KnightMiner committed Feb 13, 2023
1 parent 2846565 commit 8f94bd8
Show file tree
Hide file tree
Showing 48 changed files with 318 additions and 8 deletions.
26 changes: 26 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/base/staff_charging.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parent": "forge:item/default-tool",
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"rotation": [ 0, -90, 70 ],
"translation": [ 0, 1.0, 1.0 ],
"scale": [ 0.85, 0.85, 0.85 ]
},
"thirdperson_lefthand": {
"rotation": [ 0, 90, -70 ],
"translation": [ 0, 1.0, 1.0 ],
"scale": [ 0.85, 0.85, 0.85 ]
},
"firstperson_righthand": {
"rotation": [ 0, -80, 60 ],
"translation": [ 1.13, 3.0, -0.13 ],
"scale": [ 0.68, 0.68, 0.68 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 100, -60 ],
"translation": [ 1.13, 3.0, -0.13 ],
"scale": [ 0.68, 0.68, 0.68 ]
}
}
}
30 changes: 26 additions & 4 deletions src/main/resources/assets/tconstruct/models/item/ichor_staff.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,30 @@
"large": [ "tconstruct:item/tool/staff/large_modifiers/ichor/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ],
"overrides": [{
"predicate": { "tconstruct:charging": 2 },
"model": "tconstruct:item/blocking/ichor_staff"
}]
"overrides": [
{
"predicate": { "tconstruct:charging": 2 },
"model": "tconstruct:item/blocking/ichor_staff"
},
{
"predicate": { "pulling": 1 },
"model": "tconstruct:item/slimestaff/ichor_charging_1"
},
{
"predicate": { "pulling": 1, "pull": 0.4 },
"model": "tconstruct:item/slimestaff/ichor_charging_2"
},
{
"predicate": { "pulling": 1, "pull": 0.7 },
"model": "tconstruct:item/slimestaff/ichor_charging_3"
},
{
"predicate": { "pulling": 1, "pull": 0.9 },
"model": "tconstruct:item/slimestaff/ichor_charging_4"
},
{
"predicate": { "pulling": 1, "pull": 1.0 },
"model": "tconstruct:item/slimestaff/ichor_charging_5"
}
]
}
30 changes: 26 additions & 4 deletions src/main/resources/assets/tconstruct/models/item/sky_staff.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,30 @@
"large": [ "tconstruct:item/tool/staff/large_modifiers/sky/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ],
"overrides": [{
"predicate": { "tconstruct:charging": 2 },
"model": "tconstruct:item/blocking/sky_staff"
}]
"overrides": [
{
"predicate": { "tconstruct:charging": 2 },
"model": "tconstruct:item/blocking/sky_staff"
},
{
"predicate": { "pulling": 1 },
"model": "tconstruct:item/slimestaff/sky_charging_1"
},
{
"predicate": { "pulling": 1, "pull": 0.4 },
"model": "tconstruct:item/slimestaff/sky_charging_2"
},
{
"predicate": { "pulling": 1, "pull": 0.7 },
"model": "tconstruct:item/slimestaff/sky_charging_3"
},
{
"predicate": { "pulling": 1, "pull": 0.9 },
"model": "tconstruct:item/slimestaff/sky_charging_4"
},
{
"predicate": { "pulling": 1, "pull": 1.0 },
"model": "tconstruct:item/slimestaff/sky_charging_5"
}
]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/earth_charging_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/earth_1",
"broken": "tconstruct:item/tool/staff/earth_broken",
"tool_large": "tconstruct:item/tool/staff/earth_large_1",
"broken_large": "tconstruct:item/tool/staff/earth_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/earth/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/earth_charging_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/earth_2",
"broken": "tconstruct:item/tool/staff/earth_broken",
"tool_large": "tconstruct:item/tool/staff/earth_large_2",
"broken_large": "tconstruct:item/tool/staff/earth_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/earth/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/earth_charging_3.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/earth_3",
"broken": "tconstruct:item/tool/staff/earth_broken",
"tool_large": "tconstruct:item/tool/staff/earth_large_3",
"broken_large": "tconstruct:item/tool/staff/earth_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/earth/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/earth_charging_4.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/earth_4",
"broken": "tconstruct:item/tool/staff/earth_broken",
"tool_large": "tconstruct:item/tool/staff/earth_large_4",
"broken_large": "tconstruct:item/tool/staff/earth_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/earth/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/earth_charging_5.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/earth_5",
"broken": "tconstruct:item/tool/staff/earth_broken",
"tool_large": "tconstruct:item/tool/staff/earth_large_5",
"broken_large": "tconstruct:item/tool/staff/earth_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/earth/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/ichor_charging_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/ichor_1",
"broken": "tconstruct:item/tool/staff/ichor_broken",
"tool_large": "tconstruct:item/tool/staff/ichor_large_1",
"broken_large": "tconstruct:item/tool/staff/ichor_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/ichor/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/ichor_charging_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/ichor_2",
"broken": "tconstruct:item/tool/staff/ichor_broken",
"tool_large": "tconstruct:item/tool/staff/ichor_large_2",
"broken_large": "tconstruct:item/tool/staff/ichor_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/ichor/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/ichor_charging_3.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/ichor_3",
"broken": "tconstruct:item/tool/staff/ichor_broken",
"tool_large": "tconstruct:item/tool/staff/ichor_large_3",
"broken_large": "tconstruct:item/tool/staff/ichor_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/ichor/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/ichor_charging_4.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/ichor_4",
"broken": "tconstruct:item/tool/staff/ichor_broken",
"tool_large": "tconstruct:item/tool/staff/ichor_large_4",
"broken_large": "tconstruct:item/tool/staff/ichor_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/ichor/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/ichor_charging_5.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/ichor_5",
"broken": "tconstruct:item/tool/staff/ichor_broken",
"tool_large": "tconstruct:item/tool/staff/ichor_large_5",
"broken_large": "tconstruct:item/tool/staff/ichor_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/ichor/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/sky_charging_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/sky_1",
"broken": "tconstruct:item/tool/staff/sky_broken",
"tool_large": "tconstruct:item/tool/staff/sky_large_1",
"broken_large": "tconstruct:item/tool/staff/sky_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/sky/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/sky_charging_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/sky_2",
"broken": "tconstruct:item/tool/staff/sky_broken",
"tool_large": "tconstruct:item/tool/staff/sky_large_2",
"broken_large": "tconstruct:item/tool/staff/sky_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/sky/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/sky_charging_3.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/sky_3",
"broken": "tconstruct:item/tool/staff/sky_broken",
"tool_large": "tconstruct:item/tool/staff/sky_large_3",
"broken_large": "tconstruct:item/tool/staff/sky_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/sky/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/sky_charging_4.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/sky_4",
"broken": "tconstruct:item/tool/staff/sky_broken",
"tool_large": "tconstruct:item/tool/staff/sky_large_4",
"broken_large": "tconstruct:item/tool/staff/sky_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/sky/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
16 changes: 16 additions & 0 deletions src/main/resources/assets/tconstruct/models/item/slimestaff/sky_charging_5.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"loader": "tconstruct:tool",
"parent": "tconstruct:item/base/staff_charging",
"textures": {
"tool": "tconstruct:item/tool/staff/sky_5",
"broken": "tconstruct:item/tool/staff/sky_broken",
"tool_large": "tconstruct:item/tool/staff/sky_large_5",
"broken_large": "tconstruct:item/tool/staff/sky_large_broken"
},
"large": true,
"modifier_roots": {
"small": [ "tconstruct:item/tool/staff/modifiers/" ],
"large": [ "tconstruct:item/tool/staff/large_modifiers/sky/", "tconstruct:item/tool/staff/large_modifiers/" ]
},
"first_modifiers": [ "tconstruct:dyed", "tconstruct:embellishment" ]
}
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_4.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_large_1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_large_2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_large_3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_large_4.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/earth_large_5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_4.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_large_1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_large_2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_large_3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_large_4.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/ichor_large_5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_4.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_large_1.png
View file
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_large_2.png
View file
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_large_3.png
View file
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_large_4.png
View file
Binary file added src/main/resources/assets/tconstruct/textures/item/tool/staff/sky_large_5.png
View file

0 comments on commit 8f94bd8

Please sign in to comment.