Move bow and crossbow impl to library

SlimeKnights · May 15, 2024 · 07fda6f · 07fda6f
1 parent 4796106
commit 07fda6f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 14 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/library/client/model/TinkerItemProperties.java b/src/main/java/slimeknights/tconstruct/library/client/model/TinkerItemProperties.java
@@ -12,8 +12,8 @@
 import slimeknights.tconstruct.library.modifiers.hook.interaction.GeneralInteractionModifierHook;
 import slimeknights.tconstruct.library.tools.helper.ModifierUtil;
 import slimeknights.tconstruct.library.tools.helper.ToolDamageUtil;
+import slimeknights.tconstruct.library.tools.item.ranged.ModifiableCrossbowItem;
 import slimeknights.tconstruct.library.tools.nbt.ToolStack;
-import slimeknights.tconstruct.tools.item.ModifiableCrossbowItem;
 
 /** Properties for tinker tools */
 public class TinkerItemProperties {

diff --git a/...nstruct/tools/item/ModifiableBowItem.java → .../tools/item/ranged/ModifiableBowItem.java b/...nstruct/tools/item/ModifiableBowItem.java → .../tools/item/ranged/ModifiableBowItem.java
@@ -1,4 +1,4 @@
-package slimeknights.tconstruct.tools.item;
+package slimeknights.tconstruct.library.tools.item.ranged;
 
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -27,7 +27,6 @@
 import slimeknights.tconstruct.library.tools.definition.ToolDefinition;
 import slimeknights.tconstruct.library.tools.helper.ModifierUtil;
 import slimeknights.tconstruct.library.tools.helper.ToolDamageUtil;
-import slimeknights.tconstruct.library.tools.item.ModifiableLauncherItem;
 import slimeknights.tconstruct.library.tools.nbt.ModifierNBT;
 import slimeknights.tconstruct.library.tools.nbt.NamespacedNBT;
 import slimeknights.tconstruct.library.tools.nbt.ToolStack;

diff --git a/...ct/tools/item/ModifiableCrossbowItem.java → ...s/item/ranged/ModifiableCrossbowItem.java b/...ct/tools/item/ModifiableCrossbowItem.java → ...s/item/ranged/ModifiableCrossbowItem.java
@@ -1,4 +1,4 @@
-package slimeknights.tconstruct.tools.item;
+package slimeknights.tconstruct.library.tools.item.ranged;
 
 import com.mojang.math.Quaternion;
 import com.mojang.math.Vector3f;
@@ -41,7 +41,6 @@
 import slimeknights.tconstruct.library.tools.definition.ToolDefinition;
 import slimeknights.tconstruct.library.tools.helper.ModifierUtil;
 import slimeknights.tconstruct.library.tools.helper.ToolDamageUtil;
-import slimeknights.tconstruct.library.tools.item.ModifiableLauncherItem;
 import slimeknights.tconstruct.library.tools.nbt.IToolStackView;
 import slimeknights.tconstruct.library.tools.nbt.ModDataNBT;
 import slimeknights.tconstruct.library.tools.nbt.ModifierNBT;

diff --git a/...ry/tools/item/ModifiableLauncherItem.java → ...s/item/ranged/ModifiableLauncherItem.java b/...ry/tools/item/ModifiableLauncherItem.java → ...s/item/ranged/ModifiableLauncherItem.java
@@ -1,4 +1,4 @@
-package slimeknights.tconstruct.library.tools.item;
+package slimeknights.tconstruct.library.tools.item.ranged;
 
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
@@ -46,6 +46,8 @@
 import slimeknights.tconstruct.library.tools.helper.ToolDamageUtil;
 import slimeknights.tconstruct.library.tools.helper.ToolHarvestLogic;
 import slimeknights.tconstruct.library.tools.helper.TooltipUtil;
+import slimeknights.tconstruct.library.tools.item.IModifiableDisplay;
+import slimeknights.tconstruct.library.tools.item.ModifiableItem;
 import slimeknights.tconstruct.library.tools.nbt.IToolStackView;
 import slimeknights.tconstruct.library.tools.nbt.ToolStack;
 import slimeknights.tconstruct.library.tools.stat.ToolStats;

diff --git a/src/main/java/slimeknights/tconstruct/library/tools/item/ranged/package-info.java b/src/main/java/slimeknights/tconstruct/library/tools/item/ranged/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package slimeknights.tconstruct.library.tools.item.ranged;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/slimeknights/tconstruct/plugin/jsonthings/item/FlexModifiableBowItem.java b/src/main/java/slimeknights/tconstruct/plugin/jsonthings/item/FlexModifiableBowItem.java
@@ -5,7 +5,7 @@
 import dev.gigaherz.jsonthings.things.events.FlexEventHandler;
 import net.minecraft.world.item.CreativeModeTab;
 import slimeknights.tconstruct.library.tools.definition.ToolDefinition;
-import slimeknights.tconstruct.tools.item.ModifiableBowItem;
+import slimeknights.tconstruct.library.tools.item.ranged.ModifiableBowItem;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;

diff --git a/src/main/java/slimeknights/tconstruct/plugin/jsonthings/item/FlexModifiableCrossbowItem.java b/src/main/java/slimeknights/tconstruct/plugin/jsonthings/item/FlexModifiableCrossbowItem.java
@@ -6,7 +6,7 @@
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 import slimeknights.tconstruct.library.tools.definition.ToolDefinition;
-import slimeknights.tconstruct.tools.item.ModifiableCrossbowItem;
+import slimeknights.tconstruct.library.tools.item.ranged.ModifiableCrossbowItem;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;

diff --git a/src/main/java/slimeknights/tconstruct/tools/TinkerTools.java b/src/main/java/slimeknights/tconstruct/tools/TinkerTools.java
@@ -74,7 +74,6 @@
 import slimeknights.tconstruct.library.tools.definition.module.weapon.SweepWeaponAttack;
 import slimeknights.tconstruct.library.tools.helper.ModifierLootingHandler;
 import slimeknights.tconstruct.library.tools.item.ModifiableItem;
-import slimeknights.tconstruct.library.tools.item.ModifiableLauncherItem;
 import slimeknights.tconstruct.library.tools.item.armor.MaterialArmorItem;
 import slimeknights.tconstruct.library.tools.item.armor.ModifiableArmorItem;
 import slimeknights.tconstruct.library.tools.item.armor.MultilayerArmorItem;
@@ -83,6 +82,8 @@
 import slimeknights.tconstruct.library.tools.item.armor.texture.FirstArmorTextureSupplier;
 import slimeknights.tconstruct.library.tools.item.armor.texture.FixedArmorTextureSupplier;
 import slimeknights.tconstruct.library.tools.item.armor.texture.MaterialArmorTextureSupplier;
+import slimeknights.tconstruct.library.tools.item.ranged.ModifiableBowItem;
+import slimeknights.tconstruct.library.tools.item.ranged.ModifiableCrossbowItem;
 import slimeknights.tconstruct.library.utils.BlockSideHitListener;
 import slimeknights.tconstruct.tools.data.StationSlotLayoutProvider;
 import slimeknights.tconstruct.tools.data.ToolDefinitionDataProvider;
@@ -99,8 +100,6 @@
 import slimeknights.tconstruct.tools.item.ArmorSlotType;
 import slimeknights.tconstruct.tools.item.CrystalshotItem;
 import slimeknights.tconstruct.tools.item.CrystalshotItem.CrystalshotEntity;
-import slimeknights.tconstruct.tools.item.ModifiableBowItem;
-import slimeknights.tconstruct.tools.item.ModifiableCrossbowItem;
 import slimeknights.tconstruct.tools.item.ModifiableSwordItem;
 import slimeknights.tconstruct.tools.item.SlimeskullItem;
 import slimeknights.tconstruct.tools.logic.EquipmentChangeWatcher;
@@ -148,8 +147,8 @@ public TinkerTools() {
   public static final ItemObject<ModifiableItem> sword = ITEMS.register("sword", () -> new ModifiableSwordItem(TOOL, ToolDefinitions.SWORD));
   public static final ItemObject<ModifiableItem> cleaver = ITEMS.register("cleaver", () -> new ModifiableSwordItem(TOOL, ToolDefinitions.CLEAVER));
 
-  public static final ItemObject<ModifiableLauncherItem> crossbow = ITEMS.register("crossbow", () -> new ModifiableCrossbowItem(TOOL, ToolDefinitions.CROSSBOW));
-  public static final ItemObject<ModifiableLauncherItem> longbow = ITEMS.register("longbow", () -> new ModifiableBowItem(TOOL, ToolDefinitions.LONGBOW));
+  public static final ItemObject<ModifiableCrossbowItem> crossbow = ITEMS.register("crossbow", () -> new ModifiableCrossbowItem(TOOL, ToolDefinitions.CROSSBOW));
+  public static final ItemObject<ModifiableBowItem> 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 ModifiableItem(TOOL, ToolDefinitions.SKY_STAFF));

diff --git a/src/main/java/slimeknights/tconstruct/tools/modifiers/ability/fluid/SpittingModifier.java b/src/main/java/slimeknights/tconstruct/tools/modifiers/ability/fluid/SpittingModifier.java
@@ -25,7 +25,7 @@
 import slimeknights.tconstruct.library.tools.capability.PersistentDataCapability;
 import slimeknights.tconstruct.library.tools.helper.ModifierUtil;
 import slimeknights.tconstruct.library.tools.helper.ToolDamageUtil;
-import slimeknights.tconstruct.library.tools.item.ModifiableLauncherItem;
+import slimeknights.tconstruct.library.tools.item.ranged.ModifiableLauncherItem;
 import slimeknights.tconstruct.library.tools.nbt.IToolStackView;
 import slimeknights.tconstruct.library.tools.nbt.NamespacedNBT;
 import slimeknights.tconstruct.library.tools.stat.ToolStats;