-
Notifications
You must be signed in to change notification settings - Fork 754
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement conditional stat module and migrate airborne to it
- Loading branch information
1 parent
a138802
commit d25fce0
Showing
11 changed files
with
233 additions
and
4 deletions.
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
src/generated/resources/data/tconstruct/tinkering/modifiers/airborne.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "type": "tconstruct:composable", | ||
| "level_display": "tconstruct:default", | ||
| "tooltip_display": "always", | ||
| "modules": [ | ||
| { | ||
| "type": "tconstruct:conditional_mining_speed", | ||
| "blocks": "tconstruct:any", | ||
| "entity": { | ||
| "type": "mantle:inverted", | ||
| "predicate": "tconstruct:on_ground" | ||
| }, | ||
| "require_effective": false, | ||
| "percent": true, | ||
| "flat": 4.0, | ||
| "hooks": [ | ||
| "tconstruct:break_speed" | ||
| ] | ||
| }, | ||
| { | ||
| "type": "tconstruct:conditional_stat", | ||
| "stat": "tconstruct:accuracy", | ||
| "entity": "tconstruct:airborne", | ||
| "percent": false, | ||
| "flat": 0.5 | ||
| } | ||
| ] | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/main/java/slimeknights/tconstruct/library/json/predicate/block/TinkerBlockPredicate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package slimeknights.tconstruct.library.json.predicate.block; | ||
|
|
||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import slimeknights.mantle.data.GenericLoaderRegistry.IGenericLoader; | ||
| import slimeknights.mantle.data.GenericLoaderRegistry.SingletonLoader; | ||
| import slimeknights.mantle.data.predicate.IJsonPredicate; | ||
| import slimeknights.mantle.data.predicate.block.BlockPredicate; | ||
|
|
||
| public interface TinkerBlockPredicate { | ||
| /** Predicate that matches any block */ | ||
| BlockPredicate ANY = SingletonLoader.singleton(loader -> new BlockPredicate() { | ||
| @Override | ||
| public boolean matches(BlockState input) { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public IGenericLoader<? extends IJsonPredicate<BlockState>> getLoader() { | ||
| return loader; | ||
| } | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
...ava/slimeknights/tconstruct/library/modifiers/modules/behavior/ConditionalStatModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| package slimeknights.tconstruct.library.modifiers.modules.behavior; | ||
|
|
||
| import com.google.gson.JsonObject; | ||
| import lombok.Setter; | ||
| import lombok.experimental.Accessors; | ||
| import net.minecraft.network.FriendlyByteBuf; | ||
| import net.minecraft.util.GsonHelper; | ||
| import net.minecraft.world.entity.LivingEntity; | ||
| import slimeknights.mantle.data.GenericLoaderRegistry.IGenericLoader; | ||
| import slimeknights.mantle.data.predicate.IJsonPredicate; | ||
| import slimeknights.mantle.data.predicate.entity.LivingEntityPredicate; | ||
| import slimeknights.tconstruct.library.json.math.ModifierFormula; | ||
| import slimeknights.tconstruct.library.json.math.ModifierFormula.FallbackFormula; | ||
| import slimeknights.tconstruct.library.modifiers.ModifierEntry; | ||
| import slimeknights.tconstruct.library.modifiers.ModifierHook; | ||
| import slimeknights.tconstruct.library.modifiers.TinkerHooks; | ||
| import slimeknights.tconstruct.library.modifiers.hook.ConditionalStatModifierHook; | ||
| import slimeknights.tconstruct.library.modifiers.modules.ModifierModule; | ||
| import slimeknights.tconstruct.library.modifiers.modules.ModifierModuleCondition; | ||
| import slimeknights.tconstruct.library.tools.nbt.IToolStackView; | ||
| import slimeknights.tconstruct.library.tools.stat.FloatToolStat; | ||
| import slimeknights.tconstruct.library.tools.stat.INumericToolStat; | ||
| import slimeknights.tconstruct.library.tools.stat.ToolStats; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.List; | ||
|
|
||
| import static slimeknights.tconstruct.library.json.math.ModifierFormula.FallbackFormula.BOOST; | ||
| import static slimeknights.tconstruct.library.json.math.ModifierFormula.FallbackFormula.PERCENT; | ||
|
|
||
| /** | ||
| * Module for common conditional stats, such as on ranged tools | ||
| * @param stat Stat to boost | ||
| * @param holder Condition on the tool holder | ||
| * @param formula Formula to apply | ||
| * @param percent If true, the formula is a percent formula | ||
| * @param condition Standard modifier module conditions | ||
| */ | ||
| public record ConditionalStatModule(INumericToolStat<?> stat, IJsonPredicate<LivingEntity> holder, ModifierFormula formula, boolean percent, ModifierModuleCondition condition) implements ModifierModule, ConditionalStatModifierHook, ConditionalStatTooltip { | ||
| private static final List<ModifierHook<?>> DEFAULT_HOOKS = List.of(TinkerHooks.CONDITIONAL_STAT, TinkerHooks.TOOLTIP); | ||
| /** Variables for the modifier formula */ | ||
| private static final String[] VARIABLES = { "level", "value", "multiplier" }; | ||
| // variables for the formula | ||
| /** Value from the previous conditional modifier */ | ||
| public static final int VALUE = 1; | ||
| /** Stat multiplier from the tool */ | ||
| public static final int MULTIPLIER = 2; | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public Integer getPriority() { | ||
| // run multipliers a bit later | ||
| return percent ? 75 : null; | ||
| } | ||
|
|
||
| @Override | ||
| public float modifyStat(IToolStackView tool, ModifierEntry modifier, LivingEntity living, FloatToolStat stat, float baseValue, float multiplier) { | ||
| if (this.stat == stat && condition.matches(tool, modifier) && this.holder.matches(living)) { | ||
| return formula.apply(formula.computeLevel(tool, modifier), baseValue, multiplier); | ||
| } | ||
| return baseValue; | ||
| } | ||
|
|
||
| @Override | ||
| public float computeTooltipValue(IToolStackView tool, ModifierEntry entry) { | ||
| return formula.apply(formula.computeLevel(tool, entry), 1, tool.getMultiplier(this.stat)); | ||
| } | ||
|
|
||
| @Override | ||
| public List<ModifierHook<?>> getDefaultHooks() { | ||
| return DEFAULT_HOOKS; | ||
| } | ||
|
|
||
| @Override | ||
| public IGenericLoader<? extends ConditionalStatModule> getLoader() { | ||
| return LOADER; | ||
| } | ||
|
|
||
| public static final IGenericLoader<ConditionalStatModule> LOADER = new IGenericLoader<>() { | ||
| @Override | ||
| public ConditionalStatModule deserialize(JsonObject json) { | ||
| boolean percent = GsonHelper.getAsBoolean(json, "percent", false); | ||
| return new ConditionalStatModule( | ||
| ToolStats.numericFromJson(GsonHelper.getAsString(json, "stat")), | ||
| LivingEntityPredicate.LOADER.getAndDeserialize(json, "entity"), | ||
| ModifierFormula.deserialize(json, VARIABLES, percent ? PERCENT : BOOST), percent, | ||
| ModifierModuleCondition.deserializeFrom(json) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public void serialize(ConditionalStatModule object, JsonObject json) { | ||
| object.condition.serializeInto(json); | ||
| json.addProperty("stat", object.stat.getName().toString()); | ||
| json.add("entity", LivingEntityPredicate.LOADER.serialize(object.holder)); | ||
| json.addProperty("percent", object.percent); | ||
| object.formula.serialize(json, VARIABLES); | ||
| } | ||
|
|
||
| @Override | ||
| public ConditionalStatModule fromNetwork(FriendlyByteBuf buffer) { | ||
| boolean percent = buffer.readBoolean(); | ||
| return new ConditionalStatModule( | ||
| ToolStats.numericFromNetwork(buffer), | ||
| LivingEntityPredicate.LOADER.fromNetwork(buffer), | ||
| ModifierFormula.fromNetwork(buffer, VARIABLES.length, percent ? PERCENT : BOOST), percent, | ||
| ModifierModuleCondition.fromNetwork(buffer)); | ||
| } | ||
|
|
||
| @Override | ||
| public void toNetwork(ConditionalStatModule object, FriendlyByteBuf buffer) { | ||
| buffer.writeBoolean(object.percent); | ||
| buffer.writeUtf(object.stat.getName().toString()); | ||
| LivingEntityPredicate.LOADER.toNetwork(object.holder, buffer); | ||
| object.formula.toNetwork(buffer); | ||
| object.condition.toNetwork(buffer); | ||
| } | ||
| }; | ||
|
|
||
|
|
||
| /* Builder */ | ||
|
|
||
| /** Creates a builder instance */ | ||
| public static Builder stat(INumericToolStat<?> stat) { | ||
| return new Builder(stat); | ||
| } | ||
|
|
||
| /** Builder class */ | ||
| public static class Builder extends ModifierFormula.Builder<Builder,ConditionalStatModule> { | ||
| private final INumericToolStat<?> stat; | ||
| @Setter | ||
| @Accessors(fluent = true) | ||
| private IJsonPredicate<LivingEntity> holder = LivingEntityPredicate.ANY; | ||
| private boolean percent = false; | ||
|
|
||
| private Builder(INumericToolStat<?> stat) { | ||
| super(VARIABLES, BOOST); | ||
| this.stat = stat; | ||
| } | ||
|
|
||
| @Override | ||
| protected FallbackFormula getFormula() { | ||
| return percent ? PERCENT : BOOST; | ||
| } | ||
|
|
||
| /** Sets this to a percent boost formula */ | ||
| public Builder percent() { | ||
| this.percent = true; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| protected ConditionalStatModule build(ModifierFormula formula) { | ||
| return new ConditionalStatModule(stat, holder, formula, percent, condition); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters