diff --git a/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java b/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java index 51992e7fa..8051d1dd2 100644 --- a/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java +++ b/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java @@ -1,8 +1,6 @@ package net.mcreator.target.init; -import net.mcreator.target.item.*; -import net.mcreator.target.item.common.ammo.Rocket; -import net.mcreator.target.item.gun.*; +import net.mcreator.target.item.AnimatedItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemInHandRenderer; import net.minecraft.world.item.ArmorItem; @@ -27,281 +25,29 @@ public class ItemAnimationFactory { } } - @SubscribeEvent - public static void animatedItems(TickEvent.PlayerTickEvent event) { - String animation; - ItemStack mainHandItemStack = event.player.getMainHandItem(); - Item mainHandItem = mainHandItemStack.getItem(); - if (event.phase == TickEvent.Phase.START && (mainHandItem instanceof GeoItem || event.player.getOffhandItem().getItem() instanceof GeoItem)) { - if (!mainHandItemStack.getOrCreateTag().getString("geckoAnim").isEmpty() && !(mainHandItem instanceof ArmorItem)) { - animation = mainHandItemStack.getOrCreateTag().getString("geckoAnim"); - mainHandItemStack.getOrCreateTag().putString("geckoAnim", ""); + private static void setAnimationState(ItemStack itemStack, boolean isClientSide) { + if (itemStack.getOrCreateTag().getString("geckoAnim").isEmpty() && !(itemStack.getItem() instanceof ArmorItem)) { + String animation = itemStack.getOrCreateTag().getString("geckoAnim"); + itemStack.getOrCreateTag().putString("geckoAnim", ""); - if (mainHandItem instanceof Taser animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Abekiri animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Trachelium animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof VectorItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof AK47Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof SksItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof M4Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Hk416Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Mk14Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof MarlinItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof SvdItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof M98bItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof SentinelItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof HuntingRifle animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Kraber animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof M870Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Aa12Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Devotion animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof RpkItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof M60Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Minigun animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof M79Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof RpgItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof BocekItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof LightSaberItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (mainHandItem instanceof Rocket animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - } - if (!event.player.getOffhandItem().getOrCreateTag().getString("geckoAnim").equals("") && !(event.player.getOffhandItem().getItem() instanceof ArmorItem)) { - animation = event.player.getOffhandItem().getOrCreateTag().getString("geckoAnim"); - event.player.getOffhandItem().getOrCreateTag().putString("geckoAnim", ""); - if (event.player.getOffhandItem().getItem() instanceof Taser animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Abekiri animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Trachelium animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof VectorItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof AK47Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof SksItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof M4Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Hk416Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Mk14Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof MarlinItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof SvdItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof M98bItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof SentinelItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof HuntingRifle animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Kraber animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof M870Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Aa12Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Devotion animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof RpkItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof M60Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Minigun animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof M79Item animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof RpgItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof BocekItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof LightSaberItem animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } - if (event.player.getOffhandItem().getItem() instanceof Rocket animatable) - if (event.player.level().isClientSide()) { - animatable.animationProcedure = animation; - disableUseAnim(); - } + if (itemStack.getItem() instanceof AnimatedItem animatable && isClientSide) { + animatable.setAnimationProcedure(animation); + disableUseAnim(); } } } + + @SubscribeEvent + public static void animatedItems(TickEvent.PlayerTickEvent event) { + ItemStack mainHandItemStack = event.player.getMainHandItem(); + Item mainHandItem = mainHandItemStack.getItem(); + ItemStack offhandItemStack = event.player.getOffhandItem(); + Item offhandItem = offhandItemStack.getItem(); + + if (event.phase == TickEvent.Phase.START && (mainHandItem instanceof GeoItem || offhandItem instanceof GeoItem)) { + boolean isClientSide = event.player.level().isClientSide(); + setAnimationState(mainHandItemStack, isClientSide); + setAnimationState(offhandItemStack, isClientSide); + } + } } diff --git a/src/main/java/net/mcreator/target/item/AnimatedItem.java b/src/main/java/net/mcreator/target/item/AnimatedItem.java new file mode 100644 index 000000000..ec0ece7d8 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/AnimatedItem.java @@ -0,0 +1,5 @@ +package net.mcreator.target.item; + +public interface AnimatedItem { + void setAnimationProcedure(String procedure); +} diff --git a/src/main/java/net/mcreator/target/item/LightSaberItem.java b/src/main/java/net/mcreator/target/item/LightSaberItem.java index 5a29296f0..90790ffee 100644 --- a/src/main/java/net/mcreator/target/item/LightSaberItem.java +++ b/src/main/java/net/mcreator/target/item/LightSaberItem.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class LightSaberItem extends SwordItem implements GeoItem { +public class LightSaberItem extends SwordItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -118,4 +118,9 @@ public class LightSaberItem extends SwordItem implements GeoItem { public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { super.appendHoverText(itemstack, world, list, flag); } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java b/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java index 305c5ab16..ff7f4d825 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java @@ -3,6 +3,7 @@ package net.mcreator.target.item.common.ammo; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.RocketItemRenderer; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.RocketShiTiBeiGongJuJiZhongShiProcedure; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; @@ -26,7 +27,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; import java.util.function.Consumer; -public class Rocket extends Item implements GeoItem { +public class Rocket extends Item implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -113,4 +114,9 @@ public class Rocket extends Item implements GeoItem { RocketShiTiBeiGongJuJiZhongShiProcedure.execute(entity.level(), sourceentity); return retval; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index 3dbe7c38f..6fd164593 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.AK47ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class AK47Item extends GunItem implements GeoItem { +public class AK47Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -173,4 +173,8 @@ public class AK47Item extends GunItem implements GeoItem { return stack; } -} + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java index dbf4849d1..3df5cf283 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Aa12ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; @@ -41,7 +41,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Aa12Item extends GunItem implements GeoItem { +public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -178,4 +178,9 @@ public class Aa12Item extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java index 3abda7862..80b958ad2 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.AbekiriItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -37,7 +37,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Abekiri extends GunItem implements GeoItem { +public class Abekiri extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -164,4 +164,9 @@ public class Abekiri extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } } diff --git a/src/main/java/net/mcreator/target/item/gun/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java index 5fefe2e9d..d8776c2f4 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.BocekItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.BocekreloadProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class BocekItem extends GunItem implements GeoItem { +public class BocekItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -169,4 +169,9 @@ public class BocekItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index 35379002d..5390777fb 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.DevotionItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Devotion extends GunItem implements GeoItem { +public class Devotion extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -163,4 +163,9 @@ public class Devotion extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index 906389192..6bfa93694 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.Hk416ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Hk416Item extends GunItem implements GeoItem { +public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -172,4 +172,9 @@ public class Hk416Item extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index 3aca417ef..d45a63b79 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.HuntingRifleItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.HrrelodingProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class HuntingRifle extends GunItem implements GeoItem { +public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -158,4 +158,9 @@ public class HuntingRifle extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Kraber.java b/src/main/java/net/mcreator/target/item/gun/Kraber.java index 1f49a27e2..ff9652fb1 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.KraberItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; @@ -40,7 +40,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Kraber extends GunItem implements GeoItem { +public class Kraber extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -173,4 +173,9 @@ public class Kraber extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index bca5b0a16..3e4c14018 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.M4ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M4Item extends GunItem implements GeoItem { +public class M4Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -172,4 +172,9 @@ public class M4Item extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index f66f82f30..fbdf07ac5 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M60ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M60Item extends GunItem implements GeoItem { +public class M60Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -177,4 +177,9 @@ public class M60Item extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index 5d3bf10d9..b8cbe8873 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.M79ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M79Item extends GunItem implements GeoItem { +public class M79Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -177,4 +177,9 @@ public class M79Item extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M870Item.java b/src/main/java/net/mcreator/target/item/gun/M870Item.java index c8aa5bd75..954cf521c 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M870ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -37,7 +37,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M870Item extends GunItem implements GeoItem { +public class M870Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -182,4 +182,9 @@ public class M870Item extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index 90543a7ea..960eee6c1 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.M98bItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M98bItem extends GunItem implements GeoItem { +public class M98bItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -168,4 +168,9 @@ public class M98bItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java index fd92b425b..f3b86540a 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.MarlinItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class MarlinItem extends GunItem implements GeoItem { +public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -189,4 +189,9 @@ public class MarlinItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Minigun.java b/src/main/java/net/mcreator/target/item/gun/Minigun.java index 522fe0e0a..f96245486 100644 --- a/src/main/java/net/mcreator/target/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.MinigunItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.MiniguninbackpackProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; @@ -42,7 +42,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Minigun extends GunItem implements GeoItem { +public class Minigun extends GunItem implements GeoItem, AnimatedItem { private static final String TAG_HEAT = "heatbar"; private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; @@ -190,5 +190,9 @@ public class Minigun extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index 1d7e348ec..7e3deb2ed 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Mk14ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Mk14Item extends GunItem implements GeoItem { +public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -173,4 +173,9 @@ public class Mk14Item extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index 10b4aa2a3..92db2d877 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.RpgItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -37,7 +37,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class RpgItem extends GunItem implements GeoItem { +public class RpgItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -180,4 +180,9 @@ public class RpgItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index fc94cfcb3..55bfb57ec 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.RpkItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class RpkItem extends GunItem implements GeoItem { +public class RpkItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -173,4 +173,9 @@ public class RpkItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index 2b0480cb6..6cc951250 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.SentinelItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; @@ -40,7 +40,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class SentinelItem extends GunItem implements GeoItem { +public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { private static final String TAG_POWER = "power"; private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; @@ -201,4 +201,9 @@ public class SentinelItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index 36720c846..1cbc5101d 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -4,8 +4,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.SksItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class SksItem extends GunItem implements GeoItem { +public class SksItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -164,4 +164,9 @@ public class SksItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index fca262d4f..30c34deb1 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.SvdItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class SvdItem extends GunItem implements GeoItem { +public class SvdItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -166,4 +166,9 @@ public class SvdItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index ada9c85b8..2d06ab25f 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.TaserItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.TasercooldownProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -37,7 +37,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Taser extends GunItem implements GeoItem { +public class Taser extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -179,4 +179,9 @@ public class Taser extends GunItem implements GeoItem { //GunsTool.initGun(stack, TargetModItems.TASER.getId().getPath()); return stack; } + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } } diff --git a/src/main/java/net/mcreator/target/item/gun/Trachelium.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java index 284c389b7..1caa8721c 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.TracheliumItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.ReloadingProcedure; import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.TooltipTool; @@ -41,7 +42,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Trachelium extends GunItem implements GeoItem { +public class Trachelium extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -168,4 +169,9 @@ public class Trachelium extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/item/gun/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/VectorItem.java index 6e7fcbdcd..a703f0ad8 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java @@ -5,8 +5,8 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.VectorItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class VectorItem extends GunItem implements GeoItem { +public class VectorItem extends GunItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; @@ -177,4 +177,9 @@ public class VectorItem extends GunItem implements GeoItem { stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; } -} + + @Override + public void setAnimationProcedure(String procedure) { + this.animationProcedure = procedure; + } +} \ No newline at end of file