Changes

Summary

  1. Switch to loadable for handling the JSON parsing for generator sprites (details)
  2. Add support for animated textures to the material texture generator (details)
  3. Implement blazewood as a new shield core type (details)
  4. Add armor materials to the book (details)
  5. Stop material pages from showing composites from casting on themselves (details)
  6. Remove advancement unlocking of encyclopedia sections (details)
Commit da4f4dc3583f187ff2de6ebade240e3135a380d3 by KnightMiner
Switch to loadable for handling the JSON parsing for generator sprites

Nicer than JSON as I have control over default values. Took the opportunity to rename the fields to use snake case
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/data/material/AbstractPartSpriteProvider.java (diff)
The file was modifiedsrc/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/shared/client/ClientGeneratePartTexturesCommand.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/data/material/GeneratorPartTextureJsonGenerator.java (diff)
Commit 7a44b67a1f7f974d4ad226652e718e34f8b6799b by KnightMiner
Add support for animated textures to the material texture generator

The only thing that was really needed was mcmeta and the ability to disable animation on certain sprites, but since we want to use this also provided an implementation
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/data/spritetransformer/GreyToSpriteTransformer.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/data/spritetransformer/RecolorSpriteTransformer.java (diff)
The file was modifiedsrc/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/data/spritetransformer/ISpriteTransformer.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/shared/client/ClientGeneratePartTexturesCommand.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/data/material/AbstractPartSpriteProvider.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/data/material/MaterialPartTextureGenerator.java (diff)
The file was addedsrc/main/java/slimeknights/tconstruct/library/client/data/spritetransformer/AnimatedGreyToSpriteTransformer.java
Commit 521686d0a435e7a8e71b09a67bbfcbc74a8a8911 by KnightMiner
Implement blazewood as a new shield core type

