From 64452559225c5c6b4c6869a2b8af7ed9fb0cf06e Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sat, 8 Mar 2025 21:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4AnimatedItem=E5=92=8CAnimated?= =?UTF-8?q?Entity=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/entity/AnimatedEntity.java | 9 --------- .../atsuishio/superbwarfare/entity/C4Entity.java | 15 +-------------- .../superbwarfare/entity/ClaymoreEntity.java | 15 +-------------- .../superbwarfare/entity/MortarEntity.java | 6 +----- .../superbwarfare/entity/SenpaiEntity.java | 6 +----- .../superbwarfare/entity/TargetEntity.java | 15 +-------------- .../entity/projectile/CannonShellEntity.java | 12 +----------- .../entity/projectile/HeliRocketEntity.java | 7 +------ .../entity/projectile/JavelinMissileEntity.java | 7 +------ .../entity/projectile/RpgRocketEntity.java | 8 +------- .../entity/projectile/WgMissileEntity.java | 8 +------- .../superbwarfare/item/AnimatedItem.java | 5 ----- .../atsuishio/superbwarfare/item/LungeMine.java | 6 +----- .../superbwarfare/item/common/ammo/Rocket.java | 7 +------ .../item/gun/handgun/Glock17Item.java | 7 +------ .../item/gun/handgun/Glock18Item.java | 7 +------ .../superbwarfare/item/gun/handgun/M1911Item.java | 7 +------ .../superbwarfare/item/gun/handgun/Mp443Item.java | 7 +------ .../item/gun/handgun/Trachelium.java | 7 +------ .../superbwarfare/item/gun/heavy/Ntw20Item.java | 7 +------ .../item/gun/launcher/JavelinItem.java | 7 +------ .../superbwarfare/item/gun/launcher/M79Item.java | 7 +------ .../superbwarfare/item/gun/launcher/RpgItem.java | 7 +------ .../item/gun/launcher/SecondaryCataclysm.java | 7 +------ .../item/gun/machinegun/DevotionItem.java | 7 +------ .../item/gun/machinegun/M60Item.java | 7 +------ .../item/gun/machinegun/MinigunItem.java | 7 +------ .../item/gun/machinegun/RpkItem.java | 7 +------ .../superbwarfare/item/gun/rifle/AK12Item.java | 7 +------ .../superbwarfare/item/gun/rifle/AK47Item.java | 7 +------ .../superbwarfare/item/gun/rifle/Hk416Item.java | 7 +------ .../superbwarfare/item/gun/rifle/M4Item.java | 7 +------ .../superbwarfare/item/gun/rifle/MarlinItem.java | 7 +------ .../superbwarfare/item/gun/rifle/Mk14Item.java | 7 +------ .../superbwarfare/item/gun/rifle/Qbz95Item.java | 7 +------ .../superbwarfare/item/gun/rifle/SksItem.java | 7 +------ .../superbwarfare/item/gun/shotgun/Aa12Item.java | 8 +------- .../item/gun/shotgun/AbekiriItem.java | 7 +------ .../superbwarfare/item/gun/shotgun/M870Item.java | 7 +------ .../superbwarfare/item/gun/smg/VectorItem.java | 7 +------ .../item/gun/sniper/HuntingRifleItem.java | 7 +------ .../superbwarfare/item/gun/sniper/K98Item.java | 7 +------ .../superbwarfare/item/gun/sniper/M98bItem.java | 7 +------ .../item/gun/sniper/MosinNagantItem.java | 7 +------ .../item/gun/sniper/SentinelItem.java | 7 +------ .../superbwarfare/item/gun/sniper/SvdItem.java | 7 +------ .../superbwarfare/item/gun/special/BocekItem.java | 7 +------ .../superbwarfare/item/gun/special/TaserItem.java | 7 +------ 48 files changed, 46 insertions(+), 319 deletions(-) delete mode 100644 src/main/java/com/atsuishio/superbwarfare/entity/AnimatedEntity.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/item/AnimatedItem.java diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/AnimatedEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/AnimatedEntity.java deleted file mode 100644 index e91b5692d..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/entity/AnimatedEntity.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.atsuishio.superbwarfare.entity; - -public interface AnimatedEntity { - String getSyncedAnimation(); - - void setAnimation(String animation); - - void setAnimationProcedure(String procedure); -} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/C4Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/C4Entity.java index 52b6a6460..73dd314eb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/C4Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/C4Entity.java @@ -31,7 +31,7 @@ import java.util.Comparator; import java.util.Optional; import java.util.UUID; -public class C4Entity extends Entity implements GeoEntity, AnimatedEntity, OwnableEntity { +public class C4Entity extends Entity implements GeoEntity, OwnableEntity { protected static final EntityDataAccessor> OWNER_UUID = SynchedEntityData.defineId(C4Entity.class, EntityDataSerializers.OPTIONAL_UUID); protected static final EntityDataAccessor LAST_ATTACKER_UUID = SynchedEntityData.defineId(C4Entity.class, EntityDataSerializers.STRING); @@ -244,19 +244,6 @@ public class C4Entity extends Entity implements GeoEntity, AnimatedEntity, Ownab return true; } - @Override - public String getSyncedAnimation() { - return null; - } - - @Override - public void setAnimation(String animation) { - } - - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java index ea383a52a..3fd625c82 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java @@ -38,7 +38,7 @@ import java.util.Comparator; import java.util.Optional; import java.util.UUID; -public class ClaymoreEntity extends Entity implements GeoEntity, AnimatedEntity, OwnableEntity { +public class ClaymoreEntity extends Entity implements GeoEntity, OwnableEntity { protected static final EntityDataAccessor> OWNER_UUID = SynchedEntityData.defineId(ClaymoreEntity.class, EntityDataSerializers.OPTIONAL_UUID); protected static final EntityDataAccessor LAST_ATTACKER_UUID = SynchedEntityData.defineId(ClaymoreEntity.class, EntityDataSerializers.STRING); @@ -262,19 +262,6 @@ public class ClaymoreEntity extends Entity implements GeoEntity, AnimatedEntity, return true; } - @Override - public String getSyncedAnimation() { - return null; - } - - @Override - public void setAnimation(String animation) { - } - - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java index f16408ae0..f4dfed9e1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java @@ -47,7 +47,7 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; -public class MortarEntity extends VehicleEntity implements GeoEntity, AnimatedEntity { +public class MortarEntity extends VehicleEntity implements GeoEntity { public static final EntityDataAccessor FIRE_TIME = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.INT); public static final EntityDataAccessor PITCH = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.FLOAT); @@ -293,10 +293,6 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, AnimatedEn public void setAnimation(String animation) { } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { data.add(new AnimationController<>(this, "movement", 0, this::movementPredicate)); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java index c5a04a9af..2eb4173a4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/SenpaiEntity.java @@ -34,7 +34,7 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; -public class SenpaiEntity extends Monster implements GeoEntity, AnimatedEntity { +public class SenpaiEntity extends Monster implements GeoEntity { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -188,10 +188,6 @@ public class SenpaiEntity extends Monster implements GeoEntity, AnimatedEntity { public void setAnimation(String animation) { } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { data.add(new AnimationController<>(this, "movement", 4, this::movementPredicate)); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java index 1838eea60..c056c9f56 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java @@ -40,7 +40,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; @Mod.EventBusSubscriber -public class TargetEntity extends LivingEntity implements GeoEntity, AnimatedEntity { +public class TargetEntity extends LivingEntity implements GeoEntity { public static final EntityDataAccessor DOWN_TIME = SynchedEntityData.defineId(TargetEntity.class, EntityDataSerializers.INT); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -249,17 +249,4 @@ public class TargetEntity extends LivingEntity implements GeoEntity, AnimatedEnt return this.cache; } - @Override - public String getSyncedAnimation() { - return null; - } - - @Override - public void setAnimation(String animation) { - } - - @Override - public void setAnimationProcedure(String procedure) { - - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java index d1009fd58..b509a75b2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/CannonShellEntity.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.entity.projectile; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; -import com.atsuishio.superbwarfare.entity.AnimatedEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.network.message.ClientIndicatorMessage; @@ -51,7 +50,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.HashSet; import java.util.Set; -public class CannonShellEntity extends ThrowableItemProjectile implements GeoEntity, AnimatedEntity { +public class CannonShellEntity extends ThrowableItemProjectile implements GeoEntity { public static final EntityDataAccessor ANIMATION = SynchedEntityData.defineId(CannonShellEntity.class, EntityDataSerializers.STRING); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -370,19 +369,10 @@ public class CannonShellEntity extends ThrowableItemProjectile implements GeoEnt return 0.05F; } - public String getSyncedAnimation() { - return this.entityData.get(ANIMATION); - } - public void setAnimation(String animation) { this.entityData.set(ANIMATION, animation); } - @Override - public void setAnimationProcedure(String procedure) { - this.animationProcedure = procedure; - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { data.add(new AnimationController<>(this, "movement", 0, this::movementPredicate)); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java index 32886f038..ed4089aa6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/HeliRocketEntity.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.entity.projectile; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; -import com.atsuishio.superbwarfare.entity.AnimatedEntity; import com.atsuishio.superbwarfare.init.ModDamageTypes; import com.atsuishio.superbwarfare.init.ModEntities; import com.atsuishio.superbwarfare.init.ModItems; @@ -40,7 +39,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import javax.annotation.Nullable; -public class HeliRocketEntity extends ThrowableItemProjectile implements GeoEntity, AnimatedEntity { +public class HeliRocketEntity extends ThrowableItemProjectile implements GeoEntity { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); private float damage = 140f; private float explosion_damage = 60f; @@ -174,10 +173,6 @@ public class HeliRocketEntity extends ThrowableItemProjectile implements GeoEnti public void setAnimation(String animation) { } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { data.add(new AnimationController<>(this, "movement", 0, this::movementPredicate)); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java index 9519e8761..04e025cf3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.entity.projectile; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; -import com.atsuishio.superbwarfare.entity.AnimatedEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.init.ModDamageTypes; import com.atsuishio.superbwarfare.init.ModEntities; @@ -52,7 +51,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; -public class JavelinMissileEntity extends ThrowableItemProjectile implements GeoEntity, AnimatedEntity { +public class JavelinMissileEntity extends ThrowableItemProjectile implements GeoEntity { public static final EntityDataAccessor TARGET_UUID = SynchedEntityData.defineId(JavelinMissileEntity.class, EntityDataSerializers.STRING); public static final EntityDataAccessor TOP = SynchedEntityData.defineId(JavelinMissileEntity.class, EntityDataSerializers.BOOLEAN); public static final EntityDataAccessor TARGET_X = SynchedEntityData.defineId(JavelinMissileEntity.class, EntityDataSerializers.FLOAT); @@ -302,10 +301,6 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo public void setAnimation(String animation) { } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { data.add(new AnimationController<>(this, "movement", 0, this::movementPredicate)); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java index eb1e31dd3..6c3451d13 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/RpgRocketEntity.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.entity.projectile; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.AnimatedEntity; import com.atsuishio.superbwarfare.init.ModDamageTypes; import com.atsuishio.superbwarfare.init.ModEntities; import com.atsuishio.superbwarfare.init.ModItems; @@ -42,7 +41,7 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; -public class RpgRocketEntity extends ThrowableItemProjectile implements GeoEntity, AnimatedEntity { +public class RpgRocketEntity extends ThrowableItemProjectile implements GeoEntity { public static final EntityDataAccessor ANIMATION = SynchedEntityData.defineId(RpgRocketEntity.class, EntityDataSerializers.STRING); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -182,11 +181,6 @@ public class RpgRocketEntity extends ThrowableItemProjectile implements GeoEntit this.entityData.set(ANIMATION, animation); } - @Override - public void setAnimationProcedure(String procedure) { - this.animationProcedure = procedure; - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { data.add(new AnimationController<>(this, "movement", 0, this::movementPredicate)); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java index 342df39d1..fc145837e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.entity.projectile; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.ExplosionConfig; -import com.atsuishio.superbwarfare.entity.AnimatedEntity; import com.atsuishio.superbwarfare.init.ModDamageTypes; import com.atsuishio.superbwarfare.init.ModEntities; import com.atsuishio.superbwarfare.init.ModItems; @@ -43,7 +42,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import javax.annotation.Nullable; -public class WgMissileEntity extends ThrowableItemProjectile implements GeoEntity, AnimatedEntity { +public class WgMissileEntity extends ThrowableItemProjectile implements GeoEntity { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; @@ -196,11 +195,6 @@ public class WgMissileEntity extends ThrowableItemProjectile implements GeoEntit public void setAnimation(String animation) { } - @Override - public void setAnimationProcedure(String procedure) { - this.animationProcedure = procedure; - } - @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { data.add(new AnimationController<>(this, "movement", 0, this::movementPredicate)); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/AnimatedItem.java b/src/main/java/com/atsuishio/superbwarfare/item/AnimatedItem.java deleted file mode 100644 index f0fe53681..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/item/AnimatedItem.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.atsuishio.superbwarfare.item; - -public interface AnimatedItem { - void setAnimationProcedure(String procedure); -} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java b/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java index a8ed98120..a448b6a91 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/LungeMine.java @@ -36,7 +36,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.function.Consumer; -public class LungeMine extends Item implements GeoItem, AnimatedItem { +public class LungeMine extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -113,10 +113,6 @@ public class LungeMine extends Item implements GeoItem, AnimatedItem { return this.cache; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return false; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java index ccccf13cd..51b10ac76 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Rocket.java @@ -4,7 +4,6 @@ import com.atsuishio.superbwarfare.client.renderer.item.RocketItemRenderer; import com.atsuishio.superbwarfare.tools.ParticleTool; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.atsuishio.superbwarfare.item.AnimatedItem; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.EquipmentSlot; @@ -28,7 +27,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.function.Consumer; -public class Rocket extends Item implements GeoItem, AnimatedItem { +public class Rocket extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -119,8 +118,4 @@ public class Rocket extends Item implements GeoItem, AnimatedItem { return super.hurtEnemy(stack, entity, source); } - @Override - public void setAnimationProcedure(String procedure) { - this.animationProcedure = procedure; - } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java index b5f62954c..27c05e817 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -37,7 +36,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class Glock17Item extends GunItem implements GeoItem, AnimatedItem { +public class Glock17Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -130,10 +129,6 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/glock_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java index e9bb7080c..c32a54a88 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -38,7 +37,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class Glock18Item extends GunItem implements GeoItem, AnimatedItem { +public class Glock18Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -133,10 +132,6 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/glock_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java index 91af72afe..7d55e9a50 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -37,7 +36,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class M1911Item extends GunItem implements GeoItem, AnimatedItem { +public class M1911Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -133,10 +132,6 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/m1911_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java index ee8ead2d6..839ddaea6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -37,7 +36,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class Mp443Item extends GunItem implements GeoItem, AnimatedItem { +public class Mp443Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -130,10 +129,6 @@ public class Mp443Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/mp443_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java index 93e0af8a5..559786ef4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -45,7 +44,7 @@ import java.util.List; import java.util.Set; import java.util.function.Consumer; -public class Trachelium extends GunItem implements GeoItem, AnimatedItem { +public class Trachelium extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -295,10 +294,6 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { GunsTool.setGunDoubleTag(stack, "CustomZoom", customZoom); } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/trachelium_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java index bc161e17f..f909ef18c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -38,7 +37,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class Ntw20Item extends GunItem implements GeoItem, AnimatedItem { +public class Ntw20Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -134,10 +133,6 @@ public class Ntw20Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/ntw_20_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java index d6df891b9..7cdf34c89 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java @@ -10,7 +10,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -50,7 +49,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -public class JavelinItem extends GunItem implements GeoItem, AnimatedItem { +public class JavelinItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -193,10 +192,6 @@ public class JavelinItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/javelin_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java index 246133273..cdace2b47 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -45,7 +44,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -public class M79Item extends GunItem implements GeoItem, AnimatedItem { +public class M79Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -152,10 +151,6 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/m79_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java index 7bb9ad2d5..ea2c36e40 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -45,7 +44,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -public class RpgItem extends GunItem implements GeoItem, AnimatedItem { +public class RpgItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -161,10 +160,6 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/rpg_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java index 792971002..b472aa875 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.client.tooltip.component.SecondaryCataclysmIm import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -54,7 +53,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Supplier; -public class SecondaryCataclysm extends GunItem implements GeoItem, AnimatedItem { +public class SecondaryCataclysm extends GunItem implements GeoItem { private final Supplier energyCapacity; private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -252,10 +251,6 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, AnimatedItem return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/secondary_cataclysm_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java index 0368e28e8..98023d53d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -39,7 +38,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class DevotionItem extends GunItem implements GeoItem, AnimatedItem { +public class DevotionItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -117,10 +116,6 @@ public class DevotionItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/devotion_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java index b5f1e2a84..030a66419 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -41,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class M60Item extends GunItem implements GeoItem, AnimatedItem { +public class M60Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -146,10 +145,6 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { super.inventoryTick(stack, level, entity, slot, selected); } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/m60_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java index 3479b8d77..620fa721a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModParticleTypes; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.GunsTool; @@ -45,7 +44,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.function.Consumer; -public class MinigunItem extends GunItem implements GeoItem, AnimatedItem { +public class MinigunItem extends GunItem implements GeoItem { private static final String TAG_HEAT = "heat"; private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -191,10 +190,6 @@ public class MinigunItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/minigun_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java index d7cc3473b..b09848849 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -39,7 +38,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class RpkItem extends GunItem implements GeoItem, AnimatedItem { +public class RpkItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -118,10 +117,6 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/rpk_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java index 0fd7281cb..68a8482c5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -40,7 +39,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class AK12Item extends GunItem implements GeoItem, AnimatedItem { +public class AK12Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -160,10 +159,6 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(stack, world, entity, slot, selected); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java index 4afb91f42..47d115e8e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -41,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class AK47Item extends GunItem implements GeoItem, AnimatedItem { +public class AK47Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -169,10 +168,6 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(stack, world, entity, slot, selected); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java index addda095d..edb71d9ce 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -41,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { +public class Hk416Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -197,10 +196,6 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/hk416_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java index 2ae0aa161..82f948273 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -41,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class M4Item extends GunItem implements GeoItem, AnimatedItem { +public class M4Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -169,10 +168,6 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(stack, world, entity, slot, selected); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java index 259322ea1..97506df77 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -38,7 +37,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { +public class MarlinItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -152,10 +151,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/marlin_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java index d575c54cf..006e297f5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -41,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { +public class Mk14Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -195,10 +194,6 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/mk14ebr_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java index 56a334a6b..cc9c46cd6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -41,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { +public class Qbz95Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -198,10 +197,6 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/qbz95_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java index e0093b18e..e74590d50 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -40,7 +39,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class SksItem extends GunItem implements GeoItem, AnimatedItem { +public class SksItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -130,10 +129,6 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { super.inventoryTick(stack, level, entity, slot, selected); } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/sks_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java index 86d30e4a7..f8ea6a461 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java @@ -9,7 +9,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -43,7 +42,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { +public class Aa12Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; @@ -143,11 +142,6 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - this.animationProcedure = procedure; - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/aa_12_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java index 976629f7d..b6a3d6d45 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/AbekiriItem.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -42,7 +41,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem { +public class AbekiriItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -120,10 +119,6 @@ public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/abekiri_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java index 75f955a88..c95e1a72c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java @@ -8,7 +8,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -42,7 +41,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -public class M870Item extends GunItem implements GeoItem, AnimatedItem { +public class M870Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -154,10 +153,6 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/m870_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java index 4134d322c..64f16279d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -42,7 +41,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class VectorItem extends GunItem implements GeoItem, AnimatedItem { +public class VectorItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -172,10 +171,6 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { return Set.of(ModSounds.VECTOR_RELOAD_NORMAL.get(), ModSounds.VECTOR_RELOAD_EMPTY.get()); } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return new ResourceLocation(ModUtils.MODID, "textures/gun_icon/vector_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java index ca3d8774e..af0037b9c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -38,7 +37,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem { +public class HuntingRifleItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -112,10 +111,6 @@ public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/hunting_rifle_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java index f690caa86..3f22b110d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -37,7 +36,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class K98Item extends GunItem implements GeoItem, AnimatedItem { +public class K98Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -155,10 +154,6 @@ public class K98Item extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/k98_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java index 7087717dd..3312ac5d9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -38,7 +37,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class M98bItem extends GunItem implements GeoItem, AnimatedItem { +public class M98bItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -133,10 +132,6 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/m98b_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java index 8a8b48094..3fe046403 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -37,7 +36,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem { +public class MosinNagantItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -155,10 +154,6 @@ public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/mosin_nagant_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java index 7847f63d4..20eda7d62 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java @@ -9,7 +9,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -50,7 +49,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Supplier; -public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { +public class SentinelItem extends GunItem implements GeoItem { private final Supplier energyCapacity; @@ -210,10 +209,6 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/sentinel_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java index c069f0e59..2fa93d7aa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.perk.Perk; @@ -41,7 +40,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Set; import java.util.function.Consumer; -public class SvdItem extends GunItem implements GeoItem, AnimatedItem { +public class SvdItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -134,10 +133,6 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(stack, world, entity, slot, selected); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java index 629802eef..9f9ba28f1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java @@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.GunsTool; @@ -38,7 +37,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.Optional; import java.util.function.Consumer; -public class BocekItem extends GunItem implements GeoItem, AnimatedItem { +public class BocekItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public static ItemDisplayContext transformType; @@ -140,10 +139,6 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/bocek_icon.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java index 374e1a488..e3ada8c4a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java @@ -10,7 +10,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModPerks; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.init.ModTags; -import com.atsuishio.superbwarfare.item.AnimatedItem; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkHelper; @@ -52,7 +51,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Supplier; -public class TaserItem extends GunItem implements GeoItem, AnimatedItem { +public class TaserItem extends GunItem implements GeoItem { public static final int MAX_ENERGY = 6000; @@ -231,10 +230,6 @@ public class TaserItem extends GunItem implements GeoItem, AnimatedItem { return stack; } - @Override - public void setAnimationProcedure(String procedure) { - } - @Override public ResourceLocation getGunIcon() { return ModUtils.loc("textures/gun_icon/taser_icon.png");