Skip to content

Commit

Permalink
Add mangrove as a new wood variant
Browse files Browse the repository at this point in the history
  • Loading branch information
KnightMiner committed Apr 1, 2024
1 parent 76351a1 commit 3d07205
Show file tree
Hide file tree
Showing 133 changed files with 114 additions and 26 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,57 @@
{
"color": "7F4234",
"fallbacks": [
"wood",
"stick",
"primitive"
],
"generator": {
"ignoreMaterialStats": false,
"supportedStats": [
"tconstruct:head",
"tconstruct:handle",
"tconstruct:extra",
"tconstruct:repair_kit",
"tconstruct:limb",
"tconstruct:grip",
"tconstruct:wood"
],
"transformer": {
"type": "tconstruct:recolor_sprite",
"color_mapping": {
"type": "tconstruct:grey_to_color",
"palette": [
{
"color": "FF000000",
"grey": 0
},
{
"color": "FF5D1C1E",
"grey": 63
},
{
"color": "FF642423",
"grey": 102
},
{
"color": "FF6F2A2D",
"grey": 140
},
{
"color": "FF773934",
"grey": 178
},
{
"color": "FF7F4234",
"grey": 216
},
{
"color": "FF8B4D3A",
"grey": 255
}
]
}
}
},
"luminosity": 0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "tconstruct:material",
"ingredient": {
"tag": "minecraft:mangrove_logs"
},
"leftover": "minecraft:mangrove_planks",
"material": "tconstruct:wood#mangrove",
"needed": 1,
"value": 4
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "tconstruct:material",
"ingredient": {
"item": "minecraft:mangrove_planks"
},
"material": "tconstruct:wood#mangrove",
"needed": 1,
"value": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"#minecraft:jungle_logs",
"#minecraft:dark_oak_logs",
"#minecraft:acacia_logs",
"#minecraft:mangrove_logs",
"#minecraft:crimson_stems",
"#minecraft:warped_stems",
"#tconstruct:slimy_logs"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"minecraft:jungle_planks",
"minecraft:dark_oak_planks",
"minecraft:acacia_planks",
"minecraft:mangrove_planks",
"minecraft:crimson_planks",
"minecraft:warped_planks",
"#tconstruct:slimy_planks"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ private void addTools() {
Items.BROWN_SHULKER_BOX, Items.GREEN_SHULKER_BOX, Items.RED_SHULKER_BOX, Items.BLACK_SHULKER_BOX);

this.tag(TinkerTags.Items.VARIANT_PLANKS)
.add(Items.OAK_PLANKS, Items.SPRUCE_PLANKS, Items.BIRCH_PLANKS, Items.JUNGLE_PLANKS, Items.DARK_OAK_PLANKS, Items.ACACIA_PLANKS, Items.CRIMSON_PLANKS, Items.WARPED_PLANKS)
.add(Items.OAK_PLANKS, Items.SPRUCE_PLANKS, Items.BIRCH_PLANKS, Items.JUNGLE_PLANKS, Items.DARK_OAK_PLANKS, Items.ACACIA_PLANKS, Items.MANGROVE_PLANKS, Items.CRIMSON_PLANKS, Items.WARPED_PLANKS)
.addTag(TinkerTags.Items.SLIMY_PLANKS);
this.tag(TinkerTags.Items.VARIANT_LOGS).addTags(ItemTags.OAK_LOGS, ItemTags.SPRUCE_LOGS, ItemTags.BIRCH_LOGS, ItemTags.JUNGLE_LOGS, ItemTags.DARK_OAK_LOGS, ItemTags.ACACIA_LOGS, ItemTags.CRIMSON_STEMS, ItemTags.WARPED_STEMS, TinkerTags.Items.SLIMY_LOGS);
this.tag(TinkerTags.Items.VARIANT_LOGS).addTags(ItemTags.OAK_LOGS, ItemTags.SPRUCE_LOGS, ItemTags.BIRCH_LOGS, ItemTags.JUNGLE_LOGS, ItemTags.DARK_OAK_LOGS, ItemTags.ACACIA_LOGS, ItemTags.MANGROVE_LOGS, ItemTags.CRIMSON_STEMS, ItemTags.WARPED_STEMS, TinkerTags.Items.SLIMY_LOGS);

// part builder
this.tag(TinkerTags.Items.DEFAULT_PATTERNS).add(TinkerTables.pattern.get());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ public final class MaterialIds {
*/
public static final MaterialVariantId basalt = create(flint, "basalt");
// wood
public static final MaterialVariantId oak = create(wood, "oak");
public static final MaterialVariantId spruce = create(wood, "spruce");
public static final MaterialVariantId birch = create(wood, "birch");
public static final MaterialVariantId jungle = create(wood, "jungle");
public static final MaterialVariantId acacia = create(wood, "acacia");
public static final MaterialVariantId darkOak = create(wood, "dark_oak");
public static final MaterialVariantId crimson = create(wood, "crimson");
public static final MaterialVariantId warped = create(wood, "warped");
public static final MaterialVariantId oak = create(wood, "oak");
public static final MaterialVariantId spruce = create(wood, "spruce");
public static final MaterialVariantId birch = create(wood, "birch");
public static final MaterialVariantId jungle = create(wood, "jungle");
public static final MaterialVariantId acacia = create(wood, "acacia");
public static final MaterialVariantId darkOak = create(wood, "dark_oak");
public static final MaterialVariantId mangrove = create(wood, "mangrove");
public static final MaterialVariantId crimson = create(wood, "crimson");
public static final MaterialVariantId warped = create(wood, "warped");
// stone
public static final MaterialVariantId stone = create(rock, "stone");
public static final MaterialVariantId andesite = create(rock, "andesite");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,27 @@ private void addMaterialItems(Consumer<FinishedRecipe> consumer) {
materialRecipe(consumer, MaterialIds.wood, Ingredient.of(Tags.Items.RODS_WOODEN), 1, 2, folder + "wood/sticks");
materialRecipe(consumer, MaterialIds.bamboo, Ingredient.of(Items.BAMBOO), 1, 4, folder + "wood/bamboo");
// planks
materialRecipe(consumer, MaterialIds.oak, Ingredient.of(Items.OAK_PLANKS), 1, 1, folder + "wood/planks/oak");
materialRecipe(consumer, MaterialIds.spruce, Ingredient.of(Items.SPRUCE_PLANKS), 1, 1, folder + "wood/planks/spruce");
materialRecipe(consumer, MaterialIds.birch, Ingredient.of(Items.BIRCH_PLANKS), 1, 1, folder + "wood/planks/birch");
materialRecipe(consumer, MaterialIds.jungle, Ingredient.of(Items.JUNGLE_PLANKS), 1, 1, folder + "wood/planks/jungle");
materialRecipe(consumer, MaterialIds.darkOak, Ingredient.of(Items.DARK_OAK_PLANKS), 1, 1, folder + "wood/planks/dark_oak");
materialRecipe(consumer, MaterialIds.acacia, Ingredient.of(Items.ACACIA_PLANKS), 1, 1, folder + "wood/planks/acacia");
materialRecipe(consumer, MaterialIds.crimson, Ingredient.of(Items.CRIMSON_PLANKS), 1, 1, folder + "wood/planks/crimson");
materialRecipe(consumer, MaterialIds.warped, Ingredient.of(Items.WARPED_PLANKS), 1, 1, folder + "wood/planks/warped");
materialRecipe(consumer, MaterialIds.oak, Ingredient.of(Items.OAK_PLANKS), 1, 1, folder + "wood/planks/oak");
materialRecipe(consumer, MaterialIds.spruce, Ingredient.of(Items.SPRUCE_PLANKS), 1, 1, folder + "wood/planks/spruce");
materialRecipe(consumer, MaterialIds.birch, Ingredient.of(Items.BIRCH_PLANKS), 1, 1, folder + "wood/planks/birch");
materialRecipe(consumer, MaterialIds.jungle, Ingredient.of(Items.JUNGLE_PLANKS), 1, 1, folder + "wood/planks/jungle");
materialRecipe(consumer, MaterialIds.darkOak, Ingredient.of(Items.DARK_OAK_PLANKS), 1, 1, folder + "wood/planks/dark_oak");
materialRecipe(consumer, MaterialIds.acacia, Ingredient.of(Items.ACACIA_PLANKS), 1, 1, folder + "wood/planks/acacia");
materialRecipe(consumer, MaterialIds.mangrove, Ingredient.of(Items.MANGROVE_PLANKS), 1, 1, folder + "wood/planks/mangrove");
materialRecipe(consumer, MaterialIds.crimson, Ingredient.of(Items.CRIMSON_PLANKS), 1, 1, folder + "wood/planks/crimson");
materialRecipe(consumer, MaterialIds.warped, Ingredient.of(Items.WARPED_PLANKS), 1, 1, folder + "wood/planks/warped");
materialRecipe(withCondition(consumer, TagDifferencePresentCondition.ofKeys(ItemTags.PLANKS, TinkerTags.Items.VARIANT_PLANKS)), MaterialIds.wood,
DifferenceIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(TinkerTags.Items.VARIANT_PLANKS)), 1, 1, folder + "wood/planks/default");
// logs
materialRecipe(consumer, MaterialIds.oak, Ingredient.of(ItemTags.OAK_LOGS), 4, 1, ItemOutput.fromItem(Blocks.OAK_PLANKS), folder + "wood/logs/oak");
materialRecipe(consumer, MaterialIds.spruce, Ingredient.of(ItemTags.SPRUCE_LOGS), 4, 1, ItemOutput.fromItem(Blocks.SPRUCE_PLANKS), folder + "wood/logs/spruce");
materialRecipe(consumer, MaterialIds.birch, Ingredient.of(ItemTags.BIRCH_LOGS), 4, 1, ItemOutput.fromItem(Blocks.BIRCH_PLANKS), folder + "wood/logs/birch");
materialRecipe(consumer, MaterialIds.jungle, Ingredient.of(ItemTags.JUNGLE_LOGS), 4, 1, ItemOutput.fromItem(Blocks.JUNGLE_PLANKS), folder + "wood/logs/jungle");
materialRecipe(consumer, MaterialIds.darkOak, Ingredient.of(ItemTags.DARK_OAK_LOGS), 4, 1, ItemOutput.fromItem(Blocks.DARK_OAK_PLANKS), folder + "wood/logs/dark_oak");
materialRecipe(consumer, MaterialIds.acacia, Ingredient.of(ItemTags.ACACIA_LOGS), 4, 1, ItemOutput.fromItem(Blocks.ACACIA_PLANKS), folder + "wood/logs/acacia");
materialRecipe(consumer, MaterialIds.crimson, Ingredient.of(ItemTags.CRIMSON_STEMS), 4, 1, ItemOutput.fromItem(Blocks.CRIMSON_PLANKS), folder + "wood/logs/crimson");
materialRecipe(consumer, MaterialIds.warped, Ingredient.of(ItemTags.WARPED_STEMS), 4, 1, ItemOutput.fromItem(Blocks.WARPED_PLANKS), folder + "wood/logs/warped");
materialRecipe(consumer, MaterialIds.oak, Ingredient.of(ItemTags.OAK_LOGS), 4, 1, ItemOutput.fromItem(Blocks.OAK_PLANKS), folder + "wood/logs/oak");
materialRecipe(consumer, MaterialIds.spruce, Ingredient.of(ItemTags.SPRUCE_LOGS), 4, 1, ItemOutput.fromItem(Blocks.SPRUCE_PLANKS), folder + "wood/logs/spruce");
materialRecipe(consumer, MaterialIds.birch, Ingredient.of(ItemTags.BIRCH_LOGS), 4, 1, ItemOutput.fromItem(Blocks.BIRCH_PLANKS), folder + "wood/logs/birch");
materialRecipe(consumer, MaterialIds.jungle, Ingredient.of(ItemTags.JUNGLE_LOGS), 4, 1, ItemOutput.fromItem(Blocks.JUNGLE_PLANKS), folder + "wood/logs/jungle");
materialRecipe(consumer, MaterialIds.darkOak, Ingredient.of(ItemTags.DARK_OAK_LOGS), 4, 1, ItemOutput.fromItem(Blocks.DARK_OAK_PLANKS), folder + "wood/logs/dark_oak");
materialRecipe(consumer, MaterialIds.acacia, Ingredient.of(ItemTags.ACACIA_LOGS), 4, 1, ItemOutput.fromItem(Blocks.ACACIA_PLANKS), folder + "wood/logs/acacia");
materialRecipe(consumer, MaterialIds.mangrove, Ingredient.of(ItemTags.MANGROVE_LOGS), 4, 1, ItemOutput.fromItem(Blocks.MANGROVE_PLANKS), folder + "wood/logs/mangrove");
materialRecipe(consumer, MaterialIds.crimson, Ingredient.of(ItemTags.CRIMSON_STEMS), 4, 1, ItemOutput.fromItem(Blocks.CRIMSON_PLANKS), folder + "wood/logs/crimson");
materialRecipe(consumer, MaterialIds.warped, Ingredient.of(ItemTags.WARPED_STEMS), 4, 1, ItemOutput.fromItem(Blocks.WARPED_PLANKS), folder + "wood/logs/warped");
materialRecipe(withCondition(consumer, TagDifferencePresentCondition.ofKeys(ItemTags.LOGS, TinkerTags.Items.VARIANT_LOGS)), MaterialIds.wood,
DifferenceIngredient.of(Ingredient.of(ItemTags.LOGS), Ingredient.of(TinkerTags.Items.VARIANT_LOGS)), 4, 1,
ItemOutput.fromItem(Items.STICK, 2), folder + "wood/logs/default");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ protected void addMaterialRenderInfo() {
buildRenderInfo(MaterialIds.jungle);
buildRenderInfo(MaterialIds.darkOak);
buildRenderInfo(MaterialIds.acacia);
buildRenderInfo(MaterialIds.mangrove);
buildRenderInfo(MaterialIds.crimson);
buildRenderInfo(MaterialIds.warped);
buildRenderInfo(MaterialIds.bamboo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ protected void addAllMaterials() {
.meleeHarvest().ranged()
.fallbacks("wood", "stick", "primitive")
.colorMapper(GreyToColorMapping.builderFromBlack().addARGB(63, 0xFF504B40).addARGB(102, 0xFF585349).addARGB(140, 0xFF696259).addARGB(178, 0xFF7B7368).addARGB(216, 0xFF8D8477).addARGB(255, 0xFF998F82).build());
buildMaterial(MaterialIds.mangrove)
.meleeHarvest().ranged()
.fallbacks("wood", "stick", "primitive")
.colorMapper(GreyToColorMapping.builderFromBlack().addARGB(63, 0xFF5D1C1E).addARGB(102, 0xFF642423).addARGB(140, 0xFF6F2A2D).addARGB(178, 0xFF773934).addARGB(216, 0xFF7F4234).addARGB(255, 0xFF8B4D3A).build());
buildMaterial(MaterialIds.crimson)
.meleeHarvest().ranged()
.fallbacks("wood", "stick", "primitive")
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 @@ -1412,6 +1412,7 @@
"material.tconstruct.wood.jungle": "Jungle Wood",
"material.tconstruct.wood.acacia": "Acacia Wood",
"material.tconstruct.wood.dark_oak": "Dark Oak Wood",
"material.tconstruct.wood.mangrove": "Mangrove Wood",
"material.tconstruct.wood.crimson": "Crimson Hyphae",
"material.tconstruct.wood.warped": "Warped Hyphae",
"material.tconstruct.wood.format": "Wooden %s",
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/tconstruct/mantle/colors.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@
"wood.birch": "#C8B77A",
"wood.jungle": "#AA7954",
"wood.dark_oak": "#492F17",
"wood.mangrove": "#7F4234",
"wood.acacia": "#AD5D32",
"wood.crimson": "#6A344B",
"wood.warped": "#287067",
Expand Down

0 comments on commit 3d07205

Please sign in to comment.