To make its trait work, slot in charge module now tracks the total modifier level, given this is not the first case that wants a slot in charge of total level (need it for any non-composable formulas)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java (diff)
The file was addedsrc/generated/resources/assets/tconstruct/blockstates/blazewood_stairs.json
The file was removedsrc/main/resources/assets/tconstruct/textures/block/blazewood.png.mcmeta
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_broken_tconstruct_blazewood.png.mcmeta
The file was addedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/obsidian/nahuatl_fence.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java (diff)
The file was removedsrc/main/resources/assets/tconstruct/models/item/lavawood.json
The file was removedsrc/main/resources/assets/tconstruct/models/item/blazewood_slab.json
The file was addedsrc/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment/wood/blazewood.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/common/data/tags/MaterialTagProvider.java (diff)
The file was modifiedsrc/generated/resources/data/tconstruct/tags/blocks/planklike.json (diff)
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_large_tconstruct_blazewood.png
The file was removedsrc/main/resources/assets/tconstruct/models/item/blazewood_stairs.json
The file was removedsrc/main/resources/assets/tconstruct/textures/block/lavawood.png
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_tconstruct_blazewood.png
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/material/MaterialDataProvider.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/material/MaterialStatsDataProvider.java (diff)
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/stairs.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/staff/modifiers/tconstruct_embellishment_tconstruct_blazewood.png.mcmeta
The file was addedsrc/generated/resources/data/tconstruct/tinkering/materials/stats/blazewood.json
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/stairs_outer.json
The file was addedsrc/generated/resources/data/tconstruct/tinkering/materials/definition/blazewood.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/common/data/tags/BlockTagProvider.java (diff)
The file was removedsrc/main/resources/assets/tconstruct/blockstates/blazewood.json
The file was addedsrc/main/resources/assets/tconstruct/textures/block/wood/blazewood.png
The file was removedsrc/generated/resources/data/tconstruct/recipes/common/firewood/lavawood_slab.json
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/slab_top.json
The file was addedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/blazewood_stairs.json
The file was removedsrc/main/resources/assets/tconstruct/blockstates/blazewood_slab.json
The file was modifiedsrc/generated/resources/data/minecraft/tags/blocks/fences.json (diff)
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/travelers/shield_modifiers/tconstruct_embellishment_tconstruct_blazewood.png
The file was addedsrc/generated/resources/assets/tconstruct/blockstates/blazewood_slab.json
The file was removedsrc/main/resources/assets/tconstruct/models/item/lavawood_stairs.json
The file was addedsrc/generated/resources/data/tconstruct/recipes/common/firewood/blazewood_fence.json
The file was modifiedsrc/main/resources/assets/tconstruct/lang/en_us.json (diff)
The file was removedsrc/generated/resources/data/tconstruct/advancements/recipes/tconstruct/general/common/firewood/lavawood_stairs.json
The file was addedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/obsidian/nahuatl_slab.json
The file was modifiedsrc/generated/resources/data/minecraft/tags/blocks/mineable/axe.json (diff)
The file was modifiedsrc/generated/resources/data/tconstruct/tags/items/planklike.json (diff)
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_tconstruct_blazewood.png.mcmeta
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/stairs_inner.json
The file was addedsrc/generated/resources/assets/tconstruct/models/item/blazewood.json
The file was modifiedsrc/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json (diff)
The file was addedsrc/generated/resources/assets/tconstruct/tinkering/materials/blazewood.json
The file was addedsrc/generated/resources/assets/tconstruct/blockstates/blazewood.json
The file was removedsrc/main/resources/assets/tconstruct/blockstates/lavawood_slab.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_large_broken_tconstruct_blazewood.png
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/fence/side.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/shared/TinkerMaterials.java (diff)
The file was modifiedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/blazewood.json (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/material/MaterialRecipeProvider.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/material/MaterialIds.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/material/MaterialTraitsDataProvider.java (diff)
The file was removedsrc/main/resources/assets/tconstruct/models/item/lavawood_slab.json
The file was addedsrc/generated/resources/data/tconstruct/recipes/tools/materials/blazewood.json
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/planks.json
The file was addedsrc/generated/resources/data/tconstruct/tinkering/materials/traits/blazewood.json
The file was removedsrc/main/resources/assets/tconstruct/models/item/blazewood.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/travelers/shield_modifiers/broken/tconstruct_embellishment_tconstruct_blazewood.png.mcmeta
The file was removedsrc/generated/resources/data/tconstruct/advancements/recipes/tconstruct/general/common/firewood/lavawood_slab.json
The file was addedsrc/generated/resources/data/tconstruct/recipes/tools/materials/composite/blazewood.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/modifiers/traits/melee/ConductingModifier.java (diff)
The file was removedsrc/main/resources/assets/tconstruct/models/block/lavawood.json
The file was removedsrc/generated/resources/data/tconstruct/loot_tables/blocks/lavawood_stairs.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/staff/large_modifiers/tconstruct_embellishment_tconstruct_blazewood.png
The file was removedsrc/generated/resources/data/tconstruct/loot_tables/blocks/lavawood_slab.json
The file was addedsrc/main/resources/assets/tconstruct/textures/block/wood/lavawood.png
The file was removedsrc/main/resources/assets/tconstruct/models/block/blazewood.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/TConstruct.java (diff)
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/staff/modifiers/tconstruct_embellishment_tconstruct_blazewood.png
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerMaterialSpriteProvider.java (diff)
The file was addedsrc/generated/resources/assets/tconstruct/models/item/blazewood_slab.json
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/slab.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/material/MaterialRenderInfoProvider.java (diff)
The file was removedsrc/main/resources/assets/tconstruct/blockstates/lavawood.json
The file was addedsrc/generated/resources/assets/tconstruct/models/item/blazewood_stairs.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/shared/data/CommonRecipeProvider.java (diff)
The file was modifiedgradle.properties (diff)
The file was addedsrc/main/resources/assets/tconstruct/textures/block/wood/blazewood.png.mcmeta
The file was addedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/obsidian/nahuatl_stairs.json
The file was addedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/blazewood_slab.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_large_broken_tconstruct_blazewood.png.mcmeta
The file was removedsrc/main/resources/assets/tconstruct/blockstates/lavawood_stairs.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_large_tconstruct_blazewood.png.mcmeta
The file was modifiedsrc/main/java/slimeknights/tconstruct/smeltery/data/SmelteryRecipeProvider.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/common/data/model/TinkerBlockStateProvider.java (diff)
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/plate/shield/core_broken_tconstruct_blazewood.png
The file was addedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/blazewood_fence.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/staff/large_modifiers/tconstruct_embellishment_tconstruct_blazewood.png.mcmeta
The file was modifiedsrc/generated/resources/data/tconstruct/tinkering/tags/materials/nether.json (diff)
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/travelers/shield_modifiers/broken/tconstruct_embellishment_tconstruct_blazewood.png
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/modifiers/traits/melee/InsatiableModifier.java (diff)
The file was removedsrc/generated/resources/data/tconstruct/recipes/smeltery/casting/lavawood.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/common/data/loot/BlockLootTableProvider.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/modifiers/modules/unserializable/SlotInChargeModule.java (diff)
The file was addedsrc/generated/resources/assets/tconstruct/models/block/wood/blazewood/fence/post.json
The file was removedsrc/generated/resources/data/tconstruct/recipes/common/firewood/lavawood_stairs.json
The file was addedsrc/generated/resources/data/tconstruct/loot_tables/blocks/blazewood_fence.json
The file was modifiedsrc/main/resources/assets/tconstruct/mantle/colors.json (diff)
The file was addedsrc/generated/resources/data/tconstruct/advancements/recipes/tconstruct/general/common/firewood/blazewood_fence.json
The file was addedsrc/generated/resources/assets/tconstruct/textures/item/tool/armor/travelers/shield_modifiers/tconstruct_embellishment_tconstruct_blazewood.png.mcmeta
The file was modifiedsrc/main/java/slimeknights/tconstruct/shared/TinkerCommons.java (diff)
The file was addedsrc/generated/resources/assets/tconstruct/blockstates/blazewood_fence.json
The file was removedsrc/generated/resources/data/tconstruct/loot_tables/blocks/lavawood.json
The file was removedsrc/main/resources/assets/tconstruct/textures/block/blazewood.png
The file was modifiedsrc/generated/resources/data/tconstruct/advancements/tools/material_master.json (diff)
The file was addedsrc/generated/resources/assets/tconstruct/models/item/blazewood_fence.json
The file was removedsrc/main/resources/assets/tconstruct/blockstates/blazewood_stairs.json
Commit d80da3071ef4396f54a1fabc63bfe4a19a3fd7f7 by KnightMiner
Add armor materials to the book

Due to when you gain access to armor, and the fact that tier 1 is so weird, tier 1 is merged with tier 2 in puny melting
In the encyclopedia, all 4 tiers are in 1 section as we were starting to get too many sections. Ended up merging the melee/harvest and raged materials into single sections as well

As part of this commit, deleted the deprecated material section transformers from various books, no longer needed
In addition, cleaned up quite a bit of material page code, should make it a bit faster
The file was modifiedsrc/main/resources/assets/tconstruct/book/fantastic_foundry/en_us/language.lang (diff)
The file was removedsrc/main/java/slimeknights/tconstruct/library/client/book/content/ContentMaterial.java
The file was addedsrc/main/java/slimeknights/tconstruct/library/client/book/content/MeleeHarvestMaterialContent.java
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/book/content/AbstractMaterialContent.java (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/lang/en_us.json (diff)
The file was addedsrc/main/java/slimeknights/tconstruct/library/client/book/content/ArmorMaterialContent.java
The file was modifiedsrc/main/resources/assets/tconstruct/book/mighty_smelting/index.json (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/book/puny_smelting/en_us/language.lang (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/tools/helper/ToolBuildHandler.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/tools/stat/IToolStat.java (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/book/fantastic_foundry/index.json (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/book/puny_smelting/index.json (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/book/TinkerBook.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/tools/stat/FloatToolStat.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/book/sectiontransformer/materials/TierRangeMaterialSectionTransformer.java (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/book/encyclopedia/index.json (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/book/sectiontransformer/materials/AbstractMaterialSectionTransformer.java (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/book/mighty_smelting/en_us/language.lang (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/book/encyclopedia/en_us/language.lang (diff)
Commit 05e91a604d0e75fed4ef5e9acd4e7408d17c2535 by KnightMiner
Stop material pages from showing composites from casting on themselves

Couple of visual variants of iron and copper do this, its just confusing
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/client/book/content/AbstractMaterialContent.java (diff)
Commit 9cc0ae9ed9b1406238b7a29b6b582ef6f61414b3 by KnightMiner
Remove advancement unlocking of encyclopedia sections

With tool materials merge into a single section, only modifiers were left unlocking as tools were long since just always unlocked.
While it was a neat feature, it really did not add anything and its not worth keeping around for just modifiers.
The file was modifiedsrc/main/resources/assets/tconstruct/book/encyclopedia/index.json (diff)
The file was addedsrc/main/resources/assets/tconstruct/book/encyclopedia/en_us/intro/focus.json
The file was modifiedsrc/main/resources/assets/tconstruct/book/encyclopedia/sections/intro.json (diff)
The file was removedsrc/main/resources/assets/tconstruct/book/encyclopedia/en_us/intro/updates.json