diff --git a/src/main/java/net/mcreator/target/TargetMod.java b/src/main/java/net/mcreator/target/TargetMod.java index 0590afe22..b99081552 100644 --- a/src/main/java/net/mcreator/target/TargetMod.java +++ b/src/main/java/net/mcreator/target/TargetMod.java @@ -25,6 +25,7 @@ import java.util.function.Supplier; @Mod("target") public class TargetMod { public static final String MODID = "target"; + public static final String ATTRIBUTE_MODIFIER = "target_attribute_modifier"; public TargetMod() { MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/net/mcreator/target/client/layer/AK47Layer.java b/src/main/java/net/mcreator/target/client/layer/AK47Layer.java index b7d56cc9f..08d462645 100644 --- a/src/main/java/net/mcreator/target/client/layer/AK47Layer.java +++ b/src/main/java/net/mcreator/target/client/layer/AK47Layer.java @@ -2,7 +2,7 @@ package net.mcreator.target.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import net.mcreator.target.item.gun.AK47; +import net.mcreator.target.item.gun.AK47Item; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; @@ -11,15 +11,15 @@ import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; -public class AK47Layer extends GeoRenderLayer { +public class AK47Layer extends GeoRenderLayer { private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/ak47_e.png"); - public AK47Layer(GeoRenderer entityRenderer) { + public AK47Layer(GeoRenderer entityRenderer) { super(entityRenderer); } @Override - public void render(PoseStack poseStack, AK47 animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, AK47Item animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { RenderType glowRenderType = RenderType.eyes(LAYER); getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); } diff --git a/src/main/java/net/mcreator/target/client/layer/SksLayer.java b/src/main/java/net/mcreator/target/client/layer/SksLayer.java index c5ae04ca8..6e30e4660 100644 --- a/src/main/java/net/mcreator/target/client/layer/SksLayer.java +++ b/src/main/java/net/mcreator/target/client/layer/SksLayer.java @@ -2,7 +2,7 @@ package net.mcreator.target.client.layer; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import net.mcreator.target.item.gun.Sks; +import net.mcreator.target.item.gun.SksItem; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; @@ -11,15 +11,15 @@ import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; -public class SksLayer extends GeoRenderLayer { +public class SksLayer extends GeoRenderLayer { private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/sks_e.png"); - public SksLayer(GeoRenderer entityRenderer) { + public SksLayer(GeoRenderer entityRenderer) { super(entityRenderer); } @Override - public void render(PoseStack poseStack, Sks animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, SksItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { RenderType glowRenderType = RenderType.eyes(LAYER); getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); } diff --git a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java index 4621ee1d4..2f93452a4 100644 --- a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java @@ -1,6 +1,6 @@ package net.mcreator.target.client.model.item; -import net.mcreator.target.item.gun.AK47; +import net.mcreator.target.item.gun.AK47Item; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -10,24 +10,24 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; -public class AK47ItemModel extends GeoModel { +public class AK47ItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(AK47 animatable) { + public ResourceLocation getAnimationResource(AK47Item animatable) { return new ResourceLocation("target", "animations/ak.animation.json"); } @Override - public ResourceLocation getModelResource(AK47 animatable) { + public ResourceLocation getModelResource(AK47Item animatable) { return new ResourceLocation("target", "geo/ak.geo.json"); } @Override - public ResourceLocation getTextureResource(AK47 animatable) { + public ResourceLocation getTextureResource(AK47Item animatable) { return new ResourceLocation("target", "textures/item/ak47.png"); } @Override - public void setCustomAnimations(AK47 animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(AK47Item animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone scope = getAnimationProcessor().getBone("kobra"); diff --git a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java index fbeaa07b6..67de09cb5 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java @@ -1,6 +1,6 @@ package net.mcreator.target.client.model.item; -import net.mcreator.target.item.gun.Sks; +import net.mcreator.target.item.gun.SksItem; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -10,25 +10,25 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; -public class SksItemModel extends GeoModel { +public class SksItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(Sks animatable) { + public ResourceLocation getAnimationResource(SksItem animatable) { return new ResourceLocation("target", "animations/sks.animation.json"); } @Override - public ResourceLocation getModelResource(Sks animatable) { + public ResourceLocation getModelResource(SksItem animatable) { return new ResourceLocation("target", "geo/sks.geo.json"); } @Override - public ResourceLocation getTextureResource(Sks animatable) { + public ResourceLocation getTextureResource(SksItem animatable) { return new ResourceLocation("target", "textures/item/sks.png"); } @Override - public void setCustomAnimations(Sks animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(SksItem animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); CoreGeoBone bolt = getAnimationProcessor().getBone("bolt"); diff --git a/src/main/java/net/mcreator/target/client/renderer/item/AK47ItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/AK47ItemRenderer.java index f6d97bdb3..4e8934376 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/AK47ItemRenderer.java @@ -2,7 +2,7 @@ package net.mcreator.target.client.renderer.item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import net.mcreator.target.item.gun.AK47; +import net.mcreator.target.item.gun.AK47Item; import net.mcreator.target.client.layer.AK47Layer; import net.mcreator.target.client.model.item.AK47ItemModel; import net.minecraft.client.renderer.MultiBufferSource; @@ -16,14 +16,14 @@ import software.bernie.geckolib.renderer.GeoItemRenderer; import java.util.HashSet; import java.util.Set; -public class AK47ItemRenderer extends GeoItemRenderer { +public class AK47ItemRenderer extends GeoItemRenderer { public AK47ItemRenderer() { super(new AK47ItemModel()); this.addRenderLayer(new AK47Layer(this)); } @Override - public RenderType getRenderType(AK47 animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(AK47Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { return RenderType.entityTranslucent(getTextureLocation(animatable)); } @@ -32,7 +32,7 @@ public class AK47ItemRenderer extends GeoItemRenderer { protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; - protected AK47 animatable; + protected AK47Item animatable; private final Set hiddenBones = new HashSet<>(); private final Set suppressedBones = new HashSet<>(); @@ -45,7 +45,7 @@ public class AK47ItemRenderer extends GeoItemRenderer { } @Override - public void actuallyRender(PoseStack matrixStackIn, AK47 animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, AK47Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) { this.currentBuffer = renderTypeBuffer; this.renderType = type; @@ -57,7 +57,7 @@ public class AK47ItemRenderer extends GeoItemRenderer { } @Override - public ResourceLocation getTextureLocation(AK47 instance) { + public ResourceLocation getTextureLocation(AK47Item instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/net/mcreator/target/client/renderer/item/SksItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/SksItemRenderer.java index b4d4e8da6..96b6da37d 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/SksItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/SksItemRenderer.java @@ -2,7 +2,7 @@ package net.mcreator.target.client.renderer.item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import net.mcreator.target.item.gun.Sks; +import net.mcreator.target.item.gun.SksItem; import net.mcreator.target.client.layer.SksLayer; import net.mcreator.target.client.model.item.SksItemModel; import net.minecraft.client.renderer.MultiBufferSource; @@ -16,14 +16,14 @@ import software.bernie.geckolib.renderer.GeoItemRenderer; import java.util.HashSet; import java.util.Set; -public class SksItemRenderer extends GeoItemRenderer { +public class SksItemRenderer extends GeoItemRenderer { public SksItemRenderer() { super(new SksItemModel()); this.addRenderLayer(new SksLayer(this)); } @Override - public RenderType getRenderType(Sks animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(SksItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { return RenderType.entityTranslucent(getTextureLocation(animatable)); } @@ -32,7 +32,7 @@ public class SksItemRenderer extends GeoItemRenderer { protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; - protected Sks animatable; + protected SksItem animatable; private final Set hiddenBones = new HashSet<>(); private final Set suppressedBones = new HashSet<>(); @@ -45,7 +45,7 @@ public class SksItemRenderer extends GeoItemRenderer { } @Override - public void actuallyRender(PoseStack matrixStackIn, Sks animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, SksItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) { this.currentBuffer = renderTypeBuffer; this.renderType = type; @@ -57,7 +57,7 @@ public class SksItemRenderer extends GeoItemRenderer { } @Override - public ResourceLocation getTextureLocation(Sks instance) { + public ResourceLocation getTextureLocation(SksItem instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java b/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java index 91b2e14c4..3341739b3 100644 --- a/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java +++ b/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java @@ -52,12 +52,12 @@ public class ItemAnimationFactory { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getMainHandItem().getItem() instanceof AK47 animatable) + if (event.player.getMainHandItem().getItem() instanceof AK47Item animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getMainHandItem().getItem() instanceof Sks animatable) + if (event.player.getMainHandItem().getItem() instanceof SksItem animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); @@ -186,12 +186,12 @@ public class ItemAnimationFactory { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getOffhandItem().getItem() instanceof AK47 animatable) + if (event.player.getOffhandItem().getItem() instanceof AK47Item animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getOffhandItem().getItem() instanceof Sks animatable) + if (event.player.getOffhandItem().getItem() instanceof SksItem animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); diff --git a/src/main/java/net/mcreator/target/init/TargetModItems.java b/src/main/java/net/mcreator/target/init/TargetModItems.java index 64571b49c..8798e9892 100644 --- a/src/main/java/net/mcreator/target/init/TargetModItems.java +++ b/src/main/java/net/mcreator/target/init/TargetModItems.java @@ -30,8 +30,8 @@ public class TargetModItems { public static final RegistryObject ABEKIRI = GUNS.register("abekiri", Abekiri::new); public static final RegistryObject TRACHELIUM = GUNS.register("trachelium", Trachelium::new); public static final RegistryObject VECTOR = GUNS.register("vector", Vector::new); - public static final RegistryObject AK_47 = GUNS.register("ak_47", AK47::new); - public static final RegistryObject SKS = GUNS.register("sks", Sks::new); + public static final RegistryObject AK_47 = GUNS.register("ak_47", AK47Item::new); + public static final RegistryObject SKS = GUNS.register("sks", SksItem::new); public static final RegistryObject M_4 = GUNS.register("m_4", M4Item::new); public static final RegistryObject HK_416 = GUNS.register("hk_416", Hk416Item::new); public static final RegistryObject MK_14 = GUNS.register("mk_14", Mk14Item::new); diff --git a/src/main/java/net/mcreator/target/item/LightSaberItem.java b/src/main/java/net/mcreator/target/item/LightSaberItem.java index 9467fe44e..3faef1d6f 100644 --- a/src/main/java/net/mcreator/target/item/LightSaberItem.java +++ b/src/main/java/net/mcreator/target/item/LightSaberItem.java @@ -1,7 +1,8 @@ package net.mcreator.target.item; -import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.LightSaberItemRenderer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; @@ -27,13 +28,13 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class LightSaberItem extends Item implements GeoItem { +public class LightSaberItem extends SwordItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; public LightSaberItem() { - super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); + super(Tiers.NETHERITE, 10, -1.8f, new Item.Properties().rarity(Rarity.EPIC)); } @Override @@ -93,20 +94,16 @@ public class LightSaberItem extends Item implements GeoItem { @Override public Multimap getDefaultAttributeModifiers(EquipmentSlot equipmentSlot) { + Multimap map = super.getDefaultAttributeModifiers(equipmentSlot); UUID uuid = new UUID(equipmentSlot.toString().hashCode(), 0); if (equipmentSlot == EquipmentSlot.MAINHAND) { - ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); - builder.putAll(super.getDefaultAttributeModifiers(equipmentSlot)); - builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Item modifier", 14d, AttributeModifier.Operation.ADDITION)); - builder.put(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_UUID, "Item modifier", -1.8, AttributeModifier.Operation.ADDITION)); - builder.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(uuid, "henghengaaa", 0.2f, AttributeModifier.Operation.MULTIPLY_BASE)); + map = HashMultimap.create(map); + map.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, 0.2f, AttributeModifier.Operation.MULTIPLY_BASE)); - return builder.build(); } - return super.getDefaultAttributeModifiers(equipmentSlot); + return map; } - @Override public int getEnchantmentValue() { return 22; diff --git a/src/main/java/net/mcreator/target/item/gun/AK47.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java similarity index 98% rename from src/main/java/net/mcreator/target/item/gun/AK47.java rename to src/main/java/net/mcreator/target/item/gun/AK47Item.java index 0f76e485b..8decc4402 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class AK47 extends Item implements GeoItem { +public class AK47Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public AK47() { + public AK47Item() { super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } 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 faea7ab95..9a9396aab 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Aa12Item extends Item implements GeoItem { +public class Aa12Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 d0bd18d7a..53273c924 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Abekiri extends Item implements GeoItem { +public class Abekiri extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 062589a56..d033c68ce 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class BocekItem extends Item implements GeoItem { +public class BocekItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 360cc96d6..933f3b525 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Devotion extends Item implements GeoItem { +public class Devotion extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java new file mode 100644 index 000000000..7d3ab75e6 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java @@ -0,0 +1,18 @@ +package net.mcreator.target.item.gun; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +public class GunItem extends Item { + public GunItem(Properties properties) { + super(properties); + } + + @Override + public boolean canAttackBlock(BlockState p_41441_, Level p_41442_, BlockPos p_41443_, Player p_41444_) { + return false; + } +} 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 b8323b92e..490e1a5f3 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Hk416Item extends Item implements GeoItem { +public class Hk416Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 dc77a55cc..93dbc996b 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class HuntingRifle extends Item implements GeoItem { +public class HuntingRifle extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 08f6d6046..731540f96 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Kraber extends Item implements GeoItem { +public class Kraber extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 9cb1cd919..e93b6a42b 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M4Item extends Item implements GeoItem { +public class M4Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 75d59a202..59042032a 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M60Item extends Item implements GeoItem { +public class M60Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 5f94efb3b..ac306700a 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M79Item extends Item implements GeoItem { +public class M79Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 48636ad67..7165e5a67 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M870Item extends Item implements GeoItem { +public class M870Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 83fcc79d2..b2a1f2246 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class M98bItem extends Item implements GeoItem { +public class M98bItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 ea7fe8e3c..55943f2e0 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class MarlinItem extends Item implements GeoItem { +public class MarlinItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 e0143b48e..dad8c9f56 100644 --- a/src/main/java/net/mcreator/target/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Minigun extends Item implements GeoItem { +public class Minigun extends GunItem implements GeoItem { private static final String TAG_HEAT = "heatbar"; private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; 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 63ea2e39c..23832dc48 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Mk14Item extends Item implements GeoItem { +public class Mk14Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 b36c28302..09c6f657b 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -44,7 +44,7 @@ import java.util.UUID; import java.util.function.Consumer; import java.util.List; -public class RpgItem extends Item implements GeoItem { +public class RpgItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 217cabd2c..e43511d87 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -42,7 +42,7 @@ import net.mcreator.target.client.renderer.item.RpkItemRenderer; import java.util.function.Consumer; import java.util.List; -public class RpkItem extends Item implements GeoItem { +public class RpkItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; diff --git a/src/main/java/net/mcreator/target/item/gun/Sks.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java similarity index 98% rename from src/main/java/net/mcreator/target/item/gun/Sks.java rename to src/main/java/net/mcreator/target/item/gun/SksItem.java index d04234724..f6f357681 100644 --- a/src/main/java/net/mcreator/target/item/gun/Sks.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Sks extends Item implements GeoItem { +public class SksItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public Sks() { + public SksItem() { super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } 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 f89125f64..f6de9bfdb 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class SvdItem extends Item implements GeoItem { +public class SvdItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 f099e1716..bd83f4742 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Taser extends Item implements GeoItem { +public class Taser extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; 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 6d11e2912..47536e382 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -2,6 +2,7 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.TracheliumItemRenderer; import net.mcreator.target.procedures.ReloadingProcedure; import net.mcreator.target.tools.RarityTool; @@ -33,7 +34,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.UUID; import java.util.function.Consumer; -public class Trachelium extends Item implements GeoItem { +public class Trachelium extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; @@ -128,7 +129,7 @@ public class Trachelium extends Item implements GeoItem { if (slot == EquipmentSlot.MAINHAND) { map = HashMultimap.create(map); map.put(Attributes.MOVEMENT_SPEED, - new AttributeModifier(uuid, "henghengaaa", -0.02f, AttributeModifier.Operation.MULTIPLY_BASE)); + new AttributeModifier(uuid, TargetMod.ATTRIBUTE_MODIFIER, -0.02f, AttributeModifier.Operation.MULTIPLY_BASE)); } return map; } diff --git a/src/main/java/net/mcreator/target/item/gun/Vector.java b/src/main/java/net/mcreator/target/item/gun/Vector.java index ac9cab67b..d2e0a0205 100644 --- a/src/main/java/net/mcreator/target/item/gun/Vector.java +++ b/src/main/java/net/mcreator/target/item/gun/Vector.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class Vector extends Item implements GeoItem { +public class Vector extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; diff --git a/src/main/java/net/mcreator/target/procedures/QuxiaowafangkuaiProcedure.java b/src/main/java/net/mcreator/target/procedures/QuxiaowafangkuaiProcedure.java deleted file mode 100644 index 94ff4c824..000000000 --- a/src/main/java/net/mcreator/target/procedures/QuxiaowafangkuaiProcedure.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.GameType; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class QuxiaowafangkuaiProcedure { - @SubscribeEvent - public static void onLeftClickBlock(PlayerInteractEvent.LeftClickBlock event) { - if (event.getHand() != event.getEntity().getUsedItemHand()) - return; - execute(event, event.getEntity()); - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - if (entity instanceof Player player && !player.isCreative()) { - if (player.getMainHandItem().getItem() == TargetModItems.LIGHT_SABER.get()) { - if (event != null && event.isCancelable()) { - event.setCanceled(true); - } - } - } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun")))) { - if (event != null && event.isCancelable()) { - event.setCanceled(true); - } - } - } -}