Skip to content

Commit

Permalink
Rename composable addHook to addModule, more accurate name
Browse files Browse the repository at this point in the history
  • Loading branch information
@KnightMiner
KnightMiner committed Jun 6, 2023
1 parent f01431c commit 2f74a1e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/main/java/slimeknights/tconstruct/library/modifiers/dynamic/ComposableModifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ public static class Builder {
private final ImmutableList.Builder<ModuleWithHooks> modules = ImmutableList.builder();

/** Adds a module to the builder */
public final <T extends ModifierModule> Builder addHook(T object) {
public final <T extends ModifierModule> Builder addModule(T object) {
modules.add(new ModuleWithHooks(object, Collections.emptyList()));
return this;
}

/** Adds a module to the builder */
@SafeVarargs
public final <T extends ModifierModule> Builder addHook(T object, ModifierHook<? super T>... hooks) {
public final <T extends ModifierModule> Builder addModule(T object, ModifierHook<? super T>... hooks) {
modules.add(new ModuleWithHooks(object, List.of(hooks)));
return this;
}
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/slimeknights/tconstruct/tools/data/ModifierProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ protected void addModifiers() {

// extra modifier slots
ModifierSlotModule UPGRADE = new ModifierSlotModule(SlotType.UPGRADE);
buildModifier(ModifierIds.writable) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addHook(UPGRADE);
buildModifier(ModifierIds.recapitated).priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addHook(UPGRADE);
buildModifier(ModifierIds.harmonious) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addHook(UPGRADE);
buildModifier(ModifierIds.resurrected).priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addHook(UPGRADE);
buildModifier(ModifierIds.gilded) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addHook(new ModifierSlotModule(SlotType.UPGRADE, 2));
buildModifier(ModifierIds.draconic) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addHook(new ModifierSlotModule(SlotType.ABILITY, 1));
buildModifier(ModifierIds.writable) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addModule(UPGRADE);
buildModifier(ModifierIds.recapitated).priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addModule(UPGRADE);
buildModifier(ModifierIds.harmonious) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addModule(UPGRADE);
buildModifier(ModifierIds.resurrected).priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addModule(UPGRADE);
buildModifier(ModifierIds.gilded) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addModule(new ModifierSlotModule(SlotType.UPGRADE, 2));
buildModifier(ModifierIds.draconic) .priority(50).tooltipDisplay(TooltipDisplay.TINKER_STATION).levelDisplay(ModifierLevelDisplay.SINGLE_LEVEL).addModule(new ModifierSlotModule(SlotType.ABILITY, 1));

addModifier(ModifierIds.rebalanced, SwappableExtraSlotModifier.swappable().penalize(SlotType.ABILITY, SlotType.UPGRADE).build());
addRedirect(id("red_extra_upgrade"), redirect(ModifierIds.writable));
Expand Down Expand Up @@ -142,12 +142,12 @@ protected void addModifiers() {


// loot
buildModifier(TinkerModifiers.silky).levelDisplay(ModifierLevelDisplay.NO_LEVELS).addHook(new EnchantmentModule.Harvest(Enchantments.SILK_TOUCH));
buildModifier(TinkerModifiers.silky).levelDisplay(ModifierLevelDisplay.NO_LEVELS).addModule(new EnchantmentModule.Harvest(Enchantments.SILK_TOUCH));
EnchantmentModule.Harvest FORTUNE = new EnchantmentModule.Harvest(Enchantments.BLOCK_FORTUNE);
LootingModule LOOTING = new LootingModule(1);
buildModifier(ModifierIds.luck).levelDisplay(new UniqueForLevels(3)).addHook(FORTUNE).addHook(LOOTING);
buildModifier(ModifierIds.fortune).addHook(FORTUNE);
buildModifier(ModifierIds.looting).addHook(LOOTING);
buildModifier(ModifierIds.luck).levelDisplay(new UniqueForLevels(3)).addModule(FORTUNE).addModule(LOOTING);
buildModifier(ModifierIds.fortune).addModule(FORTUNE);
buildModifier(ModifierIds.looting).addModule(LOOTING);

/// attack
addModifier(ModifierIds.sticky, MobEffectModifier.Builder.effect(MobEffects.MOVEMENT_SLOWDOWN).level(0, 0.5f).timeBase(20).timeMultiplierRandom(10).build());
Expand Down Expand Up @@ -181,7 +181,7 @@ protected void addModifiers() {
// TODO: floor?
addModifier(ModifierIds.revitalizing, StatBoostModifier.builder().attribute("tconstruct.modifier.revitalizing", Attributes.MAX_HEALTH, Operation.ADDITION, 2, armorSlots).build());
// helmet
buildModifier(ModifierIds.respiration).addHook(new EnchantmentModule.Constant(Enchantments.RESPIRATION));
buildModifier(ModifierIds.respiration).addModule(new EnchantmentModule.Constant(Enchantments.RESPIRATION));
// chestplate
addModifier(ModifierIds.strength, StatBoostModifier.builder().attribute("tconstruct.modifier.strength", Attributes.ATTACK_DAMAGE, Operation.MULTIPLY_TOTAL, 0.1f, armorSlots).build());
addRedirect(id("armor_power"), redirect(ModifierIds.strength));
Expand All @@ -192,7 +192,7 @@ protected void addModifiers() {
addModifier(ModifierIds.stepUp, StatBoostModifier.builder().attribute("tconstruct.modifier.step_up", ForgeMod.STEP_HEIGHT_ADDITION.get(), Operation.ADDITION, 0.5f, armorSlots).build());
addModifier(ModifierIds.speedy, StatBoostModifier.builder().attribute("tconstruct.modifier.speedy", Attributes.MOVEMENT_SPEED, Operation.MULTIPLY_TOTAL, 0.1f, armorMainHand).build());
// boots
buildModifier(ModifierIds.depthStrider).addHook(new EnchantmentModule.Constant(Enchantments.DEPTH_STRIDER));
buildModifier(ModifierIds.depthStrider).addModule(new EnchantmentModule.Constant(Enchantments.DEPTH_STRIDER));

// internal
addModifier(ModifierIds.overslimeFriend, StatBoostModifier.builder().addFlag(OverslimeModifier.KEY_OVERSLIME_FRIEND).modifierDisplay(ModifierDisplay.NEVER).build());
Expand Down Expand Up @@ -223,7 +223,7 @@ protected void addModifiers() {

// traits - tier 3
addModifier(ModifierIds.crumbling, new ConditionalMiningSpeedModifier(BlockPredicate.REQUIRES_TOOL.inverted(), false, 0.5f));
buildModifier(ModifierIds.enhanced).priority(60).addHook(UPGRADE);
buildModifier(ModifierIds.enhanced).priority(60).addModule(UPGRADE);
addRedirect(id("maintained_2"), redirect(TinkerModifiers.maintained.getId()));
// traits - tier 3 nether
addModifier(ModifierIds.lightweight, StatBoostModifier.builder()
Expand Down

0 comments on commit 2f74a1e

Please sign in to comment.