Changes

Summary

  1. Added conditional mining speed modifier and on fire condition (details)
  2. Split haste into two modifiers (details)
  3. Fix modifier entry matching wrongly (details)
Commit 1f03c00b1f8e60ef56130c0b5c5369f2073f3b9a by KnightMiner
Added conditional mining speed modifier and on fire condition

Scorching was a conditional damage boost that was not yet implemented
Lustrous and crumbling are both conditional mining speed using block predicates
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/json/predicate/entity/LivingEntityPredicate.java (diff)
The file was addedsrc/generated/resources/data/tconstruct/tinkering/modifiers/crumbling.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/ModifierProvider.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/shared/TinkerCommons.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/material/MaterialTraitsDataProvider.java (diff)
The file was removedsrc/main/java/slimeknights/tconstruct/tools/modifiers/traits/melee/LevelDamageModifier.java
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/json/predicate/block/BlockPredicate.java (diff)
The file was removedsrc/main/java/slimeknights/tconstruct/tools/modifiers/traits/melee/ScorchingModifier.java
The file was removedsrc/main/java/slimeknights/tconstruct/tools/modifiers/traits/harvest/CrumblingModifier.java
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/ModifierIds.java (diff)
The file was addedsrc/generated/resources/data/tconstruct/tinkering/modifiers/lustrous.json
The file was removedsrc/main/java/slimeknights/tconstruct/tools/modifiers/traits/harvest/LustrousModifier.java
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/json/predicate/NestedJsonPredicateLoader.java (diff)
The file was addedsrc/main/java/slimeknights/tconstruct/library/modifiers/dynamic/ConditionalMiningSpeedModifier.java
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java (diff)
The file was addedsrc/generated/resources/data/tconstruct/tinkering/modifiers/scorching.json
Commit 4c9763a1c0a78ff5340c2548fe11fa2272c1f1a5 by KnightMiner
Split haste into two modifiers

One for armor and one for tools, the tool one is now defined in JSON
May move the armor one to JSON later, but figured I'd need a special serializer for it anyways, might as well keep it simple
The file was addedsrc/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/haste_armor_from_dust.json
The file was modifiedsrc/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/harvest/haste.json (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/book/puny_smelting/sections/upgrades.json (diff)
The file was addedsrc/generated/resources/data/tconstruct/tinkering/modifiers/haste.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/ModifierProvider.java (diff)
The file was modifiedsrc/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/haste_from_block.json (diff)
The file was addedsrc/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/haste.json
The file was modifiedsrc/main/resources/assets/tconstruct/lang/en_us.json (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java (diff)
The file was addedsrc/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/haste_armor.json
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/logic/ToolEvents.java (diff)
The file was modifiedsrc/main/resources/assets/tconstruct/tinkering/colors.json (diff)
The file was modifiedsrc/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/haste_from_dust.json (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/modifiers/Modifier.java (diff)
The file was modifiedsrc/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java (diff)
The file was addedsrc/main/resources/assets/tconstruct/book/puny_smelting/en_us/upgrades/armor/haste.json
The file was addedsrc/main/java/slimeknights/tconstruct/tools/modifiers/upgrades/armor/HasteArmorModifier.java
The file was addedsrc/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/haste_armor_from_block.json
The file was removedsrc/main/java/slimeknights/tconstruct/tools/modifiers/upgrades/harvest/HasteModifier.java
The file was modifiedsrc/main/resources/assets/tconstruct/book/encyclopedia/sections/upgrades.json (diff)
The file was modifiedsrc/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/speedy_from_block.json (diff)
Commit b3cc745df6f7c8f2e34273a1e4ca8bc4ba808dc2 by KnightMiner
Fix modifier entry matching wrongly
The file was modifiedsrc/main/java/slimeknights/tconstruct/library/modifiers/ModifierEntry.java (diff)