Merge branch 'forge-1.18' into forge-1.19.2

DavidQF555 · Jul 18, 2024 · 9e7367d · 9e7367d
2 parents 4f90569 + 4fceaf5
commit 9e7367d
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/src/main/java/io/github/davidqf555/minecraft/beams/common/items/PortableProjectorItem.java b/src/main/java/io/github/davidqf555/minecraft/beams/common/items/PortableProjectorItem.java
@@ -11,18 +11,17 @@
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ProjectileWeaponItem;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.UseAnim;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 
 import javax.annotation.Nullable;
 import java.util.List;
-import java.util.function.Predicate;
 
-public class PortableProjectorItem extends ProjectileWeaponItem {
+public class PortableProjectorItem extends Item {
 
     private final static Component INSTRUCTIONS = Component.translatable("item." + Beams.ID + ".portable_projector.instructions").withStyle(ChatFormatting.ITALIC).withStyle(ChatFormatting.DARK_PURPLE);
 
@@ -49,7 +48,7 @@ public void releaseUsing(ItemStack stack, Level world, LivingEntity entity, int
     }
 
     protected double getRange(int time) {
-        return time < 20 ? 0 : getDefaultProjectileRange() * Math.min(1, time / 200.0);
+        return time < 20 ? 0 : ServerConfigs.INSTANCE.portableProjectorMaxRange.get() * Math.min(1, time / 200.0);
     }
 
     @Override
@@ -76,16 +75,6 @@ public InteractionResultHolder<ItemStack> use(Level world, Player player, Intera
         return InteractionResultHolder.consume(stack);
     }
 
-    @Override
-    public Predicate<ItemStack> getAllSupportedProjectiles() {
-        return stack -> false;
-    }
-
-    @Override
-    public int getDefaultProjectileRange() {
-        return ServerConfigs.INSTANCE.portableProjectorMaxRange.get();
-    }
-
     @Nullable
     @Override
     public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundTag nbt) {