-
Notifications
You must be signed in to change notification settings - Fork 756
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleanup slime embellishments a bit to make the generated textures more consistent, notably the shading on the items was different from the armor form in a notable way, and the borders on the armor were not always brighter than the middle
- Loading branch information
1 parent
b514f12
commit 2a73e6c
Showing
94 changed files
with
87 additions
and
2 deletions.
There are no files selected for viewing
Binary file modified
BIN
-4 Bytes
(98%)
.../armor/slime/boot_modifiers/tconstruct_embellishment_broken_tconstruct_clay.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+15 Bytes
(110%)
.../slime/boot_modifiers/tconstruct_embellishment_broken_tconstruct_earthslime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+10 Bytes
(100%)
.../armor/slime/boot_modifiers/tconstruct_embellishment_broken_tconstruct_gold.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1 Byte
(100%)
...armor/slime/boot_modifiers/tconstruct_embellishment_broken_tconstruct_honey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3 Bytes
(99%)
...armor/slime/boot_modifiers/tconstruct_embellishment_broken_tconstruct_ichor.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+257 Bytes
...armor/slime/boot_modifiers/tconstruct_embellishment_broken_tconstruct_magma.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+10 Bytes
(100%)
...or/slime/boot_modifiers/tconstruct_embellishment_broken_tconstruct_skyslime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+4 Bytes
(100%)
...em/tool/armor/slime/boot_modifiers/tconstruct_embellishment_tconstruct_clay.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+9 Bytes
(100%)
...l/armor/slime/boot_modifiers/tconstruct_embellishment_tconstruct_earthslime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+19 Bytes
(110%)
...em/tool/armor/slime/boot_modifiers/tconstruct_embellishment_tconstruct_gold.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+4 Bytes
(100%)
...m/tool/armor/slime/boot_modifiers/tconstruct_embellishment_tconstruct_honey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+10 Bytes
(100%)
...m/tool/armor/slime/boot_modifiers/tconstruct_embellishment_tconstruct_ichor.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+268 Bytes
...m/tool/armor/slime/boot_modifiers/tconstruct_embellishment_tconstruct_magma.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+11 Bytes
(100%)
...ool/armor/slime/boot_modifiers/tconstruct_embellishment_tconstruct_skyslime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-8 Bytes
(98%)
...armor/slime/shell_modifiers/tconstruct_embellishment_broken_tconstruct_clay.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-17 Bytes
(95%)
...slime/shell_modifiers/tconstruct_embellishment_broken_tconstruct_earthslime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+26 Bytes
(110%)
...armor/slime/shell_modifiers/tconstruct_embellishment_broken_tconstruct_gold.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3 Bytes
(99%)
...rmor/slime/shell_modifiers/tconstruct_embellishment_broken_tconstruct_honey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-5 Bytes
(98%)
...rmor/slime/shell_modifiers/tconstruct_embellishment_broken_tconstruct_ichor.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+335 Bytes
...rmor/slime/shell_modifiers/tconstruct_embellishment_broken_tconstruct_magma.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-5 Bytes
(99%)
...r/slime/shell_modifiers/tconstruct_embellishment_broken_tconstruct_skyslime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-7 Bytes
(98%)
...m/tool/armor/slime/shell_modifiers/tconstruct_embellishment_tconstruct_clay.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-6 Bytes
(98%)
.../armor/slime/shell_modifiers/tconstruct_embellishment_tconstruct_earthslime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+12 Bytes
(100%)
...m/tool/armor/slime/shell_modifiers/tconstruct_embellishment_tconstruct_gold.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-4 Bytes
(99%)
.../tool/armor/slime/shell_modifiers/tconstruct_embellishment_tconstruct_honey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+2 Bytes
(100%)
.../tool/armor/slime/shell_modifiers/tconstruct_embellishment_tconstruct_ichor.png
Oops, something went wrong.
Binary file added
BIN
+277 Bytes
.../tool/armor/slime/shell_modifiers/tconstruct_embellishment_tconstruct_magma.png
Oops, something went wrong.
Binary file modified
BIN
-3 Bytes
(99%)
...ol/armor/slime/shell_modifiers/tconstruct_embellishment_tconstruct_skyslime.png
Oops, something went wrong.
Binary file modified
BIN
-3 Bytes
(99%)
...armor/slime/skull_modifiers/tconstruct_embellishment_broken_tconstruct_clay.png
Oops, something went wrong.
Binary file modified
BIN
-5 Bytes
(98%)
...slime/skull_modifiers/tconstruct_embellishment_broken_tconstruct_earthslime.png
Oops, something went wrong.
Binary file modified
BIN
+17 Bytes
(110%)
...armor/slime/skull_modifiers/tconstruct_embellishment_broken_tconstruct_gold.png
Oops, something went wrong.
Binary file modified
BIN
-7 Bytes
(97%)
...rmor/slime/skull_modifiers/tconstruct_embellishment_broken_tconstruct_honey.png
Oops, something went wrong.
Binary file modified
BIN
-1 Byte
(100%)
...rmor/slime/skull_modifiers/tconstruct_embellishment_broken_tconstruct_ichor.png
Oops, something went wrong.
Binary file added
BIN
+232 Bytes
...rmor/slime/skull_modifiers/tconstruct_embellishment_broken_tconstruct_magma.png
Oops, something went wrong.
Binary file modified
BIN
+6 Bytes
(100%)
...r/slime/skull_modifiers/tconstruct_embellishment_broken_tconstruct_skyslime.png
Oops, something went wrong.
Binary file modified
BIN
-7 Bytes
(97%)
...m/tool/armor/slime/skull_modifiers/tconstruct_embellishment_tconstruct_clay.png
Oops, something went wrong.
Binary file modified
BIN
-7 Bytes
(97%)
.../armor/slime/skull_modifiers/tconstruct_embellishment_tconstruct_earthslime.png
Oops, something went wrong.
Binary file modified
BIN
-10 Bytes
(96%)
...m/tool/armor/slime/skull_modifiers/tconstruct_embellishment_tconstruct_gold.png
Oops, something went wrong.
Binary file modified
BIN
-13 Bytes
(94%)
.../tool/armor/slime/skull_modifiers/tconstruct_embellishment_tconstruct_honey.png
Oops, something went wrong.
Binary file modified
BIN
-9 Bytes
(96%)
.../tool/armor/slime/skull_modifiers/tconstruct_embellishment_tconstruct_ichor.png
Oops, something went wrong.
Binary file added
BIN
+202 Bytes
.../tool/armor/slime/skull_modifiers/tconstruct_embellishment_tconstruct_magma.png
Oops, something went wrong.
Binary file modified
BIN
-4 Bytes
(98%)
...ol/armor/slime/skull_modifiers/tconstruct_embellishment_tconstruct_skyslime.png
Oops, something went wrong.
Binary file modified
BIN
+2 Bytes
(100%)
...armor/slime/wings_modifiers/tconstruct_embellishment_broken_tconstruct_clay.png
Oops, something went wrong.
Binary file modified
BIN
+5 Bytes
(100%)
...slime/wings_modifiers/tconstruct_embellishment_broken_tconstruct_earthslime.png
Oops, something went wrong.
Binary file modified
BIN
+24 Bytes
(110%)
...armor/slime/wings_modifiers/tconstruct_embellishment_broken_tconstruct_gold.png
Oops, something went wrong.
Binary file modified
BIN
-19 Bytes
(95%)
...rmor/slime/wings_modifiers/tconstruct_embellishment_broken_tconstruct_honey.png
Oops, something went wrong.
Binary file modified
BIN
-13 Bytes
(96%)
...rmor/slime/wings_modifiers/tconstruct_embellishment_broken_tconstruct_ichor.png
Oops, something went wrong.
Binary file added
BIN
+330 Bytes
...rmor/slime/wings_modifiers/tconstruct_embellishment_broken_tconstruct_magma.png
Oops, something went wrong.
Binary file modified
BIN
+4 Bytes
(100%)
...r/slime/wings_modifiers/tconstruct_embellishment_broken_tconstruct_skyslime.png
Oops, something went wrong.
Binary file modified
BIN
-8 Bytes
(98%)
...m/tool/armor/slime/wings_modifiers/tconstruct_embellishment_tconstruct_clay.png
Oops, something went wrong.
Binary file modified
BIN
+12 Bytes
(100%)
.../armor/slime/wings_modifiers/tconstruct_embellishment_tconstruct_earthslime.png
Oops, something went wrong.
Binary file modified
BIN
+23 Bytes
(110%)
...m/tool/armor/slime/wings_modifiers/tconstruct_embellishment_tconstruct_gold.png
Oops, something went wrong.
Binary file modified
BIN
-4 Bytes
(99%)
.../tool/armor/slime/wings_modifiers/tconstruct_embellishment_tconstruct_honey.png
Oops, something went wrong.
Binary file modified
BIN
+14 Bytes
(100%)
.../tool/armor/slime/wings_modifiers/tconstruct_embellishment_tconstruct_ichor.png
Oops, something went wrong.
Binary file added
BIN
+336 Bytes
.../tool/armor/slime/wings_modifiers/tconstruct_embellishment_tconstruct_magma.png
Oops, something went wrong.
Binary file modified
BIN
+8 Bytes
(100%)
...ol/armor/slime/wings_modifiers/tconstruct_embellishment_tconstruct_skyslime.png
Oops, something went wrong.
Binary file modified
BIN
-28 Bytes
(97%)
...urces/assets/tconstruct/textures/models/armor/slime/layer_1_tconstruct_clay.png
Oops, something went wrong.
Binary file modified
BIN
-24 Bytes
(98%)
...assets/tconstruct/textures/models/armor/slime/layer_1_tconstruct_earthslime.png
Oops, something went wrong.
Binary file modified
BIN
-1 Byte
(100%)
...urces/assets/tconstruct/textures/models/armor/slime/layer_1_tconstruct_gold.png
Oops, something went wrong.
Binary file modified
BIN
-15 Bytes
(99%)
...rces/assets/tconstruct/textures/models/armor/slime/layer_1_tconstruct_honey.png
Oops, something went wrong.
Binary file modified
BIN
-10 Bytes
(99%)
...rces/assets/tconstruct/textures/models/armor/slime/layer_1_tconstruct_ichor.png
Oops, something went wrong.
Binary file added
BIN
+1.12 KB
...rces/assets/tconstruct/textures/models/armor/slime/layer_1_tconstruct_magma.png
Oops, something went wrong.
Binary file modified
BIN
-21 Bytes
(98%)
...s/assets/tconstruct/textures/models/armor/slime/layer_1_tconstruct_skyslime.png
Oops, something went wrong.
Binary file modified
BIN
-16 Bytes
(97%)
...urces/assets/tconstruct/textures/models/armor/slime/layer_2_tconstruct_clay.png
Oops, something went wrong.
Binary file modified
BIN
-39 Bytes
(94%)
...assets/tconstruct/textures/models/armor/slime/layer_2_tconstruct_earthslime.png
Oops, something went wrong.
Binary file modified
BIN
-11 Bytes
(98%)
...urces/assets/tconstruct/textures/models/armor/slime/layer_2_tconstruct_gold.png
Oops, something went wrong.
Binary file modified
BIN
-14 Bytes
(98%)
...rces/assets/tconstruct/textures/models/armor/slime/layer_2_tconstruct_honey.png
Oops, something went wrong.
Binary file modified
BIN
-8 Bytes
(99%)
...rces/assets/tconstruct/textures/models/armor/slime/layer_2_tconstruct_ichor.png
Oops, something went wrong.
Binary file added
BIN
+623 Bytes
...rces/assets/tconstruct/textures/models/armor/slime/layer_2_tconstruct_magma.png
Oops, something went wrong.
Binary file modified
BIN
-21 Bytes
(97%)
...s/assets/tconstruct/textures/models/armor/slime/layer_2_tconstruct_skyslime.png
Oops, something went wrong.
Binary file added
BIN
+535 Bytes
...ources/assets/tconstruct/textures/models/armor/slime/wings_tconstruct_magma.png
Oops, something went wrong.
46 changes: 46 additions & 0 deletions
46
src/generated/resources/assets/tconstruct/tinkering/materials/magma.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
{ | ||
"color": "652828", | ||
"generator": { | ||
"ignoreMaterialStats": false, | ||
"supportedStats": [ | ||
"tconstruct:slimesuit" | ||
], | ||
"transformer": { | ||
"type": "tconstruct:recolor_sprite", | ||
"color_mapping": { | ||
"type": "tconstruct:grey_to_color", | ||
"palette": [ | ||
{ | ||
"color": "FF000000", | ||
"grey": 0 | ||
}, | ||
{ | ||
"color": "FFCA4E06", | ||
"grey": 140 | ||
}, | ||
{ | ||
"color": "FFE66410", | ||
"grey": 155 | ||
}, | ||
{ | ||
"color": "FF411616", | ||
"grey": 170 | ||
}, | ||
{ | ||
"color": "FF501B1B", | ||
"grey": 193 | ||
}, | ||
{ | ||
"color": "FF652828", | ||
"grey": 216 | ||
}, | ||
{ | ||
"color": "FF411616", | ||
"grey": 236 | ||
} | ||
] | ||
} | ||
} | ||
}, | ||
"luminosity": 0 | ||
} |
22 changes: 22 additions & 0 deletions
22
...rated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_magma.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"type": "tconstruct:swappable_modifier", | ||
"allow_crystal": false, | ||
"inputs": [ | ||
{ | ||
"item": "minecraft:magma_block" | ||
}, | ||
{ | ||
"item": "minecraft:magma_cream" | ||
}, | ||
{ | ||
"item": "minecraft:magma_block" | ||
} | ||
], | ||
"result": { | ||
"name": "tconstruct:embellishment", | ||
"value": "tconstruct:magma" | ||
}, | ||
"tools": { | ||
"tag": "tconstruct:modifiable/embellishment/slime" | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
src/generated/resources/data/tconstruct/tinkering/materials/definition/blood.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"redirect": [ | ||
{ | ||
"id": "tconstruct:ichor" | ||
"id": "tconstruct:magma" | ||
} | ||
] | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/data/tconstruct/tinkering/materials/stats/magma.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"stats": {} | ||
} |
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/tconstruct/tinkering/materials/traits/magma.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+0 Bytes
(100%)
...ruct/textures/item/tool/armor/slime/boot_modifiers/tconstruct_embellishment.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...xtures/item/tool/armor/slime/boot_modifiers/tconstruct_embellishment_broken.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...uct/textures/item/tool/armor/slime/shell_modifiers/tconstruct_embellishment.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...tures/item/tool/armor/slime/shell_modifiers/tconstruct_embellishment_broken.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...uct/textures/item/tool/armor/slime/skull_modifiers/tconstruct_embellishment.png
Oops, something went wrong.
Binary file modified
BIN
-5 Bytes
(98%)
...tures/item/tool/armor/slime/skull_modifiers/tconstruct_embellishment_broken.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...uct/textures/item/tool/armor/slime/wings_modifiers/tconstruct_embellishment.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...tures/item/tool/armor/slime/wings_modifiers/tconstruct_embellishment_broken.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
src/main/resources/assets/tconstruct/textures/models/armor/slime/layer_1.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
src/main/resources/assets/tconstruct/textures/models/armor/slime/layer_2.png
Oops, something went wrong.