Skip to content

Commit

Permalink
Add magma embellishment
Browse files Browse the repository at this point in the history
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
KnightMiner committed Mar 17, 2024
1 parent b514f12 commit 2a73e6c
Show file tree
Hide file tree
Showing 94 changed files with 87 additions and 2 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
}
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"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"redirect": [
{
"id": "tconstruct:ichor"
"id": "tconstruct:magma"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"stats": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
Expand Up @@ -1646,6 +1646,10 @@ private void addTextureRecipes(Consumer<FinishedRecipe> consumer) {
.setTools(TinkerTags.Items.EMBELLISHMENT_SLIME)
.addInput(Blocks.CLAY).addInput(Items.CLAY_BALL).addInput(Blocks.CLAY)
.save(consumer, wrap(TinkerModifiers.embellishment, folder, "_clay"));
SwappableModifierRecipeBuilder.modifier(TinkerModifiers.embellishment, MaterialIds.magma.toString())
.setTools(TinkerTags.Items.EMBELLISHMENT_SLIME)
.addInput(Blocks.MAGMA_BLOCK).addInput(Items.MAGMA_CREAM).addInput(Blocks.MAGMA_BLOCK)
.save(consumer, wrap(TinkerModifiers.embellishment, folder, "_magma"));
SwappableModifierRecipeBuilder.modifier(TinkerModifiers.embellishment, MaterialIds.honey.toString())
.setTools(TinkerTags.Items.EMBELLISHMENT_SLIME)
.addInput(Blocks.HONEY_BLOCK).addInput(Items.HONEY_BOTTLE).addInput(Blocks.HONEY_BLOCK)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ protected void addMaterials() {
// slimesuit - textures
addMaterial(MaterialIds.earthslime, 1, ORDER_REPAIR, true);
addMaterial(MaterialIds.skyslime, 1, ORDER_REPAIR, true);
addMaterial(MaterialIds.magma, 2, ORDER_REPAIR, true);
addMaterial(MaterialIds.ichor, 3, ORDER_REPAIR, true);
addMaterial(MaterialIds.enderslime, 4, ORDER_REPAIR, true);
addMaterial(MaterialIds.clay, 1, ORDER_REPAIR, true);
Expand All @@ -114,6 +115,6 @@ protected void addMaterials() {
// slimesuit - repair
addMaterial(MaterialIds.phantom, 1, ORDER_REPAIR, true);

addRedirect(new MaterialId(TConstruct.MOD_ID, "blood"), redirect(MaterialIds.ichor));
addRedirect(new MaterialId(TConstruct.MOD_ID, "blood"), redirect(MaterialIds.magma));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public final class MaterialIds {
public static final MaterialId earthslime = id("earthslime");
public static final MaterialId skyslime = id("skyslime");
public static final MaterialId ichor = id("ichor");
public static final MaterialId magma = id("magma");
public static final MaterialId clay = id("clay");
public static final MaterialId honey = id("honey");
//public static final MaterialId venom = id("venom");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ protected void addMaterialRenderInfo() {
// slimesuit
buildRenderInfo(MaterialIds.earthslime);
buildRenderInfo(MaterialIds.skyslime);
buildRenderInfo(MaterialIds.magma);
buildRenderInfo(MaterialIds.ichor);
buildRenderInfo(MaterialIds.enderslime);
buildRenderInfo(MaterialIds.clay);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ private void addMisc() {
addMaterialStats(MaterialIds.netherite);
addMaterialStats(MaterialIds.earthslime);
addMaterialStats(MaterialIds.skyslime);
addMaterialStats(MaterialIds.magma);
addMaterialStats(MaterialIds.ichor);
addMaterialStats(MaterialIds.clay);
addMaterialStats(MaterialIds.honey);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ protected void addMaterialTraits() {
// slimesuit
noTraits(MaterialIds.earthslime);
noTraits(MaterialIds.skyslime);
noTraits(MaterialIds.magma);
noTraits(MaterialIds.ichor);
noTraits(MaterialIds.enderslime);
noTraits(MaterialIds.clay);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,9 @@ protected void addAllMaterials() {
buildMaterial(MaterialIds.skyslime)
.statType(TinkerPartSpriteProvider.SLIMESUIT)
.colorMapper(GreyToColorMapping.builderFromBlack().addARGB(63, 0xFF2F5351).addARGB(102, 0xFF3B6D6D).addARGB(140, 0xFF49807E).addARGB(178, 0xFF63ACAB).addARGB(216, 0xFF82D7D5).addARGB(255, 0xFFFFFFFF).build());
buildMaterial(MaterialIds.magma) // note the non-standard grey values, as we are targeting the slime armor directly
.statType(TinkerPartSpriteProvider.SLIMESUIT)
.colorMapper(GreyToColorMapping.builderFromBlack().addARGB(140, 0xFFCA4E06).addARGB(155, 0xFFE66410).addARGB(170, 0xFF411616).addARGB(193, 0xFF501B1B).addARGB(216, 0xFF652828).addARGB(236, 0xFF411616).build());
buildMaterial(MaterialIds.ichor)
.statType(TinkerPartSpriteProvider.SLIMESUIT)
.colorMapper(GreyToColorMapping.builderFromBlack().addARGB(63, 0xFFB04000).addARGB(102, 0xFFD35200).addARGB(140, 0xFFEC5E00).addARGB(178, 0xFFFF8324).addARGB(216, 0xFFFFB97C).addARGB(255, 0xFFFFFFFF).build());
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/tconstruct/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1593,6 +1593,7 @@
"material.tconstruct.netherite": "Netherite",
"material.tconstruct.earthslime": "Earthslime",
"material.tconstruct.skyslime": "Skyslime",
"material.tconstruct.magma": "Magma",
"material.tconstruct.ichor": "Ichor",
"material.tconstruct.enderslime": "Enderslime",
"material.tconstruct.clay": "Clay",
Expand Down

0 comments on commit 2a73e6c

Please sign in to comment.