Skip to content

Commit

Permalink
Ditch staff item in favor of just doing a tag check in the base modif…
Browse files Browse the repository at this point in the history 
…iable item

Only difference was one method, no reason that has to require a class difference
  • Loading branch information
@KnightMiner
KnightMiner committed May 15, 2024
1 parent 6fbf940 commit 57e8f41
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 93 deletions.
23 changes: 13 additions & 10 deletions ...eknights/tconstruct/library/modifiers/hook/interaction/EntityInteractionModifierHook.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import slimeknights.tconstruct.common.TinkerTags;
import slimeknights.tconstruct.library.modifiers.ModifierEntry;
import slimeknights.tconstruct.library.modifiers.ModifierHooks;
import slimeknights.tconstruct.library.tools.helper.ToolAttackUtil;
Expand Down Expand Up @@ -79,20 +80,22 @@ public InteractionResult afterEntityUse(IToolStackView tool, ModifierEntry modif
/** Logic to left click an entity using interaction modifiers */
static boolean leftClickEntity(ItemStack stack, Player player, Entity target) {
ToolStack tool = ToolStack.from(stack);
if (!player.getCooldowns().isOnCooldown(stack.getItem())) {
List<ModifierEntry> modifiers = tool.getModifierList();
// TODO: should this be in the event?
for (ModifierEntry entry : modifiers) {
if (entry.getHook(ModifierHooks.ENTITY_INTERACT).beforeEntityUse(tool, entry, player, target, InteractionHand.MAIN_HAND, InteractionSource.LEFT_CLICK).consumesAction()) {
return true;
}
}
if (target instanceof LivingEntity living) {
if (stack.is(TinkerTags.Items.INTERACTABLE_LEFT)) {
if (!player.getCooldowns().isOnCooldown(stack.getItem())) {
List<ModifierEntry> modifiers = tool.getModifierList();
// TODO: should this be in the event?
for (ModifierEntry entry : modifiers) {
if (entry.getHook(ModifierHooks.ENTITY_INTERACT).afterEntityUse(tool, entry, player, living, InteractionHand.MAIN_HAND, InteractionSource.LEFT_CLICK).consumesAction()) {
if (entry.getHook(ModifierHooks.ENTITY_INTERACT).beforeEntityUse(tool, entry, player, target, InteractionHand.MAIN_HAND, InteractionSource.LEFT_CLICK).consumesAction()) {
return true;
}
}
if (target instanceof LivingEntity living) {
for (ModifierEntry entry : modifiers) {
if (entry.getHook(ModifierHooks.ENTITY_INTERACT).afterEntityUse(tool, entry, player, living, InteractionHand.MAIN_HAND, InteractionSource.LEFT_CLICK).consumesAction()) {
return true;
}
}
}
}
}
// no left click modifiers? fallback to standard attack
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import slimeknights.tconstruct.library.modifiers.hook.behavior.AttributesModifierHook;
import slimeknights.tconstruct.library.modifiers.hook.behavior.EnchantmentModifierHook;
import slimeknights.tconstruct.library.modifiers.hook.display.DurabilityDisplayModifierHook;
import slimeknights.tconstruct.library.modifiers.hook.interaction.EntityInteractionModifierHook;
import slimeknights.tconstruct.library.modifiers.hook.interaction.GeneralInteractionModifierHook;
import slimeknights.tconstruct.library.modifiers.hook.interaction.InteractionSource;
import slimeknights.tconstruct.library.modifiers.hook.interaction.InventoryTickModifierHook;
Expand All @@ -48,7 +49,6 @@
import slimeknights.tconstruct.library.tools.definition.module.mining.IsEffectiveToolHook;
import slimeknights.tconstruct.library.tools.definition.module.mining.MiningSpeedToolHook;
import slimeknights.tconstruct.library.tools.helper.ModifierUtil;
import slimeknights.tconstruct.library.tools.helper.ToolAttackUtil;
import slimeknights.tconstruct.library.tools.helper.ToolBuildHandler;
import slimeknights.tconstruct.library.tools.helper.ToolDamageUtil;
import slimeknights.tconstruct.library.tools.helper.ToolHarvestLogic;
Expand Down Expand Up @@ -240,8 +240,8 @@ public int getBarWidth(ItemStack pStack) {
/* Attacking */

@Override
public boolean onLeftClickEntity(ItemStack stack, Player player, Entity entity) {
return ToolAttackUtil.attackEntity(stack, player, entity);
public boolean onLeftClickEntity(ItemStack stack, Player player, Entity target) {
return EntityInteractionModifierHook.leftClickEntity(stack, player, target);
}

@Override
Expand Down
33 changes: 0 additions & 33 deletions src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableStaffItem.java
View file

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/java/slimeknights/tconstruct/plugin/jsonthings/FlexItemTypes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import slimeknights.tconstruct.plugin.jsonthings.item.FlexModifiableBowItem;
import slimeknights.tconstruct.plugin.jsonthings.item.FlexModifiableCrossbowItem;
import slimeknights.tconstruct.plugin.jsonthings.item.FlexModifiableItem;
import slimeknights.tconstruct.plugin.jsonthings.item.FlexModifiableStaffItem;
import slimeknights.tconstruct.plugin.jsonthings.item.FlexRepairKitItem;
import slimeknights.tconstruct.plugin.jsonthings.item.FlexToolPartItem;
import slimeknights.tconstruct.tools.item.ArmorSlotType;
Expand Down Expand Up @@ -62,12 +61,6 @@ public static void init() {
return (props, builder) -> add(TOOL_ITEMS, new FlexModifiableItem(props, ToolDefinition.create(builder.getRegistryName()), breakBlocksInCreative));
});

/* Register a modifiable tool instance for melee/harvest tools */
register("staff", data -> {
boolean breakBlocksInCreative = GsonHelper.getAsBoolean(data, "break_blocks_in_creative", true);
return (props, builder) -> add(TOOL_ITEMS, new FlexModifiableStaffItem(props, ToolDefinition.create(builder.getRegistryName()), breakBlocksInCreative));
});

/* Register a modifiable tool instance for bow like items (release on finish) */
register("bow", data -> (props, builder) -> add(TOOL_ITEMS, new FlexModifiableBowItem(props, ToolDefinition.create(builder.getRegistryName()))));

Expand Down
33 changes: 0 additions & 33 deletions src/main/java/slimeknights/tconstruct/plugin/jsonthings/item/FlexModifiableStaffItem.java
View file

This file was deleted.

13 changes: 6 additions & 7 deletions src/main/java/slimeknights/tconstruct/tools/TinkerTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
import slimeknights.tconstruct.library.tools.item.ModifiableArmorItem;
import slimeknights.tconstruct.library.tools.item.ModifiableItem;
import slimeknights.tconstruct.library.tools.item.ModifiableLauncherItem;
import slimeknights.tconstruct.library.tools.item.ModifiableStaffItem;
import slimeknights.tconstruct.library.utils.BlockSideHitListener;
import slimeknights.tconstruct.tools.data.StationSlotLayoutProvider;
import slimeknights.tconstruct.tools.data.ToolDefinitionDataProvider;
Expand Down Expand Up @@ -148,10 +147,10 @@ public TinkerTools() {
public static final ItemObject<ModifiableLauncherItem> longbow = ITEMS.register("longbow", () -> new ModifiableBowItem(TOOL, ToolDefinitions.LONGBOW));

public static final ItemObject<ModifiableItem> flintAndBrick = ITEMS.register("flint_and_brick", () -> new ModifiableItem(TOOL, ToolDefinitions.FLINT_AND_BRICK));
public static final ItemObject<ModifiableItem> skyStaff = ITEMS.register("sky_staff", () -> new ModifiableStaffItem(TOOL, ToolDefinitions.SKY_STAFF));
public static final ItemObject<ModifiableItem> earthStaff = ITEMS.register("earth_staff", () -> new ModifiableStaffItem(TOOL, ToolDefinitions.EARTH_STAFF));
public static final ItemObject<ModifiableItem> ichorStaff = ITEMS.register("ichor_staff", () -> new ModifiableStaffItem(TOOL, ToolDefinitions.ICHOR_STAFF));
public static final ItemObject<ModifiableItem> enderStaff = ITEMS.register("ender_staff", () -> new ModifiableStaffItem(TOOL, ToolDefinitions.ENDER_STAFF));
public static final ItemObject<ModifiableItem> skyStaff = ITEMS.register("sky_staff", () -> new ModifiableItem(TOOL, ToolDefinitions.SKY_STAFF));
public static final ItemObject<ModifiableItem> earthStaff = ITEMS.register("earth_staff", () -> new ModifiableItem(TOOL, ToolDefinitions.EARTH_STAFF));
public static final ItemObject<ModifiableItem> ichorStaff = ITEMS.register("ichor_staff", () -> new ModifiableItem(TOOL, ToolDefinitions.ICHOR_STAFF));
public static final ItemObject<ModifiableItem> enderStaff = ITEMS.register("ender_staff", () -> new ModifiableItem(TOOL, ToolDefinitions.ENDER_STAFF));

// armor
public static final EnumObject<ArmorSlotType,ModifiableArmorItem> travelersGear = ITEMS.registerEnum("travelers", ArmorSlotType.values(), type -> new TravelersGearItem(ArmorDefinitions.TRAVELERS, type, TOOL));
Expand All @@ -163,8 +162,8 @@ public TinkerTools() {
.build();

// shields
public static final ItemObject<ModifiableItem> travelersShield = ITEMS.register("travelers_shield", () -> new ModifiableStaffItem(TOOL, ArmorDefinitions.TRAVELERS_SHIELD));
public static final ItemObject<ModifiableItem> plateShield = ITEMS.register("plate_shield", () -> new ModifiableStaffItem(TOOL, ArmorDefinitions.PLATE_SHIELD));
public static final ItemObject<ModifiableItem> travelersShield = ITEMS.register("travelers_shield", () -> new ModifiableItem(TOOL, ArmorDefinitions.TRAVELERS_SHIELD));
public static final ItemObject<ModifiableItem> plateShield = ITEMS.register("plate_shield", () -> new ModifiableItem(TOOL, ArmorDefinitions.PLATE_SHIELD));

// arrows
public static final ItemObject<ArrowItem> crystalshotItem = ITEMS.register("crystalshot", () -> new CrystalshotItem(new Item.Properties().tab(TAB_TOOLS)));
Expand Down

0 comments on commit 57e8f41

Please sign in to comment.