|
| src/main/java/slimeknights/tconstruct/library/tools/definition/aoe/BoxAOEIterator.java (diff) |
| gradle.properties (diff) |
| src/main/java/slimeknights/tconstruct/plugin/jsonthings/FlexItemTypes.java (diff) |
Commit
63fa80154a945c2299d9595c07e9c2b7ca07d124
by KnightMinerTake advantage of loadables to reduce code for modifier module loaders, variables, and predicates
IdParser is now a loadable for the relevant resource location variant IntRange is now a loadable for IntRange, it had a weird loading more of itself behavior going already In addition to those two, added loadables for: SlotType, LevelingValue, RandomLevelingValue, ModifierEntry, SlotType, IToolStat, INumericToolStat, TagKey<Modifier>, MaterialVariantId, plus various enums
As part of this change, variable formulas now store "percent" as a field inside as it made it made it require less context shenanigans for parsing. Since we always want it for the tooltip anyways, does not hurt to place in that interface. They also are far simplier in other ways, notably all the loading logic was moved to a loadable.
|
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/EntityLightVariable.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/venombone.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/ConditionalEntityVariable.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/cooling.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/modifiers/traits/skull/StrongBonesModifier.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/TagModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/harvest/ModifiedHarvestLogic.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/darkthread.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/tool/ToolStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/stat/ToolStats.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/block/StatePropertyVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/IncrementalModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/scorching.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableLoaderRegistry.java (diff) |
| src/generated/resources/data/tconstruct/recipes/smeltery/casting/water/lingering.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/ModifierEntry.java (diff) |
| src/generated/resources/data/tconstruct/advancements/world/slimeskull.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/block/ConditionalBlockVariable.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/bane_of_sssss.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/IntRange.java (diff) |
| src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_water.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/melee/ToolMeleeVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/MeleeAttributeModule.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/iron.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/ToolConditionalStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ShowOffhandModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/repairing/ModifierMaterialRepairSerializer.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/StatInRangePredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/SlotTypeModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/ItemToolPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/aoe/FallbackAOEIterator.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/copper.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/CureOnRemovalModule.java |
| src/generated/resources/data/tconstruct/recipes/smeltery/casting/water/splash.json (diff) |
| src/main/java/slimeknights/tconstruct/library/client/model/tools/ToolModel.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/ModifierTraitModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/MobEffectModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ConditionalStatModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/ToolDefinitionLoader.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/EntityMiningSpeedVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/NestedFallbackLoader.java |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/ModifierSlotModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/BlockDamageSourceModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/BlockLightVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/ConditionalMeleeDamageModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/VolatileFlagModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableFormula.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/pierce.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/melee/MeleeFormula.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/mining/ConditionalMiningSpeedModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/repairing/SpecializedRepairRecipeSerializer.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/necrotic_bone.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/sticky.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/SetStatModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/AttributeEntityVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/SlotType.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/ConditionalStatFormula.java (diff) |
| src/main/java/slimeknights/tconstruct/library/utils/Util.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/tool/ConditionalToolVariable.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/killager.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ToolActionsModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/LootingModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/util/ModuleWithKey.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/pig_iron.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/gold.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/ToolActionWalkerTransformModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/unserializable/CureOnRemovalModule.java |
| src/main/java/slimeknights/tconstruct/library/json/RandomLevelingValue.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/KnockbackModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasMaterialPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/ConditionalVariable.java |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ToolActionTransformModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/CoverGroundWalkerModule.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rotten_flesh.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/MobDisguiseModule.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/glass.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/fluid/TankCapacityModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/math/FormulaLoadable.java |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/MiningSpeedFormula.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/StatBoostModule.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/ender_pearl.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/EnchantmentModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/RepairModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/antiaquatic.json (diff) |
| src/main/java/slimeknights/tconstruct/library/data/material/AbstractMaterialTraitDataProvider.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/ToolMiningSpeedVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/ToFloatFunction.java (diff) |
| src/main/java/slimeknights/tconstruct/library/utils/JsonUtils.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ReduceToolDamageModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/repairing/ModifierRepairRecipeSerializer.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/BlockMiningSpeedVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/materials/traits/MaterialTraitsManager.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/AttributeModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/modifiers/ModifierSalvage.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/SingleModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/utils/IdParser.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/ConditionalVariableLoader.java |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/StatInSetPredicate.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/blazing_bone.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/melee/EntityMeleeVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/display/DurabilityBarColorModule.java (diff) |
| src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_lingering_water.json (diff) |
| src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_splash_water.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/EntityConditionalStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/RarityModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/LevelingValue.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/TinkerLoadables.java |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/EntityEffectLevelVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/SwappableSlotModule.java (diff) |
| src/generated/resources/data/tconstruct/recipes/smeltery/casting/water/bottle.json (diff) |
| src/main/java/slimeknights/tconstruct/library/materials/definition/MaterialVariantId.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/ProtectionModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/IntLevelModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/ModifierModuleCondition.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasStatTypePredicate.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/antitoxin.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rose_gold.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/SwappableModifierRecipe.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/module/IToolModule.java (diff) |
| gradle.properties (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableFormulaLoadable.java |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ExtinguishCampfireModule.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/bone.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/raging.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/string.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/ReplaceBlockWalkerModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/smite.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/fluid/TankModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/FormulaModuleLoader.java |
|
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/ModifierModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/ConditionalStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/StatInRangePredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/weapon/IWeaponAttack.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasMaterialPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/EntityVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/ModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/harvest/IHarvestLogic.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasStatTypePredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/ConditionalVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/SingleModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/util/ModifierLevelDisplay.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/block/BlockVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/melee/MeleeVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableFormulaLoadable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/ItemToolPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/aoe/IAreaOfEffectIterator.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/module/IToolModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/Modifier.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/StatInSetPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/tool/ToolVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/ToolContextPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableFormula.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableLoaderRegistry.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/MiningSpeedVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasModifierPredicate.java (diff) |
|
| src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/remove_modifier_sponge.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/recipe/EnchantmentConvertingRecipe.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/knockback.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/luck.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/ItemToolPredicate.java |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/extract_dagger_modifier_breath.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/invisible_ink_removing.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/enchantment_converting/slotless_tool.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/looting.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/recipe/ModifierRemovalRecipe.java (diff) |
| src/generated/resources/data/tconstruct/advancements/tools/upgrade_slots.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/enchantment_converting/unenchant_tool.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java (diff) |
| src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java (diff) |
| src/main/java/slimeknights/tconstruct/tools/data/ModifierProvider.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/ModifierModuleCondition.java (diff) |
| src/generated/resources/data/tconstruct/advancements/world/slimeskull.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/extract_modifier_breath.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/fortune.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/worktable/ModifierSetWorktableRecipe.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/extract_modifier_sponge.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/silky.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/extract_dagger_modifier_sponge.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableLoaderRegistry.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/worktable/ModifierSetWorktableRecipeBuilder.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/turtle_shell.json (diff) |
| src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/ToolContextPredicate.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/enchantment_converting/unenchant_book.json (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/harvest/ModifiedHarvestLogic.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/invisible_ink_adding.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/ModifierPredicate.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/remove_modifier_venom.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/diamond.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/TinkerTools.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/modifiers/worktable/enchantment_converting/slotless_book.json (diff) |
|
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableLoaderRegistry.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/MiningSpeedVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/aoe/IAreaOfEffectIterator.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/ConditionalStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/ModifierModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/module/IToolModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/block/BlockVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/harvest/IHarvestLogic.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/melee/MeleeVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/ModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/util/ModifierLevelDisplay.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/ToolContextPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/tool/ToolVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/EntityVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/ModifierManager.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/weapon/IWeaponAttack.java (diff) |
|
| src/main/java/slimeknights/tconstruct/library/modifiers/spilling/UpdateSpillingFluidsPacket.java (diff) |
|
| src/main/java/slimeknights/tconstruct/library/modifiers/dynamic/InventoryMenuModifier.java (diff) |
Commit
33f6a59a1c944123a2e51f5edc7f33f451e5a25f
by KnightMinerTake advantage of the new version of IHaveLoader to merge some variable loaders
Tool variables now autoamtically work in all of the main three variable types, and we will register them to the relevant types automatically Conditional stat variables now automatically work as mining speed variables, and will register to it automatically
|
| src/generated/resources/data/tconstruct/tinkering/modifiers/maintained.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/melee/ToolMeleeVariable.java |
| src/main/java/slimeknights/tconstruct/tools/data/ModifierProvider.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/ConditionalStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/EntityMiningSpeedVariable.java |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/ToolMiningSpeedVariable.java |
| src/main/java/slimeknights/tconstruct/library/json/variable/tool/ToolVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/ToolConditionalStatVariable.java |
| src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java (diff) |
|
| src/generated/resources/data/tconstruct/tinkering/modifiers/feather_falling.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/pierce.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/ModifierSlotModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ConditionalStatModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/StatInRangePredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/tool/ToolStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/TagModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/ModifierEntry.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/module/interaction/PreferenceSetInteraction.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/block/StatePropertyVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/MobDisguiseModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/killager.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/StatInSetPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/aoe/BoxAOEIterator.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/EntityLightVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/SwappableSlotModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/airborne.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/antitoxin.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/BlockMiningSpeedVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ToolActionsModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/EnchantmentModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/ConditionalVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/ModifierModuleCondition.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/VolatileFlagModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/CoverGroundWalkerModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/MeleeAttributeModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/bane_of_sssss.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/MobEffectModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/repairing/ModifierMaterialRepairSerializer.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/antiaquatic.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/protection.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/smite.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/dynamic/InventoryMenuModifier.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/padded.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/KnockbackModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/dynamic/ComposableModifier.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/spilling/effects/ConditionalSpillingEffect.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/raging.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/AttributeModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/SetStatModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/ProtectionModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/mining/ConditionalMiningSpeedModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/SwappableModifierRecipe.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasMaterialPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/LootingModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/combat/ConditionalMeleeDamageModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/modifiers/severing/SeveringRecipe.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/repairing/ModifierRepairRecipeSerializer.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/hydraulic.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/modifier/SingleModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ShowOffhandModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/behavior/ToolActionTransformModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/display/DurabilityBarColorModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/modifiers/severing/SeveringRecipeBuilder.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/AttributeEntityVariable.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/looting.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/sticky.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/ToolActionWalkerTransformModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/fire_protection.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/cooling.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/recipe/EnchantmentConvertingRecipe.java (diff) |
| src/main/java/slimeknights/tconstruct/tools/recipe/ModifierRemovalRecipe.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/blasting.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasModifierPredicate.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/HasStatTypePredicate.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/silky.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/RarityModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/stat/EntityConditionalStatVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/ToolStackItemPredicate.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/knockback.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/melee/EntityMeleeVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/RandomLevelingValue.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/crumbling.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/repairing/SpecializedRepairRecipeSerializer.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/ModifierTraitModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/aoe/FallbackAOEIterator.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/modifiers/ModifierSalvage.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/luck.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/IntRange.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/build/StatBoostModule.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/fortune.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/maintained.json (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/lightspeed.json (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/entity/EntityEffectLevelVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/ReplaceBlockWalkerModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/fluid/TankModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/mining/BlockLightVariable.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/worktable/ModifierSetWorktableRecipe.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/harvest/ModifiedHarvestLogic.java (diff) |
| src/main/java/slimeknights/tconstruct/plugin/jsonthings/FlexItemTypes.java (diff) |
| src/generated/resources/data/tconstruct/tinkering/modifiers/scorching.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/armor/BlockDamageSourceModule.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/modules/fluid/TankCapacityModule.java (diff) |
Commit
00ec1d278f26f808944575ca074b0886d6738190
by KnightMinerUpdate to latest ItemOutput
Migrate deserializing to the appropate helper and pass the appropiate boolean for serialization Migrate all nullable ItemOutput usages to optional ItemOutput via its new static empty constant Cleanup some calls to ItemOutput in datagen to use the simpliest argument method available
|
| src/generated/resources/data/tconstruct/recipes/tools/materials/invar/block.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/RandomItem.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/manyullyn/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rose_gold.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/constantan/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/steel/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/silver/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/smeltery/casting/water/splash.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/electrum/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/string.json (diff) |
| src/main/java/slimeknights/tconstruct/library/data/recipe/IMaterialRecipeHelper.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/modifiers/severing/AgeableSeveringRecipe.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/rotten_flesh.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/bronze/block.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/molding/MoldingRecipeBuilder.java (diff) |
| src/main/java/slimeknights/tconstruct/tools/recipe/severing/MooshroomDemushroomingRecipe.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/material/MaterialRecipeBuilder.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/iron/block.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/molding/MoldingRecipe.java (diff) |
| src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_lingering_water.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/copper/block.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/casting/ItemCastingRecipe.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/slimesteel/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/gold.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/copper.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/hepatizon/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/pig_iron.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/venombone.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/iron.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/pig_iron/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/platinum/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/smeltery/casting/water/lingering.json (diff) |
| src/main/java/slimeknights/tconstruct/smeltery/data/SmelteryRecipeProvider.java (diff) |
| src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_water.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/gold/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/amethyst_bronze/block.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/material/MaterialRecipeSerializer.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/necrotic_bone.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/bone.json (diff) |
| src/generated/resources/data/tconstruct/recipes/smeltery/casting/water/bottle.json (diff) |
| src/main/java/slimeknights/tconstruct/library/data/recipe/ISmelteryRecipeHelper.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/rose_gold/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/tungsten/block.json (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/partbuilder/ItemPartRecipeBuilder.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/glass.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/recipe/severing/SheepShearingRecipe.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/queens_slime/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/blazing_bone.json (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/darkthread.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/osmium/block.json (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/cobalt/block.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java (diff) |
| src/generated/resources/data/tconstruct/recipes/tools/materials/lead/block.json (diff) |
| src/generated/resources/data/tconstruct/mantle/fluid_transfer/potion_splash_water.json (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/spilling/effects/RestoreHungerSpillingEffect.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/casting/ItemCastingRecipeBuilder.java (diff) |
| src/generated/resources/data/tconstruct/recipes/armor/building/slime_skull/ender_pearl.json (diff) |
| src/main/java/slimeknights/tconstruct/tools/data/material/MaterialRecipeProvider.java (diff) |
| src/main/java/slimeknights/tconstruct/library/recipe/partbuilder/ItemPartRecipe.java (diff) |
|
| src/main/java/slimeknights/tconstruct/library/tools/definition/harvest/IHarvestLogic.java (diff) |
| src/main/java/slimeknights/tconstruct/library/modifiers/util/ModifierLevelDisplay.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/aoe/IAreaOfEffectIterator.java (diff) |
| src/main/java/slimeknights/tconstruct/library/json/variable/VariableLoaderRegistry.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/definition/weapon/IWeaponAttack.java (diff) |
|
| src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java (diff) |
| src/main/java/slimeknights/tconstruct/tools/TinkerTools.java (diff) |
| src/main/java/slimeknights/tconstruct/library/tools/ToolPredicate.java |
| src/main/java/slimeknights/tconstruct/library/json/predicate/tool/StatInRangePredicate.java (diff) |
|
| gradle.properties (diff) |