diff --git a/src/main/java/net/mcreator/target/TargetMod.java b/src/main/java/net/mcreator/target/TargetMod.java index 76f643303..10594eafb 100644 --- a/src/main/java/net/mcreator/target/TargetMod.java +++ b/src/main/java/net/mcreator/target/TargetMod.java @@ -1,16 +1,3 @@ -/* - * MCreator note: - * - * If you lock base mod element files, you can edit this file and it won't get overwritten. - * If you change your modid or package, you need to apply these changes to this file MANUALLY. - * - * Settings in @Mod annotation WON'T be changed in case of the base mod element - * files lock too, so you need to set them manually here in such case. - * - * If you do not lock base mod element files in Workspace settings, this file - * will be REGENERATED on each build. - * - */ package net.mcreator.target; import net.mcreator.target.init.*; @@ -48,7 +35,7 @@ public class TargetMod { TargetModSounds.REGISTRY.register(bus); TargetModBlocks.REGISTRY.register(bus); - TargetModItems.REGISTRY.register(bus); + ItemRegistry.ITEMS.register(bus); TargetModEntities.REGISTRY.register(bus); TargetCustomModEntities.ENTITY_TYPES.register(bus); 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 08d462645..b7d56cc9f 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.AK47Item; +import net.mcreator.target.item.gun.AK47; 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, AK47Item animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, AK47 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/AbekiriLayer.java b/src/main/java/net/mcreator/target/client/layer/AbekiriLayer.java index 9742762a0..5402c82b0 100644 --- a/src/main/java/net/mcreator/target/client/layer/AbekiriLayer.java +++ b/src/main/java/net/mcreator/target/client/layer/AbekiriLayer.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.AbekiriItem; +import net.mcreator.target.item.gun.Abekiri; 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 AbekiriLayer extends GeoRenderLayer { +public class AbekiriLayer extends GeoRenderLayer { private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/abekiri_e.png"); - public AbekiriLayer(GeoRenderer entityRenderer) { + public AbekiriLayer(GeoRenderer entityRenderer) { super(entityRenderer); } @Override - public void render(PoseStack poseStack, AbekiriItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, Abekiri 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 6e30e4660..c5ae04ca8 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.SksItem; +import net.mcreator.target.item.gun.Sks; 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, SksItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, Sks 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/TracheliumLayer.java b/src/main/java/net/mcreator/target/client/layer/TracheliumLayer.java index 24ecdffca..27baa8615 100644 --- a/src/main/java/net/mcreator/target/client/layer/TracheliumLayer.java +++ b/src/main/java/net/mcreator/target/client/layer/TracheliumLayer.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.TracheliumItem; +import net.mcreator.target.item.gun.Trachelium; 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 TracheliumLayer extends GeoRenderLayer { +public class TracheliumLayer extends GeoRenderLayer { private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/trachelium_texture_e.png"); - public TracheliumLayer(GeoRenderer entityRenderer) { + public TracheliumLayer(GeoRenderer entityRenderer) { super(entityRenderer); } @Override - public void render(PoseStack poseStack, TracheliumItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, Trachelium 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/VectorLayer.java b/src/main/java/net/mcreator/target/client/layer/VectorLayer.java index 4a9f93df8..cfba0783e 100644 --- a/src/main/java/net/mcreator/target/client/layer/VectorLayer.java +++ b/src/main/java/net/mcreator/target/client/layer/VectorLayer.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.VectorItem; +import net.mcreator.target.item.gun.Vector; 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 VectorLayer extends GeoRenderLayer { +public class VectorLayer extends GeoRenderLayer { private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/vector_e.png"); - public VectorLayer(GeoRenderer entityRenderer) { + public VectorLayer(GeoRenderer entityRenderer) { super(entityRenderer); } @Override - public void render(PoseStack poseStack, VectorItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, Vector 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 2f93452a4..4621ee1d4 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.AK47Item; +import net.mcreator.target.item.gun.AK47; 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(AK47Item animatable) { + public ResourceLocation getAnimationResource(AK47 animatable) { return new ResourceLocation("target", "animations/ak.animation.json"); } @Override - public ResourceLocation getModelResource(AK47Item animatable) { + public ResourceLocation getModelResource(AK47 animatable) { return new ResourceLocation("target", "geo/ak.geo.json"); } @Override - public ResourceLocation getTextureResource(AK47Item animatable) { + public ResourceLocation getTextureResource(AK47 animatable) { return new ResourceLocation("target", "textures/item/ak47.png"); } @Override - public void setCustomAnimations(AK47Item animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(AK47 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/AbekiriItemModel.java b/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java index 9259c27e1..53119b7a7 100644 --- a/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/AbekiriItemModel.java @@ -1,6 +1,6 @@ package net.mcreator.target.client.model.item; -import net.mcreator.target.item.gun.AbekiriItem; +import net.mcreator.target.item.gun.Abekiri; 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 AbekiriItemModel extends GeoModel { +public class AbekiriItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(AbekiriItem animatable) { + public ResourceLocation getAnimationResource(Abekiri animatable) { return new ResourceLocation("target", "animations/abekiri.animation.json"); } @Override - public ResourceLocation getModelResource(AbekiriItem animatable) { + public ResourceLocation getModelResource(Abekiri animatable) { return new ResourceLocation("target", "geo/abekiri.geo.json"); } @Override - public ResourceLocation getTextureResource(AbekiriItem animatable) { + public ResourceLocation getTextureResource(Abekiri animatable) { return new ResourceLocation("target", "textures/item/abekiri.png"); } @Override - public void setCustomAnimations(AbekiriItem animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(Abekiri animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); 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 67de09cb5..fbeaa07b6 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.SksItem; +import net.mcreator.target.item.gun.Sks; 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(SksItem animatable) { + public ResourceLocation getAnimationResource(Sks animatable) { return new ResourceLocation("target", "animations/sks.animation.json"); } @Override - public ResourceLocation getModelResource(SksItem animatable) { + public ResourceLocation getModelResource(Sks animatable) { return new ResourceLocation("target", "geo/sks.geo.json"); } @Override - public ResourceLocation getTextureResource(SksItem animatable) { + public ResourceLocation getTextureResource(Sks animatable) { return new ResourceLocation("target", "textures/item/sks.png"); } @Override - public void setCustomAnimations(SksItem animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(Sks 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/model/item/TaserItemModel.java b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java index fdfd263aa..6ed07aa46 100644 --- a/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java @@ -1,6 +1,6 @@ package net.mcreator.target.client.model.item; -import net.mcreator.target.item.gun.TaserItem; +import net.mcreator.target.item.gun.Taser; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; @@ -8,24 +8,24 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; -public class TaserItemModel extends GeoModel { +public class TaserItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(TaserItem animatable) { + public ResourceLocation getAnimationResource(Taser animatable) { return new ResourceLocation("target", "animations/taser.animation.json"); } @Override - public ResourceLocation getModelResource(TaserItem animatable) { + public ResourceLocation getModelResource(Taser animatable) { return new ResourceLocation("target", "geo/taser.geo.json"); } @Override - public ResourceLocation getTextureResource(TaserItem animatable) { + public ResourceLocation getTextureResource(Taser animatable) { return new ResourceLocation("target", "textures/item/tasergun.png"); } @Override - public void setCustomAnimations(TaserItem animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(Taser animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); diff --git a/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java b/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java index b5e64b03c..a79084d80 100644 --- a/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/TracheliumItemModel.java @@ -1,6 +1,6 @@ package net.mcreator.target.client.model.item; -import net.mcreator.target.item.gun.TracheliumItem; +import net.mcreator.target.item.gun.Trachelium; 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 TracheliumItemModel extends GeoModel { +public class TracheliumItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(TracheliumItem animatable) { + public ResourceLocation getAnimationResource(Trachelium animatable) { return new ResourceLocation("target", "animations/trachelium.animation.json"); } @Override - public ResourceLocation getModelResource(TracheliumItem animatable) { + public ResourceLocation getModelResource(Trachelium animatable) { return new ResourceLocation("target", "geo/trachelium.geo.json"); } @Override - public ResourceLocation getTextureResource(TracheliumItem animatable) { + public ResourceLocation getTextureResource(Trachelium animatable) { return new ResourceLocation("target", "textures/item/trachelium_texture.png"); } @Override - public void setCustomAnimations(TracheliumItem animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(Trachelium animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); diff --git a/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java b/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java index 6aed6daa1..607b2b652 100644 --- a/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/VectorItemModel.java @@ -1,6 +1,6 @@ package net.mcreator.target.client.model.item; -import net.mcreator.target.item.gun.VectorItem; +import net.mcreator.target.item.gun.Vector; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -9,24 +9,24 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; -public class VectorItemModel extends GeoModel { +public class VectorItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(VectorItem animatable) { + public ResourceLocation getAnimationResource(Vector animatable) { return new ResourceLocation("target", "animations/vector.animation.json"); } @Override - public ResourceLocation getModelResource(VectorItem animatable) { + public ResourceLocation getModelResource(Vector animatable) { return new ResourceLocation("target", "geo/vector.geo.json"); } @Override - public ResourceLocation getTextureResource(VectorItem animatable) { + public ResourceLocation getTextureResource(Vector animatable) { return new ResourceLocation("target", "textures/item/vector.png"); } @Override - public void setCustomAnimations(VectorItem animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(Vector animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone scope = getAnimationProcessor().getBone("scope"); 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 4e8934376..f6d97bdb3 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.AK47Item; +import net.mcreator.target.item.gun.AK47; 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(AK47Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(AK47 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 AK47Item animatable; + protected AK47 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, AK47Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, AK47 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(AK47Item instance) { + public ResourceLocation getTextureLocation(AK47 instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/net/mcreator/target/client/renderer/item/AbekiriItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/AbekiriItemRenderer.java index 55c3ee035..d6bd3ec8c 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/AbekiriItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/AbekiriItemRenderer.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.AbekiriItem; +import net.mcreator.target.item.gun.Abekiri; import net.mcreator.target.client.layer.AbekiriLayer; import net.mcreator.target.client.model.item.AbekiriItemModel; 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 AbekiriItemRenderer extends GeoItemRenderer { +public class AbekiriItemRenderer extends GeoItemRenderer { public AbekiriItemRenderer() { super(new AbekiriItemModel()); this.addRenderLayer(new AbekiriLayer(this)); } @Override - public RenderType getRenderType(AbekiriItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(Abekiri animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { return RenderType.entityTranslucent(getTextureLocation(animatable)); } @@ -32,7 +32,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; - protected AbekiriItem animatable; + protected Abekiri animatable; private final Set hiddenBones = new HashSet<>(); private final Set suppressedBones = new HashSet<>(); @@ -45,7 +45,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { } @Override - public void actuallyRender(PoseStack matrixStackIn, AbekiriItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, Abekiri 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 AbekiriItemRenderer extends GeoItemRenderer { } @Override - public ResourceLocation getTextureLocation(AbekiriItem instance) { + public ResourceLocation getTextureLocation(Abekiri 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 96b6da37d..b4d4e8da6 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.SksItem; +import net.mcreator.target.item.gun.Sks; 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(SksItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(Sks 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 SksItem animatable; + protected Sks 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, SksItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, Sks 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(SksItem instance) { + public ResourceLocation getTextureLocation(Sks instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.java index bc0f4353b..f7fb71bc7 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.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.TaserItem; +import net.mcreator.target.item.gun.Taser; import net.mcreator.target.client.model.item.TaserItemModel; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -15,13 +15,13 @@ import software.bernie.geckolib.renderer.GeoItemRenderer; import java.util.HashSet; import java.util.Set; -public class TaserItemRenderer extends GeoItemRenderer { +public class TaserItemRenderer extends GeoItemRenderer { public TaserItemRenderer() { super(new TaserItemModel()); } @Override - public RenderType getRenderType(TaserItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(Taser animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { return RenderType.entityTranslucent(getTextureLocation(animatable)); } @@ -30,7 +30,7 @@ public class TaserItemRenderer extends GeoItemRenderer { protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; - protected TaserItem animatable; + protected Taser animatable; private final Set hiddenBones = new HashSet<>(); private final Set suppressedBones = new HashSet<>(); @@ -43,7 +43,7 @@ public class TaserItemRenderer extends GeoItemRenderer { } @Override - public void actuallyRender(PoseStack matrixStackIn, TaserItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, Taser 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; @@ -55,7 +55,7 @@ public class TaserItemRenderer extends GeoItemRenderer { } @Override - public ResourceLocation getTextureLocation(TaserItem instance) { + public ResourceLocation getTextureLocation(Taser instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/net/mcreator/target/client/renderer/item/TracheliumItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/TracheliumItemRenderer.java index 9914a03da..9abcf6a27 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/TracheliumItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/TracheliumItemRenderer.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.TracheliumItem; +import net.mcreator.target.item.gun.Trachelium; import net.mcreator.target.client.layer.TracheliumLayer; import net.mcreator.target.client.model.item.TracheliumItemModel; 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 TracheliumItemRenderer extends GeoItemRenderer { +public class TracheliumItemRenderer extends GeoItemRenderer { public TracheliumItemRenderer() { super(new TracheliumItemModel()); this.addRenderLayer(new TracheliumLayer(this)); } @Override - public RenderType getRenderType(TracheliumItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(Trachelium animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { return RenderType.entityTranslucent(getTextureLocation(animatable)); } @@ -32,7 +32,7 @@ public class TracheliumItemRenderer extends GeoItemRenderer { protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; - protected TracheliumItem animatable; + protected Trachelium animatable; private final Set hiddenBones = new HashSet<>(); private final Set suppressedBones = new HashSet<>(); @@ -45,7 +45,7 @@ public class TracheliumItemRenderer extends GeoItemRenderer { } @Override - public void actuallyRender(PoseStack matrixStackIn, TracheliumItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, Trachelium 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 TracheliumItemRenderer extends GeoItemRenderer { } @Override - public ResourceLocation getTextureLocation(TracheliumItem instance) { + public ResourceLocation getTextureLocation(Trachelium instance) { return super.getTextureLocation(instance); } } \ No newline at end of file diff --git a/src/main/java/net/mcreator/target/client/renderer/item/VectorItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/VectorItemRenderer.java index c6ed9d3d4..bbddb5866 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/VectorItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/VectorItemRenderer.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.VectorItem; +import net.mcreator.target.item.gun.Vector; import net.mcreator.target.client.layer.VectorLayer; import net.mcreator.target.client.model.item.VectorItemModel; 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 VectorItemRenderer extends GeoItemRenderer { +public class VectorItemRenderer extends GeoItemRenderer { public VectorItemRenderer() { super(new VectorItemModel()); this.addRenderLayer(new VectorLayer(this)); } @Override - public RenderType getRenderType(VectorItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(Vector animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { return RenderType.entityTranslucent(getTextureLocation(animatable)); } @@ -32,7 +32,7 @@ public class VectorItemRenderer extends GeoItemRenderer { protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; - protected VectorItem animatable; + protected Vector animatable; private final Set hiddenBones = new HashSet<>(); private final Set suppressedBones = new HashSet<>(); @@ -45,7 +45,7 @@ public class VectorItemRenderer extends GeoItemRenderer { } @Override - public void actuallyRender(PoseStack matrixStackIn, VectorItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + public void actuallyRender(PoseStack matrixStackIn, Vector 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 VectorItemRenderer extends GeoItemRenderer { } @Override - public ResourceLocation getTextureLocation(VectorItem instance) { + public ResourceLocation getTextureLocation(Vector instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java index 53e566b9d..e4f9a3cee 100644 --- a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java @@ -6,7 +6,7 @@ import net.mcreator.target.init.TargetCustomModEntities; import net.mcreator.target.init.TargetModDamageTypes; import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.network.TargetModVariables; -import net.mcreator.target.util.math.ExtendedEntityRayTraceResult; +import net.mcreator.target.tools.ExtendedEntityRayTraceResult; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; diff --git a/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java b/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java index a6a54d198..0b6d7faed 100644 --- a/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java +++ b/src/main/java/net/mcreator/target/init/ItemAnimationFactory.java @@ -32,32 +32,32 @@ public class ItemAnimationFactory { if (!event.player.getMainHandItem().getOrCreateTag().getString("geckoAnim").isEmpty() && !(event.player.getMainHandItem().getItem() instanceof ArmorItem)) { animation = event.player.getMainHandItem().getOrCreateTag().getString("geckoAnim"); event.player.getMainHandItem().getOrCreateTag().putString("geckoAnim", ""); - if (event.player.getMainHandItem().getItem() instanceof TaserItem animatable) + if (event.player.getMainHandItem().getItem() instanceof Taser animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getMainHandItem().getItem() instanceof AbekiriItem animatable) + if (event.player.getMainHandItem().getItem() instanceof Abekiri animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getMainHandItem().getItem() instanceof TracheliumItem animatable) + if (event.player.getMainHandItem().getItem() instanceof Trachelium animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getMainHandItem().getItem() instanceof VectorItem animatable) + if (event.player.getMainHandItem().getItem() instanceof Vector animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getMainHandItem().getItem() instanceof AK47Item animatable) + if (event.player.getMainHandItem().getItem() instanceof AK47 animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getMainHandItem().getItem() instanceof SksItem animatable) + if (event.player.getMainHandItem().getItem() instanceof Sks animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); @@ -166,32 +166,32 @@ public class ItemAnimationFactory { 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 TaserItem animatable) + if (event.player.getOffhandItem().getItem() instanceof Taser animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getOffhandItem().getItem() instanceof AbekiriItem animatable) + if (event.player.getOffhandItem().getItem() instanceof Abekiri animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getOffhandItem().getItem() instanceof TracheliumItem animatable) + 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.getOffhandItem().getItem() instanceof Vector animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getOffhandItem().getItem() instanceof AK47Item animatable) + if (event.player.getOffhandItem().getItem() instanceof AK47 animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); } - if (event.player.getOffhandItem().getItem() instanceof SksItem animatable) + if (event.player.getOffhandItem().getItem() instanceof Sks animatable) if (event.player.level().isClientSide()) { animatable.animationprocedure = animation; disableUseAnim(); diff --git a/src/main/java/net/mcreator/target/init/ItemRegistry.java b/src/main/java/net/mcreator/target/init/ItemRegistry.java new file mode 100644 index 000000000..0edc517c6 --- /dev/null +++ b/src/main/java/net/mcreator/target/init/ItemRegistry.java @@ -0,0 +1,152 @@ +package net.mcreator.target.init; + +import net.mcreator.target.TargetMod; +import net.mcreator.target.item.*; +import net.mcreator.target.item.common.BuckshotItem; +import net.mcreator.target.item.common.ammo.*; +import net.mcreator.target.item.common.blueprint.*; +import net.mcreator.target.item.common.material.*; +import net.mcreator.target.item.common.material.component.*; +import net.mcreator.target.item.common.material.pack.*; +import net.mcreator.target.item.gun.*; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.ForgeSpawnEggItem; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ItemRegistry { + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TargetMod.MODID); + + /** + * guns + */ + public static final RegistryObject TASER = ITEMS.register("taser", Taser::new); + public static final RegistryObject ABEKIRI = ITEMS.register("abekiri", Abekiri::new); + public static final RegistryObject TRACHELIUM = ITEMS.register("trachelium", Trachelium::new); + public static final RegistryObject VECTOR = ITEMS.register("vector", Vector::new); + public static final RegistryObject AK_47 = ITEMS.register("ak_47", AK47::new); + public static final RegistryObject SKS = ITEMS.register("sks", Sks::new); + public static final RegistryObject M_4 = ITEMS.register("m_4", M4Item::new); + public static final RegistryObject HK_416 = ITEMS.register("hk_416", Hk416Item::new); + public static final RegistryObject MK_14 = ITEMS.register("mk_14", Mk14Item::new); + public static final RegistryObject MARLIN = ITEMS.register("marlin", MarlinItem::new); + public static final RegistryObject SVD = ITEMS.register("svd", SvdItem::new); + public static final RegistryObject M_98B = ITEMS.register("m_98b", M98bItem::new); + public static final RegistryObject SENTINEL = ITEMS.register("sentinel", SentinelItem::new); + public static final RegistryObject HUNTING_RIFLE = ITEMS.register("hunting_rifle", HuntingRifleItem::new); + public static final RegistryObject KRABER = ITEMS.register("kraber", KraberItem::new); + public static final RegistryObject M_870 = ITEMS.register("m_870", M870Item::new); + public static final RegistryObject AA_12 = ITEMS.register("aa_12", Aa12Item::new); + public static final RegistryObject DEVOTION = ITEMS.register("devotion", DevotionItem::new); + public static final RegistryObject RPK = ITEMS.register("rpk", RpkItem::new); + public static final RegistryObject M_60 = ITEMS.register("m_60", M60Item::new); + public static final RegistryObject MINIGUN = ITEMS.register("minigun", MinigunItem::new); + public static final RegistryObject M_79 = ITEMS.register("m_79", M79Item::new); + public static final RegistryObject RPG = ITEMS.register("rpg", RpgItem::new); + public static final RegistryObject BOCEK = ITEMS.register("bocek", BocekItem::new); + + + public static final RegistryObject SENPAI_SPAWN_EGG = ITEMS.register("senpai_spawn_egg", () -> new ForgeSpawnEggItem(TargetModEntities.SENPAI, -11584987, -14014413, new Item.Properties())); + public static final RegistryObject TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetdeployerItem::new); + public static final RegistryObject SANDBAG = block(TargetModBlocks.SANDBAG); + public static final RegistryObject BARBED_WIRE = block(TargetModBlocks.BARBED_WIRE); + public static final RegistryObject CLAYMORE_MINE = ITEMS.register("claymore_mine", ClaymoreMineItem::new); + public static final RegistryObject JUMPPAD_BLOCK = block(TargetModBlocks.JUMPPAD_BLOCK); + public static final RegistryObject LIGHT_SABER = ITEMS.register("light_saber", LightSaberItem::new); + public static final RegistryObject HAMMER = ITEMS.register("hammer", HammerItem::new); + public static final RegistryObject MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployerItem::new); + public static final RegistryObject MORTAR_BARREL = ITEMS.register("mortar_barrel", MortarBarrelItem::new); + public static final RegistryObject MORTAR_BASE_PLATE = ITEMS.register("mortar_base_plate", MortarBasePlateItem::new); + public static final RegistryObject MORTAR_BIPOD = ITEMS.register("mortar_bipod", MortarBipodItem::new); + public static final RegistryObject FUSEE = ITEMS.register("fusee", FuseeItem::new); + public static final RegistryObject SOUL_STEEL_NUGGET = ITEMS.register("soul_steel_nugget", SoulSteelNugget::new); + public static final RegistryObject COPPERPLATE = ITEMS.register("copperplate", CopperplateItem::new); + public static final RegistryObject INGOT_STEEL = ITEMS.register("ingot_steel", IngotSteelItem::new); + public static final RegistryObject LEAD_INGOT = ITEMS.register("lead_ingot", LeadIngotItem::new); + public static final RegistryObject TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", TungstenIngotItem::new); + public static final RegistryObject CEMENTED_CARBIDE_INGOT = ITEMS.register("cemented_carbide_ingot", CementedCarbideIngotItem::new); + public static final RegistryObject SOUL_STEEL_INGOT = ITEMS.register("soul_steel_ingot", SoulSteelIngot::new); + public static final RegistryObject IRON_POWDER = ITEMS.register("iron_powder", IronPowder::new); + public static final RegistryObject TUNGSTEN_POWDER = ITEMS.register("tungsten_powder", TungstenPowder::new); + public static final RegistryObject COAL_POWDER = ITEMS.register("coal_powder", CoalPowder::new); + public static final RegistryObject COAL_IRON_POWDER = ITEMS.register("coal_iron_powder", CoalIronPowder::new); + public static final RegistryObject RAW_CEMENTED_CARBIDE_POWDER = ITEMS.register("raw_cemented_carbide_powder", RawCementedCarbidePowder::new); + public static final RegistryObject GALENA_ORE = block(TargetModBlocks.GALENA_ORE); + public static final RegistryObject DEEPSLATE_GALENA_ORE = block(TargetModBlocks.DEEPSLATE_GALENA_ORE); + public static final RegistryObject SCHEELITE_ORE = block(TargetModBlocks.SCHEELITE_ORE); + public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = block(TargetModBlocks.DEEPSLATE_SCHEELITE_ORE); + public static final RegistryObject GALENA = ITEMS.register("galena", GalenaItem::new); + public static final RegistryObject SCHEELITE = ITEMS.register("scheelite", ScheeliteItem::new); + public static final RegistryObject BUCKSHOT = ITEMS.register("buckshot", BuckshotItem::new); + + public static final RegistryObject IRON_BARREL = ITEMS.register("iron_barrel", IronBarrelItem::new); + public static final RegistryObject IRON_ACTION = ITEMS.register("iron_action", IronActionItem::new); + public static final RegistryObject IRON_TRIGGER = ITEMS.register("iron_trigger", IronTriggerItem::new); + public static final RegistryObject IRON_SPRING = ITEMS.register("iron_spring", IronSpringItem::new); + public static final RegistryObject STEEL_BARREL = ITEMS.register("steel_barrel", SteelBarrelItem::new); + public static final RegistryObject STEEL_ACTION = ITEMS.register("steel_action", SteelActionItem::new); + public static final RegistryObject STEEL_TRIGGER = ITEMS.register("steel_trigger", SteelTriggerItem::new); + public static final RegistryObject STEEL_SPRING = ITEMS.register("steel_spring", SteelSpringItem::new); + public static final RegistryObject CEMENTED_CARBIDE_BARREL = ITEMS.register("cemented_carbide_barrel", CementedCarbideBarrelItem::new); + public static final RegistryObject CEMENTED_CARBIDE_ACTION = ITEMS.register("cemented_carbide_action", CementedCarbideActionItem::new); + public static final RegistryObject CEMENTED_CARBIDE_TRIGGER = ITEMS.register("cemented_carbide_trigger", CementedCarbideTriggerItem::new); + public static final RegistryObject CEMENTED_CARBIDE_SPRING = ITEMS.register("cemented_carbide_spring", CementedCarbideSpringItem::new); + public static final RegistryObject NETHERITE_BARREL = ITEMS.register("netherite_barrel", NetheriteBarrelItem::new); + public static final RegistryObject NETHERITE_ACTION = ITEMS.register("netherite_action", NetheriteActionItem::new); + public static final RegistryObject NETHERITE_TRIGGER = ITEMS.register("netherite_trigger", NetheriteTriggerItem::new); + public static final RegistryObject NETHERITE_SPRING = ITEMS.register("netherite_spring", NetheriteSpringItem::new); + + public static final RegistryObject COMMON_MATERIAL_PACK = ITEMS.register("common_material_pack", CommonMaterialPack::new); + public static final RegistryObject RARE_MATERIAL_PACK = ITEMS.register("rare_material_pack", RareMaterialPack::new); + public static final RegistryObject EPIC_MATERIAL_PACK = ITEMS.register("epic_material_pack", EpicMaterialPack::new); + public static final RegistryObject LEGENDARY_MATERIAL_PACK = ITEMS.register("legendary_material_pack", LegendaryMaterialPack::new); + public static final RegistryObject SPECIAL_MATERIAL_PACK = ITEMS.register("special_material_pack", SpecialMaterialPack::new); + public static final RegistryObject TRACHELIUM_BLUEPRINT = ITEMS.register("trachelium_blueprint", TracheliumBlueprint::new); + public static final RegistryObject HUNTING_RIFLE_BLUEPRINT = ITEMS.register("hunting_rifle_blueprint", HuntingRifleBlueprint::new); + public static final RegistryObject M_79_BLUEPRINT = ITEMS.register("m_79_blueprint", M79Blueprint::new); + public static final RegistryObject RPG_BLUEPRINT = ITEMS.register("rpg_blueprint", RpgBlueprint::new); + public static final RegistryObject BOCEK_BLUEPRINT = ITEMS.register("bocek_blueprint", BocekBlueprint::new); + public static final RegistryObject M_4_BLUEPRINT = ITEMS.register("m_4_blueprint", M4Blueprint::new); + public static final RegistryObject AA_12_BLUEPRINT = ITEMS.register("aa_12_blueprint", Aa12Blueprint::new); + public static final RegistryObject HK_416_BLUEPRINT = ITEMS.register("hk_416_blueprint", HK416Blueprint::new); + public static final RegistryObject RPK_BLUEPRINT = ITEMS.register("rpk_blueprint", RPKBlueprint::new); + public static final RegistryObject SKS_BLUEPRINT = ITEMS.register("sks_blueprint", SKSBlueprint::new); + public static final RegistryObject KRABER_BLUEPRINT = ITEMS.register("kraber_blueprint", KRABERBlueprint::new); + public static final RegistryObject VECTOR_BLUEPRINT = ITEMS.register("vector_blueprint", VectorBlueprint::new); + public static final RegistryObject MINIGUN_BLUEPRINT = ITEMS.register("minigun_blueprint", MinigunBlueprint::new); + public static final RegistryObject MK_14_BLUEPRINT = ITEMS.register("mk_14_blueprint", Mk14Blueprint::new); + public static final RegistryObject SENTINEL_BLUEPRINT = ITEMS.register("sentinel_blueprint", SentinelBlueprint::new); + public static final RegistryObject M_60_BLUEPRINT = ITEMS.register("m_60_blueprint", M60Blueprint::new); + public static final RegistryObject SVD_BLUEPRINT = ITEMS.register("svd_blueprint", SvdBlueprint::new); + public static final RegistryObject MARLIN_BLUEPRINT = ITEMS.register("marlin_blueprint", MarlinBlueprint::new); + public static final RegistryObject M_870_BLUEPRINT = ITEMS.register("m_870_blueprint", M870Blueprint::new); + public static final RegistryObject M_98B_BLUEPRINT = ITEMS.register("m_98b_blueprint", M98bBlueprint::new); + public static final RegistryObject AK_47_BLUEPRINT = ITEMS.register("ak_47_blueprint", AK47Blueprint::new); + public static final RegistryObject DEVOTION_BLUEPRINT = ITEMS.register("devotion_blueprint", DevotionBlueprint::new); + public static final RegistryObject TASER_BLUEPRINT = ITEMS.register("taser_blueprint", TaserBlueprint::new); + public static final RegistryObject GUN_RECYCLE = block(TargetModBlocks.GUN_RECYCLE); + + /** + * Ammo + */ + public static final RegistryObject HANDGUN_AMMO = ITEMS.register("handgun_ammo", HandgunAmmoItem::new); + public static final RegistryObject RIFLE_AMMO = ITEMS.register("rifle_ammo", RifleAmmoItem::new); + public static final RegistryObject SNIPER_AMMO = ITEMS.register("sniper_ammo", SniperAmmoItem::new); + public static final RegistryObject SHOTGUN_AMMO = ITEMS.register("shotgun_ammo", ShotgunAmmoItem::new); + public static final RegistryObject HANDGUN_AMMO_BOX = ITEMS.register("handgun_ammo_box", HandgunAmmoBoxItem::new); + public static final RegistryObject RIFLE_AMMO_BOX = ITEMS.register("rifle_ammo_box", RifleAmmoBoxItem::new); + public static final RegistryObject SNIPER_AMMO_BOX = ITEMS.register("sniper_ammo_box", SniperAmmoBoxItem::new); + public static final RegistryObject SHOTGUN_AMMO_BOX = ITEMS.register("shotgun_ammo_box", ShotgunAmmoBoxItem::new); + public static final RegistryObject CREATIVE_AMMO_BOX = ITEMS.register("creative_ammo_box", CreativeAmmoBoxItem::new); + public static final RegistryObject TASER_ELECTRODE = ITEMS.register("taser_electrode", TaserElectrodeItem::new); + public static final RegistryObject GRENADE_40MM = ITEMS.register("grenade_40mm", Grenade40mmItem::new); + public static final RegistryObject MORTAR_SHELLS = ITEMS.register("mortar_shells", MortarShellsItem::new); + public static final RegistryObject ROCKET = ITEMS.register("rocket", RocketItem::new); + + private static RegistryObject block(RegistryObject block) { + return ITEMS.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties())); + } +} diff --git a/src/main/java/net/mcreator/target/init/TargetModGunTabs.java b/src/main/java/net/mcreator/target/init/TargetModGunTabs.java index 3a451c9f4..f8f5634b5 100644 --- a/src/main/java/net/mcreator/target/init/TargetModGunTabs.java +++ b/src/main/java/net/mcreator/target/init/TargetModGunTabs.java @@ -17,31 +17,31 @@ public class TargetModGunTabs { public static final DeferredRegister REGISTRY = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TargetMod.MODID); public static final RegistryObject TARGET_GUNS = REGISTRY.register("target_guns", - () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_guns")).icon(() -> new ItemStack(TargetModItems.TASER.get())).displayItems((parameters, tabData) -> { - tabData.accept(TargetModItems.TASER.get()); - tabData.accept(TargetModItems.ABEKIRI.get()); - tabData.accept(TargetModItems.TRACHELIUM.get()); - tabData.accept(TargetModItems.VECTOR.get()); - tabData.accept(TargetModItems.AK_47.get()); - tabData.accept(TargetModItems.SKS.get()); - tabData.accept(TargetModItems.M_4.get()); - tabData.accept(TargetModItems.HK_416.get()); - tabData.accept(TargetModItems.MK_14.get()); - tabData.accept(TargetModItems.MARLIN.get()); - tabData.accept(TargetModItems.SVD.get()); - tabData.accept(TargetModItems.M_98B.get()); - tabData.accept(TargetModItems.SENTINEL.get()); - tabData.accept(TargetModItems.HUNTING_RIFLE.get()); - tabData.accept(TargetModItems.KRABER.get()); - tabData.accept(TargetModItems.M_870.get()); - tabData.accept(TargetModItems.AA_12.get()); - tabData.accept(TargetModItems.DEVOTION.get()); - tabData.accept(TargetModItems.RPK.get()); - tabData.accept(TargetModItems.M_60.get()); - tabData.accept(TargetModItems.MINIGUN.get()); - tabData.accept(TargetModItems.M_79.get()); - tabData.accept(TargetModItems.RPG.get()); - tabData.accept(TargetModItems.BOCEK.get()); + () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_guns")).icon(() -> new ItemStack(ItemRegistry.TASER.get())).displayItems((parameters, tabData) -> { + tabData.accept(ItemRegistry.TASER.get()); + tabData.accept(ItemRegistry.ABEKIRI.get()); + tabData.accept(ItemRegistry.TRACHELIUM.get()); + tabData.accept(ItemRegistry.VECTOR.get()); + tabData.accept(ItemRegistry.AK_47.get()); + tabData.accept(ItemRegistry.SKS.get()); + tabData.accept(ItemRegistry.M_4.get()); + tabData.accept(ItemRegistry.HK_416.get()); + tabData.accept(ItemRegistry.MK_14.get()); + tabData.accept(ItemRegistry.MARLIN.get()); + tabData.accept(ItemRegistry.SVD.get()); + tabData.accept(ItemRegistry.M_98B.get()); + tabData.accept(ItemRegistry.SENTINEL.get()); + tabData.accept(ItemRegistry.HUNTING_RIFLE.get()); + tabData.accept(ItemRegistry.KRABER.get()); + tabData.accept(ItemRegistry.M_870.get()); + tabData.accept(ItemRegistry.AA_12.get()); + tabData.accept(ItemRegistry.DEVOTION.get()); + tabData.accept(ItemRegistry.RPK.get()); + tabData.accept(ItemRegistry.M_60.get()); + tabData.accept(ItemRegistry.MINIGUN.get()); + tabData.accept(ItemRegistry.M_79.get()); + tabData.accept(ItemRegistry.RPG.get()); + tabData.accept(ItemRegistry.BOCEK.get()); }) .build()); @@ -49,7 +49,7 @@ public class TargetModGunTabs { public static void buildTabContentsVanilla(BuildCreativeModeTabContentsEvent tabData) { if (tabData.getTabKey() == CreativeModeTabs.SPAWN_EGGS) { - tabData.accept(TargetModItems.SENPAI_SPAWN_EGG.get()); + tabData.accept(ItemRegistry.SENPAI_SPAWN_EGG.get()); } } } diff --git a/src/main/java/net/mcreator/target/init/TargetModItems.java b/src/main/java/net/mcreator/target/init/TargetModItems.java deleted file mode 100644 index 07203eebf..000000000 --- a/src/main/java/net/mcreator/target/init/TargetModItems.java +++ /dev/null @@ -1,143 +0,0 @@ - -/* - * MCreator note: This file will be REGENERATED on each build. - */ -package net.mcreator.target.init; - -import net.mcreator.target.TargetMod; -import net.mcreator.target.item.*; -import net.mcreator.target.item.common.ammo.*; -import net.mcreator.target.item.common.blueprint.*; -import net.mcreator.target.item.common.material.*; -import net.mcreator.target.item.common.material.component.*; -import net.mcreator.target.item.common.material.pack.*; -import net.mcreator.target.item.gun.*; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.ForgeSpawnEggItem; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -public class TargetModItems { - public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, TargetMod.MODID); - public static final RegistryObject TASER = REGISTRY.register("taser", TaserItem::new); - public static final RegistryObject ABEKIRI = REGISTRY.register("abekiri", AbekiriItem::new); - public static final RegistryObject TRACHELIUM = REGISTRY.register("trachelium", TracheliumItem::new); - public static final RegistryObject VECTOR = REGISTRY.register("vector", VectorItem::new); - public static final RegistryObject AK_47 = REGISTRY.register("ak_47", AK47Item::new); - public static final RegistryObject SKS = REGISTRY.register("sks", SksItem::new); - public static final RegistryObject M_4 = REGISTRY.register("m_4", M4Item::new); - public static final RegistryObject HK_416 = REGISTRY.register("hk_416", Hk416Item::new); - public static final RegistryObject MK_14 = REGISTRY.register("mk_14", Mk14Item::new); - public static final RegistryObject MARLIN = REGISTRY.register("marlin", MarlinItem::new); - public static final RegistryObject SVD = REGISTRY.register("svd", SvdItem::new); - public static final RegistryObject M_98B = REGISTRY.register("m_98b", M98bItem::new); - public static final RegistryObject SENTINEL = REGISTRY.register("sentinel", SentinelItem::new); - public static final RegistryObject HUNTING_RIFLE = REGISTRY.register("hunting_rifle", HuntingRifleItem::new); - public static final RegistryObject KRABER = REGISTRY.register("kraber", KraberItem::new); - public static final RegistryObject M_870 = REGISTRY.register("m_870", M870Item::new); - public static final RegistryObject AA_12 = REGISTRY.register("aa_12", Aa12Item::new); - public static final RegistryObject DEVOTION = REGISTRY.register("devotion", DevotionItem::new); - public static final RegistryObject RPK = REGISTRY.register("rpk", RpkItem::new); - public static final RegistryObject M_60 = REGISTRY.register("m_60", M60Item::new); - public static final RegistryObject MINIGUN = REGISTRY.register("minigun", MinigunItem::new); - public static final RegistryObject M_79 = REGISTRY.register("m_79", M79Item::new); - public static final RegistryObject RPG = REGISTRY.register("rpg", RpgItem::new); - public static final RegistryObject BOCEK = REGISTRY.register("bocek", BocekItem::new); - public static final RegistryObject SENPAI_SPAWN_EGG = REGISTRY.register("senpai_spawn_egg", () -> new ForgeSpawnEggItem(TargetModEntities.SENPAI, -11584987, -14014413, new Item.Properties())); - public static final RegistryObject TARGETDEPLOYER = REGISTRY.register("targetdeployer", TargetdeployerItem::new); - public static final RegistryObject SANDBAG = block(TargetModBlocks.SANDBAG); - public static final RegistryObject BARBED_WIRE = block(TargetModBlocks.BARBED_WIRE); - public static final RegistryObject CLAYMORE_MINE = REGISTRY.register("claymore_mine", ClaymoreMineItem::new); - public static final RegistryObject JUMPPAD_BLOCK = block(TargetModBlocks.JUMPPAD_BLOCK); - public static final RegistryObject LIGHT_SABER = REGISTRY.register("light_saber", LightSaberItem::new); - public static final RegistryObject HAMMER = REGISTRY.register("hammer", HammerItem::new); - public static final RegistryObject MORTAR_DEPOLYER = REGISTRY.register("mortar_depolyer", MortarDepolyerItem::new); - public static final RegistryObject MORTARBARREL = REGISTRY.register("mortarbarrel", MortarbarrelItem::new); - public static final RegistryObject MORATR_BASE_PLATE = REGISTRY.register("moratr_base_plate", MoratrBasePlateItem::new); - public static final RegistryObject MORTARBIPOD = REGISTRY.register("mortarbipod", MortarbipodItem::new); - public static final RegistryObject FUSEE = REGISTRY.register("fusee", FuseeItem::new); - public static final RegistryObject SOULSTEELNUGGET = REGISTRY.register("soulsteelnugget", SoulsteelnuggetItem::new); - public static final RegistryObject COPPERPLATE = REGISTRY.register("copperplate", CopperplateItem::new); - public static final RegistryObject INGOT_STEEL = REGISTRY.register("ingot_steel", IngotSteelItem::new); - public static final RegistryObject LEAD_INGOT = REGISTRY.register("lead_ingot", LeadIngotItem::new); - public static final RegistryObject TUNGSTEN_INGOT = REGISTRY.register("tungsten_ingot", TungstenIngotItem::new); - public static final RegistryObject CEMENTED_CARBIDE_INGOT = REGISTRY.register("cemented_carbide_ingot", CementedCarbideIngotItem::new); - public static final RegistryObject SOULSTEEL_INGOT = REGISTRY.register("soulsteel_ingot", SoulsteelIngotItem::new); - public static final RegistryObject IRON_POWDER = REGISTRY.register("iron_powder", IronPowderItem::new); - public static final RegistryObject TUNGSTEN_POWDER = REGISTRY.register("tungsten_powder", TungstenPowderItem::new); - public static final RegistryObject COAL_POWDER = REGISTRY.register("coal_powder", CoalPowderItem::new); - public static final RegistryObject COAL_IRON_POWDER = REGISTRY.register("coal_iron_powder", CoalIronPowderItem::new); - public static final RegistryObject UNBLASTEDCEMENTEDCARBIDEPODWER = REGISTRY.register("unblastedcementedcarbidepodwer", RawCementedCarbidePowderItem::new); - public static final RegistryObject GALENA_ORE = block(TargetModBlocks.GALENA_ORE); - public static final RegistryObject DEEPSLATE_GALENA_ORE = block(TargetModBlocks.DEEPSLATE_GALENA_ORE); - public static final RegistryObject SCHEELITE_ORE = block(TargetModBlocks.SCHEELITE_ORE); - public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = block(TargetModBlocks.DEEPSLATE_SCHEELITE_ORE); - public static final RegistryObject GALENA = REGISTRY.register("galena", GalenaItem::new); - public static final RegistryObject SCHEELITE = REGISTRY.register("scheelite", ScheeliteItem::new); - public static final RegistryObject BUCKSHOT = REGISTRY.register("buckshot", BuckshotItem::new); - public static final RegistryObject IRON_BARREL = REGISTRY.register("iron_barrel", IronBarrelItem::new); - public static final RegistryObject IRON_ACTION = REGISTRY.register("iron_action", IronActionItem::new); - public static final RegistryObject IRON_TRIGGER = REGISTRY.register("iron_trigger", IronTriggerItem::new); - public static final RegistryObject IRON_SPRING = REGISTRY.register("iron_spring", IronSpringItem::new); - public static final RegistryObject STEEL_BARREL = REGISTRY.register("steel_barrel", SteelBarrelItem::new); - public static final RegistryObject STEEL_ACTION = REGISTRY.register("steel_action", SteelActionItem::new); - public static final RegistryObject STEEL_TRIGGER = REGISTRY.register("steel_trigger", SteelTriggerItem::new); - public static final RegistryObject STEEL_SPRING = REGISTRY.register("steel_spring", SteelSpringItem::new); - public static final RegistryObject CEMENTED_CARBIDE_BARREL = REGISTRY.register("cemented_carbide_barrel", CementedCarbideBarrelItem::new); - public static final RegistryObject CEMENTED_CARBIDE_ACTION = REGISTRY.register("cemented_carbide_action", CementedCarbideActionItem::new); - public static final RegistryObject CEMENTEDCARBIDE_TRIGGER = REGISTRY.register("cementedcarbide_trigger", CementedCarbideTriggerItem::new); - public static final RegistryObject CEMENTEDCARBIDESPRING = REGISTRY.register("cementedcarbidespring", CementedCarbideSpringItem::new); - public static final RegistryObject NETHERITE_BARREL = REGISTRY.register("netherite_barrel", NetheriteBarrelItem::new); - public static final RegistryObject NETHERITE_ACTION = REGISTRY.register("netherite_action", NetheriteActionItem::new); - public static final RegistryObject NETHERITE_TRIGGER = REGISTRY.register("netherite_trigger", NetheriteTriggerItem::new); - public static final RegistryObject NETHERITE_SPRING = REGISTRY.register("netherite_spring", NetheriteSpringItem::new); - public static final RegistryObject COMMONMATERIALPACK = REGISTRY.register("commonmaterialpack", CommonMaterialPackItem::new); - public static final RegistryObject RAREMATERIALPACK = REGISTRY.register("rarematerialpack", RareMaterialPackItem::new); - public static final RegistryObject EPICMATERIALPACK = REGISTRY.register("epicmaterialpack", EpicMaterialPackItem::new); - public static final RegistryObject LEGENDARYMATERIALPACK = REGISTRY.register("legendarymaterialpack", LegendaryMaterialPackItem::new); - public static final RegistryObject SPECIALMATERIALPACK = REGISTRY.register("specialmaterialpack", SpecialMaterialPackItem::new); - public static final RegistryObject TRACHELIUM_BLUEPRINT = REGISTRY.register("trachelium_blueprint", TracheliumBlueprintItem::new); - public static final RegistryObject HUNTING_RIFLE_BLUEPRINT = REGISTRY.register("hunting_rifle_blueprint", HuntingRifleBlueprintItem::new); - public static final RegistryObject M_79_BLUEPRINT = REGISTRY.register("m_79_blueprint", M79BlueprintItem::new); - public static final RegistryObject RPG_BLUEPRINT = REGISTRY.register("rpg_blueprint", RpgBlueprintItem::new); - public static final RegistryObject BOCEK_BLUEPRINT = REGISTRY.register("bocek_blueprint", BocekBlueprintItem::new); - public static final RegistryObject M_4_BLUEPRINT = REGISTRY.register("m_4_blueprint", M4BlueprintItem::new); - public static final RegistryObject AA_12_BLUEPRINT = REGISTRY.register("aa_12_blueprint", Aa12BlueprintItem::new); - public static final RegistryObject HK_416_BLUEPRINT = REGISTRY.register("hk_416_blueprint", HK416BlueprintItem::new); - public static final RegistryObject RPK_BLUEPRINT = REGISTRY.register("rpk_blueprint", RPKBlueprintItem::new); - public static final RegistryObject SKS_BLUEPRINT = REGISTRY.register("sks_blueprint", SKSBlueprintItem::new); - public static final RegistryObject KRABER_BLUEPRINT = REGISTRY.register("kraber_blueprint", KRABERBlueprintItem::new); - public static final RegistryObject VECTOR_BLUEPRINT = REGISTRY.register("vector_blueprint", VectorBlueprintItem::new); - public static final RegistryObject MINIGUN_BLUEPRINT = REGISTRY.register("minigun_blueprint", MinigunBlueprintItem::new); - public static final RegistryObject MK_14_BLUEPRINT = REGISTRY.register("mk_14_blueprint", Mk14BlueprintItem::new); - public static final RegistryObject SENTINEL_BLUEPRINT = REGISTRY.register("sentinel_blueprint", SentinelBlueprintItem::new); - public static final RegistryObject M_60_BLUEPRINT = REGISTRY.register("m_60_blueprint", M60BlueprintItem::new); - public static final RegistryObject SVD_BLUEPRINT = REGISTRY.register("svd_blueprint", SvdBlueprintItem::new); - public static final RegistryObject MARLIN_BLUEPRINT = REGISTRY.register("marlin_blueprint", MarlinBlueprintItem::new); - public static final RegistryObject M_870_BLUEPRINT = REGISTRY.register("m_870_blueprint", M870BlueprintItem::new); - public static final RegistryObject M_98B_BLUEPRINT = REGISTRY.register("m_98b_blueprint", M98bBlueprintItem::new); - public static final RegistryObject AK_47_BLUEPRINT = REGISTRY.register("ak_47_blueprint", AK47BlueprintItem::new); - public static final RegistryObject DEVOTION_BLUPRINT = REGISTRY.register("devotion_bluprint", DevotionBluprintItem::new); - public static final RegistryObject TASER_BLUEPRINT = REGISTRY.register("taser_blueprint", TaserBlueprintItem::new); - public static final RegistryObject GUN_RECYCLE = block(TargetModBlocks.GUN_RECYCLE); - public static final RegistryObject HANDGUN_AMMO = REGISTRY.register("handgun_ammo", HandgunAmmoItem::new); - public static final RegistryObject RIFLE_AMMO = REGISTRY.register("rifle_ammo", RifleAmmoItem::new); - public static final RegistryObject SNIPER_AMMO = REGISTRY.register("sniper_ammo", SniperAmmoItem::new); - public static final RegistryObject SHOTGUN_AMMO = REGISTRY.register("shotgun_ammo", ShotgunAmmoItem::new); - public static final RegistryObject HANDGUN_AMMO_BOX = REGISTRY.register("handgun_ammo_box", HandgunAmmoBoxItem::new); - public static final RegistryObject RIFLE_AMMO_BOX = REGISTRY.register("rifle_ammo_box", RifleAmmoBoxItem::new); - public static final RegistryObject SNIPER_AMMO_BOX = REGISTRY.register("sniper_ammo_box", SniperAmmoBoxItem::new); - public static final RegistryObject SHOTGUN_AMMO_BOX = REGISTRY.register("shotgun_ammo_box", ShotgunAmmoBoxItem::new); - public static final RegistryObject CREATIVE_AMMO_BOX = REGISTRY.register("creative_ammo_box", CreativeAmmoBoxItem::new); - public static final RegistryObject TASER_ELECTRODE = REGISTRY.register("taser_electrode", TaserElectrodeItem::new); - public static final RegistryObject GRENADE_40MM = REGISTRY.register("grenade_40mm", Grenade40mmItem::new); - public static final RegistryObject MORTAR_SHELLS = REGISTRY.register("mortar_shells", MortarShellsItem::new); - public static final RegistryObject ROCKET = REGISTRY.register("rocket", RocketItem::new); - - private static RegistryObject block(RegistryObject block) { - return REGISTRY.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties())); - } -} diff --git a/src/main/java/net/mcreator/target/init/TargetModKeyMappings.java b/src/main/java/net/mcreator/target/init/TargetModKeyMappings.java index cb094aafe..b735eb303 100644 --- a/src/main/java/net/mcreator/target/init/TargetModKeyMappings.java +++ b/src/main/java/net/mcreator/target/init/TargetModKeyMappings.java @@ -6,8 +6,8 @@ package net.mcreator.target.init; import com.mojang.blaze3d.platform.InputConstants; import net.mcreator.target.TargetMod; -import net.mcreator.target.network.DoublejumpinputMessage; -import net.mcreator.target.network.FiremodeMessage; +import net.mcreator.target.network.DoubleJumpMessage; +import net.mcreator.target.network.FireModeMessage; import net.mcreator.target.network.ReloadMessage; import net.mcreator.target.network.ZoomMessage; import net.minecraft.client.KeyMapping; @@ -41,8 +41,8 @@ public class TargetModKeyMappings { public void setDown(boolean isDown) { super.setDown(isDown); if (isDownOld != isDown && isDown) { - TargetMod.PACKET_HANDLER.sendToServer(new DoublejumpinputMessage(0, 0)); - DoublejumpinputMessage.pressAction(Minecraft.getInstance().player, 0, 0); + TargetMod.PACKET_HANDLER.sendToServer(new DoubleJumpMessage(0, 0)); + DoubleJumpMessage.pressAction(Minecraft.getInstance().player, 0, 0); } isDownOld = isDown; } @@ -54,8 +54,8 @@ public class TargetModKeyMappings { public void setDown(boolean isDown) { super.setDown(isDown); if (isDownOld != isDown && isDown) { - TargetMod.PACKET_HANDLER.sendToServer(new FiremodeMessage(0, 0)); - FiremodeMessage.pressAction(Minecraft.getInstance().player, 0, 0); + TargetMod.PACKET_HANDLER.sendToServer(new FireModeMessage(0, 0)); + FireModeMessage.pressAction(Minecraft.getInstance().player, 0, 0); } isDownOld = isDown; } diff --git a/src/main/java/net/mcreator/target/init/TargetModMobEffects.java b/src/main/java/net/mcreator/target/init/TargetModMobEffects.java index cc026dfd6..e122bf0c7 100644 --- a/src/main/java/net/mcreator/target/init/TargetModMobEffects.java +++ b/src/main/java/net/mcreator/target/init/TargetModMobEffects.java @@ -5,7 +5,7 @@ package net.mcreator.target.init; import net.mcreator.target.TargetMod; -import net.mcreator.target.potion.ShockMobEffect; +import net.mcreator.target.mobeffect.ShockMobEffect; import net.minecraft.world.effect.MobEffect; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/net/mcreator/target/init/TargetModTabs.java b/src/main/java/net/mcreator/target/init/TargetModTabs.java index df7739a47..f1e24bba1 100644 --- a/src/main/java/net/mcreator/target/init/TargetModTabs.java +++ b/src/main/java/net/mcreator/target/init/TargetModTabs.java @@ -20,101 +20,101 @@ import net.minecraftforge.registries.RegistryObject; public class TargetModTabs { public static final DeferredRegister REGISTRY = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TargetMod.MODID); public static final RegistryObject TARGET_ITEM = REGISTRY.register("target_item", - () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_item")).icon(() -> new ItemStack(TargetModItems.TARGETDEPLOYER.get())).displayItems((parameters, tabData) -> { - tabData.accept(TargetModItems.TARGETDEPLOYER.get()); + () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.target_item")).icon(() -> new ItemStack(ItemRegistry.TARGET_DEPLOYER.get())).displayItems((parameters, tabData) -> { + tabData.accept(ItemRegistry.TARGET_DEPLOYER.get()); tabData.accept(TargetModBlocks.SANDBAG.get().asItem()); tabData.accept(TargetModBlocks.BARBED_WIRE.get().asItem()); - tabData.accept(TargetModItems.CLAYMORE_MINE.get()); + tabData.accept(ItemRegistry.CLAYMORE_MINE.get()); tabData.accept(TargetModBlocks.JUMPPAD_BLOCK.get().asItem()); - tabData.accept(TargetModItems.LIGHT_SABER.get()); - tabData.accept(TargetModItems.HAMMER.get()); - tabData.accept(TargetModItems.MORTAR_DEPOLYER.get()); - tabData.accept(TargetModItems.MORTARBARREL.get()); - tabData.accept(TargetModItems.MORATR_BASE_PLATE.get()); - tabData.accept(TargetModItems.MORTARBIPOD.get()); - tabData.accept(TargetModItems.FUSEE.get()); - tabData.accept(TargetModItems.SOULSTEELNUGGET.get()); - tabData.accept(TargetModItems.COPPERPLATE.get()); - tabData.accept(TargetModItems.INGOT_STEEL.get()); - tabData.accept(TargetModItems.LEAD_INGOT.get()); - tabData.accept(TargetModItems.TUNGSTEN_INGOT.get()); - tabData.accept(TargetModItems.CEMENTED_CARBIDE_INGOT.get()); - tabData.accept(TargetModItems.SOULSTEEL_INGOT.get()); - tabData.accept(TargetModItems.IRON_POWDER.get()); - tabData.accept(TargetModItems.TUNGSTEN_POWDER.get()); - tabData.accept(TargetModItems.COAL_POWDER.get()); - tabData.accept(TargetModItems.COAL_IRON_POWDER.get()); - tabData.accept(TargetModItems.UNBLASTEDCEMENTEDCARBIDEPODWER.get()); + tabData.accept(ItemRegistry.LIGHT_SABER.get()); + tabData.accept(ItemRegistry.HAMMER.get()); + tabData.accept(ItemRegistry.MORTAR_DEPLOYER.get()); + tabData.accept(ItemRegistry.MORTAR_BARREL.get()); + tabData.accept(ItemRegistry.MORTAR_BASE_PLATE.get()); + tabData.accept(ItemRegistry.MORTAR_BIPOD.get()); + tabData.accept(ItemRegistry.FUSEE.get()); + tabData.accept(ItemRegistry.SOUL_STEEL_NUGGET.get()); + tabData.accept(ItemRegistry.COPPERPLATE.get()); + tabData.accept(ItemRegistry.INGOT_STEEL.get()); + tabData.accept(ItemRegistry.LEAD_INGOT.get()); + tabData.accept(ItemRegistry.TUNGSTEN_INGOT.get()); + tabData.accept(ItemRegistry.CEMENTED_CARBIDE_INGOT.get()); + tabData.accept(ItemRegistry.SOUL_STEEL_INGOT.get()); + tabData.accept(ItemRegistry.IRON_POWDER.get()); + tabData.accept(ItemRegistry.TUNGSTEN_POWDER.get()); + tabData.accept(ItemRegistry.COAL_POWDER.get()); + tabData.accept(ItemRegistry.COAL_IRON_POWDER.get()); + tabData.accept(ItemRegistry.RAW_CEMENTED_CARBIDE_POWDER.get()); tabData.accept(TargetModBlocks.GALENA_ORE.get().asItem()); tabData.accept(TargetModBlocks.DEEPSLATE_GALENA_ORE.get().asItem()); tabData.accept(TargetModBlocks.SCHEELITE_ORE.get().asItem()); tabData.accept(TargetModBlocks.DEEPSLATE_SCHEELITE_ORE.get().asItem()); - tabData.accept(TargetModItems.GALENA.get()); - tabData.accept(TargetModItems.SCHEELITE.get()); - tabData.accept(TargetModItems.BUCKSHOT.get()); - tabData.accept(TargetModItems.IRON_BARREL.get()); - tabData.accept(TargetModItems.IRON_ACTION.get()); - tabData.accept(TargetModItems.IRON_TRIGGER.get()); - tabData.accept(TargetModItems.IRON_SPRING.get()); - tabData.accept(TargetModItems.STEEL_BARREL.get()); - tabData.accept(TargetModItems.STEEL_ACTION.get()); - tabData.accept(TargetModItems.STEEL_TRIGGER.get()); - tabData.accept(TargetModItems.STEEL_SPRING.get()); - tabData.accept(TargetModItems.CEMENTED_CARBIDE_BARREL.get()); - tabData.accept(TargetModItems.CEMENTED_CARBIDE_ACTION.get()); - tabData.accept(TargetModItems.CEMENTEDCARBIDE_TRIGGER.get()); - tabData.accept(TargetModItems.CEMENTEDCARBIDESPRING.get()); - tabData.accept(TargetModItems.NETHERITE_BARREL.get()); - tabData.accept(TargetModItems.NETHERITE_ACTION.get()); - tabData.accept(TargetModItems.NETHERITE_TRIGGER.get()); - tabData.accept(TargetModItems.NETHERITE_SPRING.get()); - tabData.accept(TargetModItems.COMMONMATERIALPACK.get()); - tabData.accept(TargetModItems.RAREMATERIALPACK.get()); - tabData.accept(TargetModItems.EPICMATERIALPACK.get()); - tabData.accept(TargetModItems.LEGENDARYMATERIALPACK.get()); - tabData.accept(TargetModItems.SPECIALMATERIALPACK.get()); - tabData.accept(TargetModItems.TRACHELIUM_BLUEPRINT.get()); - tabData.accept(TargetModItems.HUNTING_RIFLE_BLUEPRINT.get()); - tabData.accept(TargetModItems.M_79_BLUEPRINT.get()); - tabData.accept(TargetModItems.RPG_BLUEPRINT.get()); - tabData.accept(TargetModItems.BOCEK_BLUEPRINT.get()); - tabData.accept(TargetModItems.M_4_BLUEPRINT.get()); - tabData.accept(TargetModItems.AA_12_BLUEPRINT.get()); - tabData.accept(TargetModItems.HK_416_BLUEPRINT.get()); - tabData.accept(TargetModItems.RPK_BLUEPRINT.get()); - tabData.accept(TargetModItems.SKS_BLUEPRINT.get()); - tabData.accept(TargetModItems.KRABER_BLUEPRINT.get()); - tabData.accept(TargetModItems.VECTOR_BLUEPRINT.get()); - tabData.accept(TargetModItems.MINIGUN_BLUEPRINT.get()); - tabData.accept(TargetModItems.MK_14_BLUEPRINT.get()); - tabData.accept(TargetModItems.SENTINEL_BLUEPRINT.get()); - tabData.accept(TargetModItems.M_60_BLUEPRINT.get()); - tabData.accept(TargetModItems.SVD_BLUEPRINT.get()); - tabData.accept(TargetModItems.MARLIN_BLUEPRINT.get()); - tabData.accept(TargetModItems.M_870_BLUEPRINT.get()); - tabData.accept(TargetModItems.M_98B_BLUEPRINT.get()); - tabData.accept(TargetModItems.AK_47_BLUEPRINT.get()); - tabData.accept(TargetModItems.DEVOTION_BLUPRINT.get()); - tabData.accept(TargetModItems.TASER_BLUEPRINT.get()); + tabData.accept(ItemRegistry.GALENA.get()); + tabData.accept(ItemRegistry.SCHEELITE.get()); + tabData.accept(ItemRegistry.BUCKSHOT.get()); + tabData.accept(ItemRegistry.IRON_BARREL.get()); + tabData.accept(ItemRegistry.IRON_ACTION.get()); + tabData.accept(ItemRegistry.IRON_TRIGGER.get()); + tabData.accept(ItemRegistry.IRON_SPRING.get()); + tabData.accept(ItemRegistry.STEEL_BARREL.get()); + tabData.accept(ItemRegistry.STEEL_ACTION.get()); + tabData.accept(ItemRegistry.STEEL_TRIGGER.get()); + tabData.accept(ItemRegistry.STEEL_SPRING.get()); + tabData.accept(ItemRegistry.CEMENTED_CARBIDE_BARREL.get()); + tabData.accept(ItemRegistry.CEMENTED_CARBIDE_ACTION.get()); + tabData.accept(ItemRegistry.CEMENTED_CARBIDE_TRIGGER.get()); + tabData.accept(ItemRegistry.CEMENTED_CARBIDE_SPRING.get()); + tabData.accept(ItemRegistry.NETHERITE_BARREL.get()); + tabData.accept(ItemRegistry.NETHERITE_ACTION.get()); + tabData.accept(ItemRegistry.NETHERITE_TRIGGER.get()); + tabData.accept(ItemRegistry.NETHERITE_SPRING.get()); + tabData.accept(ItemRegistry.COMMON_MATERIAL_PACK.get()); + tabData.accept(ItemRegistry.RARE_MATERIAL_PACK.get()); + tabData.accept(ItemRegistry.EPIC_MATERIAL_PACK.get()); + tabData.accept(ItemRegistry.LEGENDARY_MATERIAL_PACK.get()); + tabData.accept(ItemRegistry.SPECIAL_MATERIAL_PACK.get()); + tabData.accept(ItemRegistry.TRACHELIUM_BLUEPRINT.get()); + tabData.accept(ItemRegistry.HUNTING_RIFLE_BLUEPRINT.get()); + tabData.accept(ItemRegistry.M_79_BLUEPRINT.get()); + tabData.accept(ItemRegistry.RPG_BLUEPRINT.get()); + tabData.accept(ItemRegistry.BOCEK_BLUEPRINT.get()); + tabData.accept(ItemRegistry.M_4_BLUEPRINT.get()); + tabData.accept(ItemRegistry.AA_12_BLUEPRINT.get()); + tabData.accept(ItemRegistry.HK_416_BLUEPRINT.get()); + tabData.accept(ItemRegistry.RPK_BLUEPRINT.get()); + tabData.accept(ItemRegistry.SKS_BLUEPRINT.get()); + tabData.accept(ItemRegistry.KRABER_BLUEPRINT.get()); + tabData.accept(ItemRegistry.VECTOR_BLUEPRINT.get()); + tabData.accept(ItemRegistry.MINIGUN_BLUEPRINT.get()); + tabData.accept(ItemRegistry.MK_14_BLUEPRINT.get()); + tabData.accept(ItemRegistry.SENTINEL_BLUEPRINT.get()); + tabData.accept(ItemRegistry.M_60_BLUEPRINT.get()); + tabData.accept(ItemRegistry.SVD_BLUEPRINT.get()); + tabData.accept(ItemRegistry.MARLIN_BLUEPRINT.get()); + tabData.accept(ItemRegistry.M_870_BLUEPRINT.get()); + tabData.accept(ItemRegistry.M_98B_BLUEPRINT.get()); + tabData.accept(ItemRegistry.AK_47_BLUEPRINT.get()); + tabData.accept(ItemRegistry.DEVOTION_BLUEPRINT.get()); + tabData.accept(ItemRegistry.TASER_BLUEPRINT.get()); tabData.accept(TargetModBlocks.GUN_RECYCLE.get().asItem()); }) .build()); public static final RegistryObject AMMO = REGISTRY.register("ammo", - () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.ammo")).icon(() -> new ItemStack(TargetModItems.SHOTGUN_AMMO_BOX.get())).displayItems((parameters, tabData) -> { - tabData.accept(TargetModItems.HANDGUN_AMMO.get()); - tabData.accept(TargetModItems.RIFLE_AMMO.get()); - tabData.accept(TargetModItems.SNIPER_AMMO.get()); - tabData.accept(TargetModItems.SHOTGUN_AMMO.get()); - tabData.accept(TargetModItems.HANDGUN_AMMO_BOX.get()); - tabData.accept(TargetModItems.RIFLE_AMMO_BOX.get()); - tabData.accept(TargetModItems.SNIPER_AMMO_BOX.get()); - tabData.accept(TargetModItems.SHOTGUN_AMMO_BOX.get()); - tabData.accept(TargetModItems.CREATIVE_AMMO_BOX.get()); - tabData.accept(TargetModItems.TASER_ELECTRODE.get()); - tabData.accept(TargetModItems.GRENADE_40MM.get()); - tabData.accept(TargetModItems.MORTAR_SHELLS.get()); - tabData.accept(TargetModItems.ROCKET.get()); + () -> CreativeModeTab.builder().title(Component.translatable("item_group.target.ammo")).icon(() -> new ItemStack(ItemRegistry.SHOTGUN_AMMO_BOX.get())).displayItems((parameters, tabData) -> { + tabData.accept(ItemRegistry.HANDGUN_AMMO.get()); + tabData.accept(ItemRegistry.RIFLE_AMMO.get()); + tabData.accept(ItemRegistry.SNIPER_AMMO.get()); + tabData.accept(ItemRegistry.SHOTGUN_AMMO.get()); + tabData.accept(ItemRegistry.HANDGUN_AMMO_BOX.get()); + tabData.accept(ItemRegistry.RIFLE_AMMO_BOX.get()); + tabData.accept(ItemRegistry.SNIPER_AMMO_BOX.get()); + tabData.accept(ItemRegistry.SHOTGUN_AMMO_BOX.get()); + tabData.accept(ItemRegistry.CREATIVE_AMMO_BOX.get()); + tabData.accept(ItemRegistry.TASER_ELECTRODE.get()); + tabData.accept(ItemRegistry.GRENADE_40MM.get()); + tabData.accept(ItemRegistry.MORTAR_SHELLS.get()); + tabData.accept(ItemRegistry.ROCKET.get()); }) .build()); @@ -123,7 +123,7 @@ public class TargetModTabs { public static void buildTabContentsVanilla(BuildCreativeModeTabContentsEvent tabData) { if (tabData.getTabKey() == CreativeModeTabs.SPAWN_EGGS) { - tabData.accept(TargetModItems.SENPAI_SPAWN_EGG.get()); + tabData.accept(ItemRegistry.SENPAI_SPAWN_EGG.get()); } } } diff --git a/src/main/java/net/mcreator/target/init/TargetModTrades.java b/src/main/java/net/mcreator/target/init/TargetModTrades.java index 7af66a1ff..17951122c 100644 --- a/src/main/java/net/mcreator/target/init/TargetModTrades.java +++ b/src/main/java/net/mcreator/target/init/TargetModTrades.java @@ -17,78 +17,78 @@ public class TargetModTrades { @SubscribeEvent public static void registerTrades(VillagerTradesEvent event) { if (event.getType() == VillagerProfession.WEAPONSMITH) { - event.getTrades().get(1).add(new BasicItemListing(new ItemStack(TargetModItems.TASER_BLUEPRINT.get()), + event.getTrades().get(1).add(new BasicItemListing(new ItemStack(ItemRegistry.TASER_BLUEPRINT.get()), new ItemStack(Items.EMERALD), 16, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 10), - new ItemStack(TargetModItems.STEEL_ACTION.get()), 12, 5, 0.05f)); + new ItemStack(ItemRegistry.STEEL_ACTION.get()), 12, 5, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ItemRegistry.M_4_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ItemRegistry.M_79_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.MARLIN_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ItemRegistry.MARLIN_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 32), - new ItemStack(TargetModItems.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); + new ItemStack(ItemRegistry.AK_47_BLUEPRINT.get()), 10, 50, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.HUNTING_RIFLE_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.RPG_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.HK_416_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.RPK_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.VECTOR_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.MK_14_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.M_60_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.SVD_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.M_870_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.M_870_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD, 64), - new ItemStack(TargetModItems.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.M_98B_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(5).add(new BasicItemListing(new ItemStack(Items.EMERALD), - new ItemStack(TargetModItems.DEVOTION_BLUPRINT.get()), 10, 80, 0.05f)); + new ItemStack(ItemRegistry.DEVOTION_BLUEPRINT.get()), 10, 80, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(TargetModItems.STEEL_BARREL.get()), 12, 5, 0.05f)); + new ItemStack(ItemRegistry.STEEL_BARREL.get()), 12, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 6), - new ItemStack(TargetModItems.STEEL_TRIGGER.get()), 12, 5, 0.05f)); + new ItemStack(ItemRegistry.STEEL_TRIGGER.get()), 12, 5, 0.05f)); event.getTrades().get(2).add(new BasicItemListing(new ItemStack(Items.EMERALD, 8), - new ItemStack(TargetModItems.STEEL_SPRING.get()), 12, 5, 0.05f)); + new ItemStack(ItemRegistry.STEEL_SPRING.get()), 12, 5, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(TargetModItems.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); + new ItemStack(ItemRegistry.CEMENTED_CARBIDE_BARREL.get()), 12, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 20), - new ItemStack(TargetModItems.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); + new ItemStack(ItemRegistry.CEMENTED_CARBIDE_ACTION.get()), 10, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 16), - new ItemStack(TargetModItems.CEMENTEDCARBIDESPRING.get()), 10, 10, 0.05f)); + new ItemStack(ItemRegistry.CEMENTED_CARBIDE_SPRING.get()), 10, 10, 0.05f)); event.getTrades().get(3).add(new BasicItemListing(new ItemStack(Items.EMERALD, 12), - new ItemStack(TargetModItems.CEMENTEDCARBIDE_TRIGGER.get()), 10, 10, 0.05f)); + new ItemStack(ItemRegistry.CEMENTED_CARBIDE_TRIGGER.get()), 10, 10, 0.05f)); } } } diff --git a/src/main/java/net/mcreator/target/item/MortarbarrelItem.java b/src/main/java/net/mcreator/target/item/MortarBarrelItem.java similarity index 88% rename from src/main/java/net/mcreator/target/item/MortarbarrelItem.java rename to src/main/java/net/mcreator/target/item/MortarBarrelItem.java index e8c38166a..fd8447d30 100644 --- a/src/main/java/net/mcreator/target/item/MortarbarrelItem.java +++ b/src/main/java/net/mcreator/target/item/MortarBarrelItem.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MortarbarrelItem extends Item { - public MortarbarrelItem() { +public class MortarBarrelItem extends Item { + public MortarBarrelItem() { super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/MoratrBasePlateItem.java b/src/main/java/net/mcreator/target/item/MortarBasePlateItem.java similarity index 87% rename from src/main/java/net/mcreator/target/item/MoratrBasePlateItem.java rename to src/main/java/net/mcreator/target/item/MortarBasePlateItem.java index 64bf0a357..0dcf55b88 100644 --- a/src/main/java/net/mcreator/target/item/MoratrBasePlateItem.java +++ b/src/main/java/net/mcreator/target/item/MortarBasePlateItem.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MoratrBasePlateItem extends Item { - public MoratrBasePlateItem() { +public class MortarBasePlateItem extends Item { + public MortarBasePlateItem() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/MortarbipodItem.java b/src/main/java/net/mcreator/target/item/MortarBipodItem.java similarity index 88% rename from src/main/java/net/mcreator/target/item/MortarbipodItem.java rename to src/main/java/net/mcreator/target/item/MortarBipodItem.java index 9acf223b1..653389591 100644 --- a/src/main/java/net/mcreator/target/item/MortarbipodItem.java +++ b/src/main/java/net/mcreator/target/item/MortarBipodItem.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MortarbipodItem extends Item { - public MortarbipodItem() { +public class MortarBipodItem extends Item { + public MortarBipodItem() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/MortarDepolyerItem.java b/src/main/java/net/mcreator/target/item/MortarDeployerItem.java similarity index 93% rename from src/main/java/net/mcreator/target/item/MortarDepolyerItem.java rename to src/main/java/net/mcreator/target/item/MortarDeployerItem.java index 6a1cad6cd..551dda617 100644 --- a/src/main/java/net/mcreator/target/item/MortarDepolyerItem.java +++ b/src/main/java/net/mcreator/target/item/MortarDeployerItem.java @@ -13,8 +13,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MortarDepolyerItem extends Item { - public MortarDepolyerItem() { +public class MortarDeployerItem extends Item { + public MortarDeployerItem() { super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/SentinelItem.java b/src/main/java/net/mcreator/target/item/SentinelItem.java index 79a7ae7d7..c836be0fd 100644 --- a/src/main/java/net/mcreator/target/item/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/SentinelItem.java @@ -4,7 +4,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.SentinelItemRenderer; import net.mcreator.target.procedures.SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.ItemNBTTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; diff --git a/src/main/java/net/mcreator/target/item/common/ammo/BuckshotItem.java b/src/main/java/net/mcreator/target/item/common/BuckshotItem.java similarity index 93% rename from src/main/java/net/mcreator/target/item/common/ammo/BuckshotItem.java rename to src/main/java/net/mcreator/target/item/common/BuckshotItem.java index c6db5a77a..a229c81cb 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/BuckshotItem.java +++ b/src/main/java/net/mcreator/target/item/common/BuckshotItem.java @@ -1,4 +1,4 @@ -package net.mcreator.target.item.common.ammo; +package net.mcreator.target.item.common; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/M4BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/AK47Blueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/M4BlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/AK47Blueprint.java index 1df8365d9..fe5f075bc 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/M4BlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/AK47Blueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class M4BlueprintItem extends Item { - public M4BlueprintItem() { +public class AK47Blueprint extends Item { + public AK47Blueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/AK47BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/AK47BlueprintItem.java deleted file mode 100644 index 966718c04..000000000 --- a/src/main/java/net/mcreator/target/item/common/blueprint/AK47BlueprintItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.blueprint; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class AK47BlueprintItem extends Item { - public AK47BlueprintItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/Aa12BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/Aa12Blueprint.java similarity index 81% rename from src/main/java/net/mcreator/target/item/common/blueprint/Aa12BlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/Aa12Blueprint.java index dac42b3a6..8d9bca0e2 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/Aa12BlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/Aa12Blueprint.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.blueprint; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class Aa12BlueprintItem extends Item { - public Aa12BlueprintItem() { +public class Aa12Blueprint extends Item { + public Aa12Blueprint() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/BocekBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/BocekBlueprint.java similarity index 81% rename from src/main/java/net/mcreator/target/item/common/blueprint/BocekBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/BocekBlueprint.java index 331c17852..21869fc08 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/BocekBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/BocekBlueprint.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.blueprint; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class BocekBlueprintItem extends Item { - public BocekBlueprintItem() { +public class BocekBlueprint extends Item { + public BocekBlueprint() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.SPECIAL)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/M98bBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/DevotionBlueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/M98bBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/DevotionBlueprint.java index 3d5f55670..0c3ddf56a 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/M98bBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/DevotionBlueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class M98bBlueprintItem extends Item { - public M98bBlueprintItem() { +public class DevotionBlueprint extends Item { + public DevotionBlueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/DevotionBluprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/DevotionBluprintItem.java deleted file mode 100644 index cc1ca4ab8..000000000 --- a/src/main/java/net/mcreator/target/item/common/blueprint/DevotionBluprintItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.blueprint; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class DevotionBluprintItem extends Item { - public DevotionBluprintItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/RPKBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/HK416Blueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/RPKBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/HK416Blueprint.java index 54cd9b33b..f8737e96f 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/RPKBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/HK416Blueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class RPKBlueprintItem extends Item { - public RPKBlueprintItem() { +public class HK416Blueprint extends Item { + public HK416Blueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/HK416BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/HuntingRifleBlueprint.java similarity index 87% rename from src/main/java/net/mcreator/target/item/common/blueprint/HK416BlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/HuntingRifleBlueprint.java index 3b9fd8d1c..8da4d562c 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/HK416BlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/HuntingRifleBlueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class HK416BlueprintItem extends Item { - public HK416BlueprintItem() { +public class HuntingRifleBlueprint extends Item { + public HuntingRifleBlueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/HuntingRifleBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/HuntingRifleBlueprintItem.java deleted file mode 100644 index ef3e43ec9..000000000 --- a/src/main/java/net/mcreator/target/item/common/blueprint/HuntingRifleBlueprintItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.blueprint; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class HuntingRifleBlueprintItem extends Item { - public HuntingRifleBlueprintItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/KRABERBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/KRABERBlueprint.java similarity index 81% rename from src/main/java/net/mcreator/target/item/common/blueprint/KRABERBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/KRABERBlueprint.java index 78e393589..655e33767 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/KRABERBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/KRABERBlueprint.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.blueprint; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class KRABERBlueprintItem extends Item { - public KRABERBlueprintItem() { +public class KRABERBlueprint extends Item { + public KRABERBlueprint() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.SPECIAL)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/M79BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/M4Blueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/M79BlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/M4Blueprint.java index efa610f55..417c07a0e 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/M79BlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/M4Blueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class M79BlueprintItem extends Item { - public M79BlueprintItem() { +public class M4Blueprint extends Item { + public M4Blueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/RpgBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/M60Blueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/RpgBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/M60Blueprint.java index 37e9fefec..1894a62fd 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/RpgBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/M60Blueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class RpgBlueprintItem extends Item { - public RpgBlueprintItem() { +public class M60Blueprint extends Item { + public M60Blueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/SKSBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/M79Blueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/SKSBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/M79Blueprint.java index b80bf6cf6..86a9c42b7 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/SKSBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/M79Blueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SKSBlueprintItem extends Item { - public SKSBlueprintItem() { +public class M79Blueprint extends Item { + public M79Blueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/M870BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/M870Blueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/M870BlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/M870Blueprint.java index 14d9c690b..4f37ad27f 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/M870BlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/M870Blueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class M870BlueprintItem extends Item { - public M870BlueprintItem() { +public class M870Blueprint extends Item { + public M870Blueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/M60BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/M98bBlueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/M60BlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/M98bBlueprint.java index 2a7cd600f..cecdd7ec6 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/M60BlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/M98bBlueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class M60BlueprintItem extends Item { - public M60BlueprintItem() { +public class M98bBlueprint extends Item { + public M98bBlueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/MarlinBlueprint.java b/src/main/java/net/mcreator/target/item/common/blueprint/MarlinBlueprint.java new file mode 100644 index 000000000..7f1572e33 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/blueprint/MarlinBlueprint.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.blueprint; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class MarlinBlueprint extends Item { + public MarlinBlueprint() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/MarlinBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/MarlinBlueprintItem.java deleted file mode 100644 index aefd24152..000000000 --- a/src/main/java/net/mcreator/target/item/common/blueprint/MarlinBlueprintItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.blueprint; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class MarlinBlueprintItem extends Item { - public MarlinBlueprintItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/MinigunBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/MinigunBlueprint.java similarity index 81% rename from src/main/java/net/mcreator/target/item/common/blueprint/MinigunBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/MinigunBlueprint.java index a17ba52e6..a82b207a1 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/MinigunBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/MinigunBlueprint.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.blueprint; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MinigunBlueprintItem extends Item { - public MinigunBlueprintItem() { +public class MinigunBlueprint extends Item { + public MinigunBlueprint() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.SPECIAL)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/SvdBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/Mk14Blueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/SvdBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/Mk14Blueprint.java index 120a59d96..63a078fe9 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/SvdBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/Mk14Blueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SvdBlueprintItem extends Item { - public SvdBlueprintItem() { +public class Mk14Blueprint extends Item { + public Mk14Blueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/Mk14BlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/Mk14BlueprintItem.java deleted file mode 100644 index 8fc0898d1..000000000 --- a/src/main/java/net/mcreator/target/item/common/blueprint/Mk14BlueprintItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.blueprint; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class Mk14BlueprintItem extends Item { - public Mk14BlueprintItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/RPKBlueprint.java b/src/main/java/net/mcreator/target/item/common/blueprint/RPKBlueprint.java new file mode 100644 index 000000000..25781e585 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/blueprint/RPKBlueprint.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.blueprint; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class RPKBlueprint extends Item { + public RPKBlueprint() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/RpgBlueprint.java b/src/main/java/net/mcreator/target/item/common/blueprint/RpgBlueprint.java new file mode 100644 index 000000000..b7f3b4f7a --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/blueprint/RpgBlueprint.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.blueprint; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class RpgBlueprint extends Item { + public RpgBlueprint() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/SKSBlueprint.java b/src/main/java/net/mcreator/target/item/common/blueprint/SKSBlueprint.java new file mode 100644 index 000000000..5d429eed5 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/blueprint/SKSBlueprint.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.blueprint; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class SKSBlueprint extends Item { + public SKSBlueprint() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/SentinelBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/SentinelBlueprint.java similarity index 80% rename from src/main/java/net/mcreator/target/item/common/blueprint/SentinelBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/SentinelBlueprint.java index 1fda2f767..04b0404f3 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/SentinelBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/SentinelBlueprint.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.blueprint; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SentinelBlueprintItem extends Item { - public SentinelBlueprintItem() { +public class SentinelBlueprint extends Item { + public SentinelBlueprint() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/SvdBlueprint.java b/src/main/java/net/mcreator/target/item/common/blueprint/SvdBlueprint.java new file mode 100644 index 000000000..b4418626c --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/blueprint/SvdBlueprint.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.blueprint; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class SvdBlueprint extends Item { + public SvdBlueprint() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/TaserBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/TaserBlueprint.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/blueprint/TaserBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/TaserBlueprint.java index 2db6ee41e..f4b9661e5 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/TaserBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/TaserBlueprint.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class TaserBlueprintItem extends Item { - public TaserBlueprintItem() { +public class TaserBlueprint extends Item { + public TaserBlueprint() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/TracheliumBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/TracheliumBlueprint.java similarity index 80% rename from src/main/java/net/mcreator/target/item/common/blueprint/TracheliumBlueprintItem.java rename to src/main/java/net/mcreator/target/item/common/blueprint/TracheliumBlueprint.java index 164cecd1f..fca4c35f1 100644 --- a/src/main/java/net/mcreator/target/item/common/blueprint/TracheliumBlueprintItem.java +++ b/src/main/java/net/mcreator/target/item/common/blueprint/TracheliumBlueprint.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.blueprint; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class TracheliumBlueprintItem extends Item { - public TracheliumBlueprintItem() { +public class TracheliumBlueprint extends Item { + public TracheliumBlueprint() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/VectorBlueprint.java b/src/main/java/net/mcreator/target/item/common/blueprint/VectorBlueprint.java new file mode 100644 index 000000000..cdf081d05 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/blueprint/VectorBlueprint.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.blueprint; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class VectorBlueprint extends Item { + public VectorBlueprint() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/blueprint/VectorBlueprintItem.java b/src/main/java/net/mcreator/target/item/common/blueprint/VectorBlueprintItem.java deleted file mode 100644 index e5d7649da..000000000 --- a/src/main/java/net/mcreator/target/item/common/blueprint/VectorBlueprintItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.blueprint; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class VectorBlueprintItem extends Item { - public VectorBlueprintItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/material/IronPowderItem.java b/src/main/java/net/mcreator/target/item/common/material/CoalIronPowder.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/IronPowderItem.java rename to src/main/java/net/mcreator/target/item/common/material/CoalIronPowder.java index 48068e09d..1c2514b1e 100644 --- a/src/main/java/net/mcreator/target/item/common/material/IronPowderItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/CoalIronPowder.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class IronPowderItem extends Item { - public IronPowderItem() { +public class CoalIronPowder extends Item { + public CoalIronPowder() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/CoalPowderItem.java b/src/main/java/net/mcreator/target/item/common/material/CoalPowder.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/CoalPowderItem.java rename to src/main/java/net/mcreator/target/item/common/material/CoalPowder.java index 2b7c52242..b89af9a1a 100644 --- a/src/main/java/net/mcreator/target/item/common/material/CoalPowderItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/CoalPowder.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CoalPowderItem extends Item { - public CoalPowderItem() { +public class CoalPowder extends Item { + public CoalPowder() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/SoulsteelIngotItem.java b/src/main/java/net/mcreator/target/item/common/material/IronPowder.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/SoulsteelIngotItem.java rename to src/main/java/net/mcreator/target/item/common/material/IronPowder.java index 84d7a90cc..a5e5da44e 100644 --- a/src/main/java/net/mcreator/target/item/common/material/SoulsteelIngotItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/IronPowder.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SoulsteelIngotItem extends Item { - public SoulsteelIngotItem() { +public class IronPowder extends Item { + public IronPowder() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/RawCementedCarbidePowder.java b/src/main/java/net/mcreator/target/item/common/material/RawCementedCarbidePowder.java new file mode 100644 index 000000000..d0c5f62e3 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/material/RawCementedCarbidePowder.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.material; + +import net.minecraft.world.level.Level; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.network.chat.Component; + +import java.util.List; + +public class RawCementedCarbidePowder extends Item { + public RawCementedCarbidePowder() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/material/RawCementedCarbidePowderItem.java b/src/main/java/net/mcreator/target/item/common/material/RawCementedCarbidePowderItem.java deleted file mode 100644 index a1378e4b4..000000000 --- a/src/main/java/net/mcreator/target/item/common/material/RawCementedCarbidePowderItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.material; - -import net.minecraft.world.level.Level; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Item; -import net.minecraft.network.chat.Component; - -import java.util.List; - -public class RawCementedCarbidePowderItem extends Item { - public RawCementedCarbidePowderItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/material/CoalIronPowderItem.java b/src/main/java/net/mcreator/target/item/common/material/SoulSteelIngot.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/CoalIronPowderItem.java rename to src/main/java/net/mcreator/target/item/common/material/SoulSteelIngot.java index a484b33dc..1f87f06d8 100644 --- a/src/main/java/net/mcreator/target/item/common/material/CoalIronPowderItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/SoulSteelIngot.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CoalIronPowderItem extends Item { - public CoalIronPowderItem() { +public class SoulSteelIngot extends Item { + public SoulSteelIngot() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/SoulSteelNugget.java b/src/main/java/net/mcreator/target/item/common/material/SoulSteelNugget.java new file mode 100644 index 000000000..edf537823 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/material/SoulSteelNugget.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.material; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class SoulSteelNugget extends Item { + public SoulSteelNugget() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/material/SoulsteelnuggetItem.java b/src/main/java/net/mcreator/target/item/common/material/SoulsteelnuggetItem.java deleted file mode 100644 index b4600c951..000000000 --- a/src/main/java/net/mcreator/target/item/common/material/SoulsteelnuggetItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.material; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class SoulsteelnuggetItem extends Item { - public SoulsteelnuggetItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/material/TungstenPowder.java b/src/main/java/net/mcreator/target/item/common/material/TungstenPowder.java new file mode 100644 index 000000000..94ab60496 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/material/TungstenPowder.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.material; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class TungstenPowder extends Item { + public TungstenPowder() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/common/material/TungstenPowderItem.java b/src/main/java/net/mcreator/target/item/common/material/TungstenPowderItem.java deleted file mode 100644 index 66e4e03a9..000000000 --- a/src/main/java/net/mcreator/target/item/common/material/TungstenPowderItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item.common.material; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; - -public class TungstenPowderItem extends Item { - public TungstenPowderItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } -} diff --git a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteActionItem.java b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteActionItem.java index 3e3f2cb26..b3ab5d08d 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteActionItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteActionItem.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.material.component; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteBarrelItem.java b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteBarrelItem.java index 989415156..79574812c 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteBarrelItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteBarrelItem.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.material.component; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteSpringItem.java b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteSpringItem.java index 64bfcf3e7..781a999ab 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteSpringItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteSpringItem.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.material.component; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteTriggerItem.java b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteTriggerItem.java index 8c80967fa..5c48571ae 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/NetheriteTriggerItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/NetheriteTriggerItem.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.material.component; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/net/mcreator/target/item/common/material/pack/CommonMaterialPackItem.java b/src/main/java/net/mcreator/target/item/common/material/pack/CommonMaterialPack.java similarity index 87% rename from src/main/java/net/mcreator/target/item/common/material/pack/CommonMaterialPackItem.java rename to src/main/java/net/mcreator/target/item/common/material/pack/CommonMaterialPack.java index 0a9ba0fcf..0aadb0eb9 100644 --- a/src/main/java/net/mcreator/target/item/common/material/pack/CommonMaterialPackItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/pack/CommonMaterialPack.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CommonMaterialPackItem extends Item { - public CommonMaterialPackItem() { +public class CommonMaterialPack extends Item { + public CommonMaterialPack() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/pack/EpicMaterialPackItem.java b/src/main/java/net/mcreator/target/item/common/material/pack/EpicMaterialPack.java similarity index 87% rename from src/main/java/net/mcreator/target/item/common/material/pack/EpicMaterialPackItem.java rename to src/main/java/net/mcreator/target/item/common/material/pack/EpicMaterialPack.java index 58ffb383c..493fff7f0 100644 --- a/src/main/java/net/mcreator/target/item/common/material/pack/EpicMaterialPackItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/pack/EpicMaterialPack.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class EpicMaterialPackItem extends Item { - public EpicMaterialPackItem() { +public class EpicMaterialPack extends Item { + public EpicMaterialPack() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/pack/LegendaryMaterialPackItem.java b/src/main/java/net/mcreator/target/item/common/material/pack/LegendaryMaterialPack.java similarity index 80% rename from src/main/java/net/mcreator/target/item/common/material/pack/LegendaryMaterialPackItem.java rename to src/main/java/net/mcreator/target/item/common/material/pack/LegendaryMaterialPack.java index 9a6735294..2eb7f0727 100644 --- a/src/main/java/net/mcreator/target/item/common/material/pack/LegendaryMaterialPackItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/pack/LegendaryMaterialPack.java @@ -6,12 +6,12 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Item; import net.minecraft.network.chat.Component; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import java.util.List; -public class LegendaryMaterialPackItem extends Item { - public LegendaryMaterialPackItem() { +public class LegendaryMaterialPack extends Item { + public LegendaryMaterialPack() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/pack/RareMaterialPackItem.java b/src/main/java/net/mcreator/target/item/common/material/pack/RareMaterialPack.java similarity index 87% rename from src/main/java/net/mcreator/target/item/common/material/pack/RareMaterialPackItem.java rename to src/main/java/net/mcreator/target/item/common/material/pack/RareMaterialPack.java index 87d652082..99a91223a 100644 --- a/src/main/java/net/mcreator/target/item/common/material/pack/RareMaterialPackItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/pack/RareMaterialPack.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class RareMaterialPackItem extends Item { - public RareMaterialPackItem() { +public class RareMaterialPack extends Item { + public RareMaterialPack() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/pack/SpecialMaterialPackItem.java b/src/main/java/net/mcreator/target/item/common/material/pack/SpecialMaterialPack.java similarity index 80% rename from src/main/java/net/mcreator/target/item/common/material/pack/SpecialMaterialPackItem.java rename to src/main/java/net/mcreator/target/item/common/material/pack/SpecialMaterialPack.java index bb19da0bc..73bfc3b0e 100644 --- a/src/main/java/net/mcreator/target/item/common/material/pack/SpecialMaterialPackItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/pack/SpecialMaterialPack.java @@ -1,6 +1,6 @@ package net.mcreator.target.item.common.material.pack; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SpecialMaterialPackItem extends Item { - public SpecialMaterialPackItem() { +public class SpecialMaterialPack extends Item { + public SpecialMaterialPack() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.SPECIAL)); } diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47.java similarity index 98% rename from src/main/java/net/mcreator/target/item/gun/AK47Item.java rename to src/main/java/net/mcreator/target/item/gun/AK47.java index 2de26d32e..0f76e485b 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class AK47Item extends Item implements GeoItem { +public class AK47 extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public AK47Item() { + public AK47() { 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 24926568c..faea7ab95 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -4,7 +4,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.Aa12ItemRenderer; import net.mcreator.target.procedures.Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/net/mcreator/target/item/gun/AbekiriItem.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java similarity index 98% rename from src/main/java/net/mcreator/target/item/gun/AbekiriItem.java rename to src/main/java/net/mcreator/target/item/gun/Abekiri.java index 1dfe2d9ad..d0bd18d7a 100644 --- a/src/main/java/net/mcreator/target/item/gun/AbekiriItem.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class AbekiriItem extends Item implements GeoItem { +public class Abekiri extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public AbekiriItem() { + public Abekiri() { super(new Item.Properties().durability(24).rarity(Rarity.COMMON)); } 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 14328e635..062589a56 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -4,7 +4,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.BocekItemRenderer; import net.mcreator.target.procedures.BocekreloadProcedure; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/net/mcreator/target/item/gun/KraberItem.java b/src/main/java/net/mcreator/target/item/gun/KraberItem.java index 1bcb0fafb..0287ca13f 100644 --- a/src/main/java/net/mcreator/target/item/gun/KraberItem.java +++ b/src/main/java/net/mcreator/target/item/gun/KraberItem.java @@ -4,7 +4,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.KraberItemRenderer; import net.mcreator.target.procedures.KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; 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..51dfe8961 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -2,7 +2,7 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.client.renderer.item.M79ItemRenderer; import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.minecraft.client.Minecraft; @@ -166,6 +166,6 @@ public class M79Item extends Item implements GeoItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == TargetModItems.GRENADE_40MM.get(); + return stack.getItem() == ItemRegistry.GRENADE_40MM.get(); } } diff --git a/src/main/java/net/mcreator/target/item/gun/MinigunItem.java b/src/main/java/net/mcreator/target/item/gun/MinigunItem.java index a9e56fa9e..e7db71137 100644 --- a/src/main/java/net/mcreator/target/item/gun/MinigunItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MinigunItem.java @@ -4,7 +4,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.MinigunItemRenderer; import net.mcreator.target.procedures.MiniguninbackpackProcedure; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.mcreator.target.tools.ItemNBTTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; 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..c145ab1be 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -27,7 +27,7 @@ import net.minecraft.client.model.HumanoidModel; import net.mcreator.target.procedures.TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.client.renderer.item.RpgItemRenderer; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.Minecraft; @@ -178,6 +178,6 @@ public class RpgItem extends Item implements GeoItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == TargetModItems.ROCKET.get(); + return stack.getItem() == ItemRegistry.ROCKET.get(); } } diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/Sks.java similarity index 98% rename from src/main/java/net/mcreator/target/item/gun/SksItem.java rename to src/main/java/net/mcreator/target/item/gun/Sks.java index 8d8bee8c0..d04234724 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/Sks.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class SksItem extends Item implements GeoItem { +public class Sks extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public SksItem() { + public Sks() { super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/gun/TaserItem.java b/src/main/java/net/mcreator/target/item/gun/Taser.java similarity index 97% rename from src/main/java/net/mcreator/target/item/gun/TaserItem.java rename to src/main/java/net/mcreator/target/item/gun/Taser.java index 730cc82ac..3af7be569 100644 --- a/src/main/java/net/mcreator/target/item/gun/TaserItem.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -2,7 +2,7 @@ package net.mcreator.target.item.gun; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.client.renderer.item.TaserItemRenderer; import net.mcreator.target.procedures.TasercooldownProcedure; import net.minecraft.client.Minecraft; @@ -34,12 +34,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class TaserItem extends Item implements GeoItem { +public class Taser extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public TaserItem() { + public Taser() { super(new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); } @@ -167,6 +167,6 @@ public class TaserItem extends Item implements GeoItem { } protected static boolean check(ItemStack stack) { - return stack.getItem() == TargetModItems.TASER_ELECTRODE.get(); + return stack.getItem() == ItemRegistry.TASER_ELECTRODE.get(); } } diff --git a/src/main/java/net/mcreator/target/item/gun/TracheliumItem.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java similarity index 97% rename from src/main/java/net/mcreator/target/item/gun/TracheliumItem.java rename to src/main/java/net/mcreator/target/item/gun/Trachelium.java index 1aef1c410..6d11e2912 100644 --- a/src/main/java/net/mcreator/target/item/gun/TracheliumItem.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -4,7 +4,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.mcreator.target.client.renderer.item.TracheliumItemRenderer; import net.mcreator.target.procedures.ReloadingProcedure; -import net.mcreator.target.rarity.RarityTool; +import net.mcreator.target.tools.RarityTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -33,12 +33,12 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.UUID; import java.util.function.Consumer; -public class TracheliumItem extends Item implements GeoItem { +public class Trachelium extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public TracheliumItem() { + public Trachelium() { super(new Item.Properties().stacksTo(1).rarity(RarityTool.LEGENDARY)); } diff --git a/src/main/java/net/mcreator/target/item/gun/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/Vector.java similarity index 98% rename from src/main/java/net/mcreator/target/item/gun/VectorItem.java rename to src/main/java/net/mcreator/target/item/gun/Vector.java index 6f085ed5b..ac9cab67b 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/Vector.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class VectorItem extends Item implements GeoItem { +public class Vector extends Item implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationprocedure = "empty"; public static ItemDisplayContext transformType; - public VectorItem() { + public Vector() { super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/potion/ShockMobEffect.java b/src/main/java/net/mcreator/target/mobeffect/ShockMobEffect.java similarity index 96% rename from src/main/java/net/mcreator/target/potion/ShockMobEffect.java rename to src/main/java/net/mcreator/target/mobeffect/ShockMobEffect.java index bfef2ec9d..14149e2d2 100644 --- a/src/main/java/net/mcreator/target/potion/ShockMobEffect.java +++ b/src/main/java/net/mcreator/target/mobeffect/ShockMobEffect.java @@ -1,4 +1,4 @@ -package net.mcreator.target.potion; +package net.mcreator.target.mobeffect; import net.mcreator.target.procedures.ShockDangYaoShuiXiaoGuoKaiShiYingYongShiProcedure; import net.mcreator.target.procedures.ShockZaiXiaoGuoChiXuShiMeiKeFaShengProcedure; diff --git a/src/main/java/net/mcreator/target/network/DoublejumpinputMessage.java b/src/main/java/net/mcreator/target/network/DoubleJumpMessage.java similarity index 75% rename from src/main/java/net/mcreator/target/network/DoublejumpinputMessage.java rename to src/main/java/net/mcreator/target/network/DoubleJumpMessage.java index 9cfc36dcd..9415dc7ed 100644 --- a/src/main/java/net/mcreator/target/network/DoublejumpinputMessage.java +++ b/src/main/java/net/mcreator/target/network/DoubleJumpMessage.java @@ -13,25 +13,25 @@ import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class DoublejumpinputMessage { +public class DoubleJumpMessage { int type, pressedms; - public DoublejumpinputMessage(int type, int pressedms) { + public DoubleJumpMessage(int type, int pressedms) { this.type = type; this.pressedms = pressedms; } - public DoublejumpinputMessage(FriendlyByteBuf buffer) { + public DoubleJumpMessage(FriendlyByteBuf buffer) { this.type = buffer.readInt(); this.pressedms = buffer.readInt(); } - public static void buffer(DoublejumpinputMessage message, FriendlyByteBuf buffer) { + public static void buffer(DoubleJumpMessage message, FriendlyByteBuf buffer) { buffer.writeInt(message.type); buffer.writeInt(message.pressedms); } - public static void handler(DoublejumpinputMessage message, Supplier contextSupplier) { + public static void handler(DoubleJumpMessage message, Supplier contextSupplier) { NetworkEvent.Context context = contextSupplier.get(); context.enqueueWork(() -> pressAction(context.getSender(), message.type, message.pressedms)); context.setPacketHandled(true); @@ -53,6 +53,6 @@ public class DoublejumpinputMessage { @SubscribeEvent public static void registerMessage(FMLCommonSetupEvent event) { - TargetMod.addNetworkMessage(DoublejumpinputMessage.class, DoublejumpinputMessage::buffer, DoublejumpinputMessage::new, DoublejumpinputMessage::handler); + TargetMod.addNetworkMessage(DoubleJumpMessage.class, DoubleJumpMessage::buffer, DoubleJumpMessage::new, DoubleJumpMessage::handler); } } diff --git a/src/main/java/net/mcreator/target/network/FiremodeMessage.java b/src/main/java/net/mcreator/target/network/FireModeMessage.java similarity index 81% rename from src/main/java/net/mcreator/target/network/FiremodeMessage.java rename to src/main/java/net/mcreator/target/network/FireModeMessage.java index 083ac46e8..fc4c366a9 100644 --- a/src/main/java/net/mcreator/target/network/FiremodeMessage.java +++ b/src/main/java/net/mcreator/target/network/FireModeMessage.java @@ -13,25 +13,25 @@ import net.minecraftforge.network.NetworkEvent; import java.util.function.Supplier; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class FiremodeMessage { +public class FireModeMessage { int type, pressedms; - public FiremodeMessage(int type, int pressedms) { + public FireModeMessage(int type, int pressedms) { this.type = type; this.pressedms = pressedms; } - public FiremodeMessage(FriendlyByteBuf buffer) { + public FireModeMessage(FriendlyByteBuf buffer) { this.type = buffer.readInt(); this.pressedms = buffer.readInt(); } - public static void buffer(FiremodeMessage message, FriendlyByteBuf buffer) { + public static void buffer(FireModeMessage message, FriendlyByteBuf buffer) { buffer.writeInt(message.type); buffer.writeInt(message.pressedms); } - public static void handler(FiremodeMessage message, Supplier contextSupplier) { + public static void handler(FireModeMessage message, Supplier contextSupplier) { NetworkEvent.Context context = contextSupplier.get(); context.enqueueWork(() -> { pressAction(context.getSender(), message.type, message.pressedms); @@ -55,6 +55,6 @@ public class FiremodeMessage { @SubscribeEvent public static void registerMessage(FMLCommonSetupEvent event) { - TargetMod.addNetworkMessage(FiremodeMessage.class, FiremodeMessage::buffer, FiremodeMessage::new, FiremodeMessage::handler); + TargetMod.addNetworkMessage(FireModeMessage.class, FireModeMessage::buffer, FireModeMessage::new, FireModeMessage::handler); } } diff --git a/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java index 02b1e39ee..c135bc9ec 100644 --- a/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class Aa12autofireProcedure { ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1 && usehand.getOrCreateTag().getDouble("firemode") == 2) { - if (usehand.getItem() == TargetModItems.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { for (int index0 = 0; index0 < 8; index0++) { BulletFireNormalProcedure.execute(entity); @@ -65,7 +65,7 @@ public class Aa12autofireProcedure { } } else if (entity.getPersistentData().getDouble("firing") == 1 && usehand.getOrCreateTag().getDouble("firemode") == 0) { entity.getPersistentData().putDouble("firing", 0); - if (usehand.getItem() == TargetModItems.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck20 && _plrCldCheck20.getCooldowns().isOnCooldown(usehand.getItem()))) { for (int index1 = 0; index1 < 8; index1++) { BulletFireNormalProcedure.execute(entity); diff --git a/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java index 737d2cae0..5d127c4f1 100644 --- a/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class Ak47autofireProcedure { ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.AK_47.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.AK_47.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { usehand.getOrCreateTag().putDouble("firecooldown", 7); if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java b/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java index cbbfa7be5..4692dcf3c 100644 --- a/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AmmocountProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -36,10 +36,10 @@ public class AmmocountProcedure { } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("firemode") == 0) { firemode = "Semi"; } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get()) { + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get()) { return (new java.text.DecimalFormat("##").format((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("maxammo"))) + " " + firemode; } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get()) { + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get()) { return new java.text.DecimalFormat("##").format((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo) + " " + firemode; } if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("rifle") == 1) { diff --git a/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java index c4d198822..b79b9adbe 100644 --- a/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java @@ -3,7 +3,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.entity.BocekarrowEntity; import net.mcreator.target.entity.ProjectileEntity; import net.mcreator.target.init.TargetModEntities; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -29,7 +29,7 @@ public class BowlooseProcedure { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:bowpull1p"); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power") >= 6) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("speed", ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power"))); diff --git a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java index 99ea9cc16..5c3a8aa8a 100644 --- a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java @@ -2,7 +2,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.entity.ProjectileEntity; import net.mcreator.target.init.TargetModAttributes; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -36,7 +36,7 @@ public class BulletFireNormalProcedure { if (!entity.level().isClientSide() && entity instanceof LivingEntity living) { float damage; - if (heldItem.getItem() == TargetModItems.BOCEK.get()) { + if (heldItem.getItem() == ItemRegistry.BOCEK.get()) { damage = (float) heldItem.getOrCreateTag().getDouble("speed") * (float) heldItem.getOrCreateTag().getDouble("damageadd"); } else { damage = (float) (heldItem.getOrCreateTag().getDouble("damage") + heldItem.getOrCreateTag().getDouble("adddamage")) diff --git a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java index fc64eec67..537018a48 100644 --- a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; @@ -18,8 +18,8 @@ public class ChangefiremodeProcedure { return; ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (usehand.getItem() == TargetModItems.AK_47.get() || usehand.getItem() == TargetModItems.M_4.get() || usehand.getItem() == TargetModItems.AA_12.get() || usehand.getItem() == TargetModItems.HK_416.get() - || usehand.getItem() == TargetModItems.RPK.get() || usehand.getItem() == TargetModItems.MK_14.get()) { + if (usehand.getItem() == ItemRegistry.AK_47.get() || usehand.getItem() == ItemRegistry.M_4.get() || usehand.getItem() == ItemRegistry.AA_12.get() || usehand.getItem() == ItemRegistry.HK_416.get() + || usehand.getItem() == ItemRegistry.RPK.get() || usehand.getItem() == ItemRegistry.MK_14.get()) { if (usehand.getOrCreateTag().getDouble("firemode") == 2) { usehand.getOrCreateTag().putDouble("firemode", 0); usehand.getOrCreateTag().putDouble("cg", 10); @@ -45,7 +45,7 @@ public class ChangefiremodeProcedure { _player.displayClientMessage(Component.literal("Auto"), true); } } - if (usehand.getItem() == TargetModItems.VECTOR.get()) { + if (usehand.getItem() == ItemRegistry.VECTOR.get()) { if (usehand.getOrCreateTag().getDouble("firemode") == 0) { usehand.getOrCreateTag().putDouble("firemode", 1); usehand.getOrCreateTag().putDouble("cg", 10); @@ -82,7 +82,7 @@ public class ChangefiremodeProcedure { _player.displayClientMessage(Component.literal("Semi"), true); } } - if (usehand.getItem() == TargetModItems.SENTINEL.get() && !(entity instanceof Player _plrCldCheck36 && _plrCldCheck36.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("charging") == 0) { + if (usehand.getItem() == ItemRegistry.SENTINEL.get() && !(entity instanceof Player _plrCldCheck36 && _plrCldCheck36.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("charging") == 0) { usehand.getOrCreateTag().putDouble("charging", 1); usehand.getOrCreateTag().putDouble("cid", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); usehand.getOrCreateTag().putDouble("chargingtime", 128); diff --git a/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java b/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java index 7756a10d5..c4d9f8bee 100644 --- a/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ClaymoreDangShiTiGengXinKeShiProcedure.java @@ -3,7 +3,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.TargetMod; import net.mcreator.target.entity.ClaymoreEntity; import net.mcreator.target.entity.Target1Entity; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; @@ -52,7 +52,7 @@ public class ClaymoreDangShiTiGengXinKeShiProcedure { } } if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, y, z, new ItemStack(TargetModItems.CLAYMORE_MINE.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, y, z, new ItemStack(ItemRegistry.CLAYMORE_MINE.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } diff --git a/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java index 332d53266..40b32cb55 100644 --- a/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ClaymoreYouJiShiTiShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.TamableAnimal; @@ -16,7 +16,7 @@ public class ClaymoreYouJiShiTiShiProcedure { if (!entity.level().isClientSide()) entity.discard(); if (sourceentity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.CLAYMORE_MINE.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.CLAYMORE_MINE.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } diff --git a/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index 35e0b6c9a..e90e44fe7 100644 --- a/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.CREATIVE_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.CREATIVE_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java index 38d2d086d..dc8b66547 100644 --- a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -14,6 +14,6 @@ public class CrosshairXianShiYouXiNeiDieJiaCengProcedure { if (entity == null) return false; return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun"))) && entity.getPersistentData().getDouble("miaozhunshijian") < 7 - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; + && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_79.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; } } diff --git a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java b/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java index 8cf06b420..c71982d09 100644 --- a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -42,8 +42,8 @@ public class DamageReduceProcedure { } if (damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) { stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() - || (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get()) { + if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_79.get() + || (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.RPG.get()) { damage = amount; stack.getOrCreateTag().putDouble("damagetotal", (stack.getOrCreateTag().getDouble("damagetotal") + damage)); } @@ -51,7 +51,7 @@ public class DamageReduceProcedure { if (damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:gunfire")))) { stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); distanse = (entity.position()).distanceTo((sourceentity.position())); - if (stack.getOrCreateTag().getDouble("shotgun") == 1 || stack.getItem() == TargetModItems.BOCEK.get()) { + if (stack.getOrCreateTag().getDouble("shotgun") == 1 || stack.getItem() == ItemRegistry.BOCEK.get()) { if (distanse > 20) { ((LivingHurtEvent) event).setAmount(((float) (amount / (1 + 0.05 * (distanse - 20))))); damage = amount / (1 + 0.05 * (distanse - 20)); diff --git a/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java b/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java index fb079a220..2a0f04af1 100644 --- a/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -37,22 +37,22 @@ public class DevotionAutofireProcedure { } } if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 1) { + if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 1) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 5) { + if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 5) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 9) { + if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 9) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 12) { + if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 12) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 15) { + if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 15) { DevofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && (entity.getPersistentData().getDouble("dvfire") == 17 || entity.getPersistentData().getDouble("dvfire") == 18 || entity.getPersistentData().getDouble("dvfire") == 19)) { DevofireProcedure.execute(entity); } diff --git a/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java b/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java index b6c55340f..7ba2a5c2b 100644 --- a/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DismantlePressProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.entity.Entity; @@ -30,14 +30,14 @@ public class DismantlePressProcedure { } if (stack.getRarity() == Rarity.RARE) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.INGOT_STEEL.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.INGOT_STEEL.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (stack.getRarity() == Rarity.EPIC) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.CEMENTED_CARBIDE_INGOT.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.CEMENTED_CARBIDE_INGOT.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } @@ -51,7 +51,7 @@ public class DismantlePressProcedure { } if (stack.is(ItemTags.create(new ResourceLocation("target:special_gun")))) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.SOULSTEEL_INGOT.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_INGOT.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } @@ -59,34 +59,34 @@ public class DismantlePressProcedure { if (stack.getOrCreateTag().getDouble("level") >= 10) { if (Math.random() < 0.005 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.SOULSTEELNUGGET.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); _setstack.setCount(3); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (Math.random() < 0.01 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.SOULSTEELNUGGET.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); _setstack.setCount(2); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (Math.random() < 0.03 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.SOULSTEELNUGGET.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (Math.random() < 0.06 * stack.getOrCreateTag().getDouble("level")) { if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.SOULSTEELNUGGET.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } } if (entity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.SOULSTEELNUGGET.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.SOUL_STEEL_NUGGET.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } diff --git a/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java b/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java index 1704fd109..ee77f3955 100644 --- a/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/GunsDataProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.entity.Entity; @@ -40,7 +40,7 @@ public class GunsDataProcedure { } else { itemstackiterator.getOrCreateTag().putDouble("damageadd", 1); } - if (itemstackiterator.getItem() == TargetModItems.SKS.get()) { + if (itemstackiterator.getItem() == ItemRegistry.SKS.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -53,7 +53,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 20); } - if (itemstackiterator.getItem() == TargetModItems.AK_47.get()) { + if (itemstackiterator.getItem() == ItemRegistry.AK_47.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -66,7 +66,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 30); itemstackiterator.getOrCreateTag().putDouble("mag", 30); } - if (itemstackiterator.getItem() == TargetModItems.DEVOTION.get()) { + if (itemstackiterator.getItem() == ItemRegistry.DEVOTION.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.9); itemstackiterator.getOrCreateTag().putDouble("zoom", 2); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -82,7 +82,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 55); itemstackiterator.getOrCreateTag().putDouble("firemode", 2); } - if (itemstackiterator.getItem() == TargetModItems.TRACHELIUM.get()) { + if (itemstackiterator.getItem() == ItemRegistry.TRACHELIUM.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.7); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 3); @@ -95,7 +95,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 8); } - if (itemstackiterator.getItem() == TargetModItems.HUNTING_RIFLE.get()) { + if (itemstackiterator.getItem() == ItemRegistry.HUNTING_RIFLE.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -107,7 +107,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 50); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == TargetModItems.TASER.get()) { + if (itemstackiterator.getItem() == ItemRegistry.TASER.get()) { itemstackiterator.getOrCreateTag().putDouble("dev", 2); itemstackiterator.getOrCreateTag().putDouble("recoilx", 0.0001); itemstackiterator.getOrCreateTag().putDouble("recoily", 0.002); @@ -117,7 +117,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 3); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == TargetModItems.M_79.get()) { + if (itemstackiterator.getItem() == ItemRegistry.M_79.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 1); @@ -127,7 +127,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 3.75); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == TargetModItems.ABEKIRI.get()) { + if (itemstackiterator.getItem() == ItemRegistry.ABEKIRI.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.4); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 5); @@ -139,7 +139,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 15); itemstackiterator.getOrCreateTag().putDouble("mag", 2); } - if (itemstackiterator.getItem() == TargetModItems.M_98B.get()) { + if (itemstackiterator.getItem() == ItemRegistry.M_98B.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.85); itemstackiterator.getOrCreateTag().putDouble("zoom", 4); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -151,7 +151,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 55); itemstackiterator.getOrCreateTag().putDouble("mag", 5); } - if (itemstackiterator.getItem() == TargetModItems.RPG.get()) { + if (itemstackiterator.getItem() == ItemRegistry.RPG.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.77); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 5); @@ -161,7 +161,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 5.75); itemstackiterator.getOrCreateTag().putDouble("mag", 1); } - if (itemstackiterator.getItem() == TargetModItems.M_4.get()) { + if (itemstackiterator.getItem() == ItemRegistry.M_4.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.15); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -174,7 +174,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 45); itemstackiterator.getOrCreateTag().putDouble("mag", 30); } - if (itemstackiterator.getItem() == TargetModItems.AA_12.get()) { + if (itemstackiterator.getItem() == ItemRegistry.AA_12.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -187,7 +187,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 16); itemstackiterator.getOrCreateTag().putDouble("mag", 25); } - if (itemstackiterator.getItem() == TargetModItems.BOCEK.get()) { + if (itemstackiterator.getItem() == ItemRegistry.BOCEK.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1); itemstackiterator.getOrCreateTag().putDouble("zoom", 2); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -197,7 +197,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("headshot", 1.5); itemstackiterator.getOrCreateTag().putDouble("damage", 2.4); } - if (itemstackiterator.getItem() == TargetModItems.HK_416.get()) { + if (itemstackiterator.getItem() == ItemRegistry.HK_416.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.3); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -210,7 +210,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 45); itemstackiterator.getOrCreateTag().putDouble("mag", 30); } - if (itemstackiterator.getItem() == TargetModItems.RPK.get()) { + if (itemstackiterator.getItem() == ItemRegistry.RPK.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.0); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -226,7 +226,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 50); } - if (itemstackiterator.getItem() == TargetModItems.KRABER.get()) { + if (itemstackiterator.getItem() == ItemRegistry.KRABER.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.8); itemstackiterator.getOrCreateTag().putDouble("zoom", 3); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -239,7 +239,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 40); itemstackiterator.getOrCreateTag().putDouble("mag", 4); } - if (itemstackiterator.getItem() == TargetModItems.VECTOR.get()) { + if (itemstackiterator.getItem() == ItemRegistry.VECTOR.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.6); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -252,7 +252,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 22); itemstackiterator.getOrCreateTag().putDouble("mag", 33); } - if (itemstackiterator.getItem() == TargetModItems.MINIGUN.get()) { + if (itemstackiterator.getItem() == ItemRegistry.MINIGUN.get()) { itemstackiterator.getOrCreateTag().putDouble("zoom", 1); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); itemstackiterator.getOrCreateTag().putDouble("autorifle", 1); @@ -265,7 +265,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 40); itemstackiterator.getOrCreateTag().putDouble("firemode", 2); } - if (itemstackiterator.getItem() == TargetModItems.MK_14.get()) { + if (itemstackiterator.getItem() == ItemRegistry.MK_14.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.9); itemstackiterator.getOrCreateTag().putDouble("zoom", 3.4); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -279,7 +279,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 45); itemstackiterator.getOrCreateTag().putDouble("mag", 20); } - if (itemstackiterator.getItem() == TargetModItems.SENTINEL.get()) { + if (itemstackiterator.getItem() == ItemRegistry.SENTINEL.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.95); itemstackiterator.getOrCreateTag().putDouble("zoom", 3); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -291,7 +291,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("headshot", 3); itemstackiterator.getOrCreateTag().putDouble("velocity", 50); } - if (itemstackiterator.getItem() == TargetModItems.M_60.get()) { + if (itemstackiterator.getItem() == ItemRegistry.M_60.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.85); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -307,7 +307,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("mag", 100); itemstackiterator.getOrCreateTag().putDouble("firemode", 2); } - if (itemstackiterator.getItem() == TargetModItems.SVD.get()) { + if (itemstackiterator.getItem() == ItemRegistry.SVD.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 0.9); itemstackiterator.getOrCreateTag().putDouble("zoom", 4); itemstackiterator.getOrCreateTag().putDouble("sniperguns", 1); @@ -319,7 +319,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 50); itemstackiterator.getOrCreateTag().putDouble("mag", 10); } - if (itemstackiterator.getItem() == TargetModItems.MARLIN.get()) { + if (itemstackiterator.getItem() == ItemRegistry.MARLIN.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("rifle", 1); @@ -331,7 +331,7 @@ public class GunsDataProcedure { itemstackiterator.getOrCreateTag().putDouble("velocity", 27); itemstackiterator.getOrCreateTag().putDouble("mag", 8); } - if (itemstackiterator.getItem() == TargetModItems.M_870.get()) { + if (itemstackiterator.getItem() == ItemRegistry.M_870.get()) { itemstackiterator.getOrCreateTag().putDouble("zoomspeed", 1.1); itemstackiterator.getOrCreateTag().putDouble("zoom", 1.25); itemstackiterator.getOrCreateTag().putDouble("dev", 3); diff --git a/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java b/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java index b1cf76310..6094f3976 100644 --- a/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; @@ -33,7 +33,7 @@ public class GunsTipsProcedure { String firemode = ""; ItemStack usehand = ItemStack.EMPTY; if (itemstack.is(ItemTags.create(new ResourceLocation("target:gun")))) { - if (itemstack.getItem() == TargetModItems.BOCEK.get()) { + if (itemstack.getItem() == ItemRegistry.BOCEK.get()) { tooltip.add(Component.literal(("\u00A7l\u00A77Damage:(" + new java.text.DecimalFormat("##.##").format(2.4 * itemstack.getOrCreateTag().getDouble("damageadd")) + ")*10/" + new java.text.DecimalFormat("##.##").format(24 * itemstack.getOrCreateTag().getDouble("damageadd"))))); } else { @@ -57,19 +57,19 @@ public class GunsTipsProcedure { + new java.text.DecimalFormat("##.##").format(100 * (itemstack.getOrCreateTag().getDouble("damagenow") / itemstack.getOrCreateTag().getDouble("damageneed"))) + "%"))); } } - if (itemstack.getItem() == TargetModItems.CREATIVE_AMMO_BOX.get()) { + if (itemstack.getItem() == ItemRegistry.CREATIVE_AMMO_BOX.get()) { tooltip.add(Component.literal("Creative Ammo * 2147483647")); } - if (itemstack.getItem() == TargetModItems.RIFLE_AMMO_BOX.get()) { + if (itemstack.getItem() == ItemRegistry.RIFLE_AMMO_BOX.get()) { tooltip.add(Component.literal("Rifle Ammo * 30")); } - if (itemstack.getItem() == TargetModItems.HANDGUN_AMMO_BOX.get()) { + if (itemstack.getItem() == ItemRegistry.HANDGUN_AMMO_BOX.get()) { tooltip.add(Component.literal("Handgun Ammo * 30")); } - if (itemstack.getItem() == TargetModItems.SHOTGUN_AMMO_BOX.get()) { + if (itemstack.getItem() == ItemRegistry.SHOTGUN_AMMO_BOX.get()) { tooltip.add(Component.literal("Shotgun Ammo * 12")); } - if (itemstack.getItem() == TargetModItems.SNIPER_AMMO_BOX.get()) { + if (itemstack.getItem() == ItemRegistry.SNIPER_AMMO_BOX.get()) { tooltip.add(Component.literal("Sniper Ammo * 12")); } } diff --git a/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index fc8dfdaeb..99ea4e771 100644 --- a/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.HANDGUN_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.HANDGUN_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index aa80df9b5..4f8c131cc 100644 --- a/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -32,7 +32,7 @@ public class HandgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.HANDGUN_AMMO.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.HANDGUN_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java index 6e4c56a60..ff46010ea 100644 --- a/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -35,13 +35,13 @@ public class Hk416firerandomProcedure { entity.getPersistentData().putDouble("hkfire", 0); } if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 1) { + if (usehand.getItem() == ItemRegistry.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 1) { Hk416autofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 3) { + if (usehand.getItem() == ItemRegistry.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 3) { Hk416autofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 5) { + if (usehand.getItem() == ItemRegistry.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 5) { Hk416autofireProcedure.execute(entity); } if (entity.getPersistentData().getDouble("hkfire") >= 5) { diff --git a/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java b/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java index d2891bbcd..9931c6181 100644 --- a/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -35,13 +35,13 @@ public class M4firerandomProcedure { entity.getPersistentData().putDouble("m4fire", 0); } if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 1) { + if (usehand.getItem() == ItemRegistry.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 1) { M4autofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 3) { + if (usehand.getItem() == ItemRegistry.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 3) { M4autofireProcedure.execute(entity); } - if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 5) { + if (usehand.getItem() == ItemRegistry.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 5) { M4autofireProcedure.execute(entity); } if (entity.getPersistentData().getDouble("m4fire") >= 5) { diff --git a/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java index a65db0b81..95193e50e 100644 --- a/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -35,7 +35,7 @@ public class M60autofireProcedure { ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.M_60.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.M_60.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (usehand.getOrCreateTag().getDouble("animindex") == 1) { usehand.getOrCreateTag().putDouble("animindex", 0); diff --git a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 9a55b607c..1f86498fc 100644 --- a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -46,7 +46,7 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { if (itemstack.getOrCreateTag().getDouble("maxammo") >= ammo1) { itemstack.getOrCreateTag().putDouble("ammo", (itemstack.getOrCreateTag().getDouble("ammo") + ammo1)); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.GRENADE_40MM.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); @@ -54,7 +54,7 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { } else { itemstack.getOrCreateTag().putDouble("ammo", (itemstack.getOrCreateTag().getDouble("ammo") + itemstack.getOrCreateTag().getDouble("maxammo"))); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.GRENADE_40MM.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); diff --git a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java index e0111b053..afd28b855 100644 --- a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; @@ -12,7 +12,7 @@ public class M79uiXianShiYouXiNeiDieJiaCengProcedure { public static boolean execute(Entity entity) { if (entity == null) return false; - return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON + return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_79.get() && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON && !(entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming; } } diff --git a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java index 97da1c32e..d063aef18 100644 --- a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -17,7 +17,7 @@ public class MarlinfireProcedure { if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("forcestop", 1); } - if (usehand.getItem() == TargetModItems.MARLIN.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem())) + if (usehand.getItem() == ItemRegistry.MARLIN.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java index bdadd3987..c60fc4c14 100644 --- a/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -34,7 +34,7 @@ public class MinigunautofireProcedure { return; ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (usehand.getItem() == TargetModItems.MINIGUN.get()) { + if (usehand.getItem() == ItemRegistry.MINIGUN.get()) { if (entity.getPersistentData().getDouble("minifiring") == 1 && !entity.isSprinting()) { if (usehand.getOrCreateTag().getDouble("rot") < 10) { usehand.getOrCreateTag().putDouble("rot", (usehand.getOrCreateTag().getDouble("rot") + 1)); @@ -51,7 +51,7 @@ public class MinigunautofireProcedure { } } } - if (usehand.getItem() == TargetModItems.MINIGUN.get() && usehand.getOrCreateTag().getDouble("overheat") == 0 + if (usehand.getItem() == ItemRegistry.MINIGUN.get() && usehand.getOrCreateTag().getDouble("overheat") == 0 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0 && !(entity instanceof Player _plrCldCheck13 && _plrCldCheck13.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("rot") >= 10) { usehand.getOrCreateTag().putDouble("heat", (usehand.getOrCreateTag().getDouble("heat") + 1)); diff --git a/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java b/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java index fc049c8eb..73b4c6c33 100644 --- a/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MiniguninbackpackProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -17,7 +17,7 @@ public class MiniguninbackpackProcedure { } else { itemstack.getOrCreateTag().putDouble("heatbar", (itemstack.getOrCreateTag().getDouble("heat"))); } - if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get())) { + if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get())) { entity.getPersistentData().putDouble("minigunfiring", 0); } if (itemstack.getOrCreateTag().getDouble("overheat") > 0) { diff --git a/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java index 82ca2cba5..c3b922ca1 100644 --- a/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class Mk14autofireProcedure { ItemStack usehand; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.MK_14.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.MK_14.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 2); diff --git a/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java b/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java index 85d42ed72..874b3e981 100644 --- a/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MortarDangXiaoShiShiJianDaoShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; @@ -12,17 +12,17 @@ public class MortarDangXiaoShiShiJianDaoShiProcedure { if (world instanceof Level _level && !_level.isClientSide()) _level.explode(null, x, y, z, 0, Level.ExplosionInteraction.NONE); if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(TargetModItems.MORTARBARREL.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(ItemRegistry.MORTAR_BARREL.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(TargetModItems.MORTARBIPOD.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(ItemRegistry.MORTAR_BIPOD.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } if (world instanceof ServerLevel _level) { - ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(TargetModItems.MORATR_BASE_PLATE.get())); + ItemEntity entityToSpawn = new ItemEntity(_level, x, (y + 1), z, new ItemStack(ItemRegistry.MORTAR_BASE_PLATE.get())); entityToSpawn.setPickUpDelay(10); _level.addFreshEntity(entityToSpawn); } diff --git a/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java b/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java index 4e019e333..0c4295e87 100644 --- a/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -39,8 +39,8 @@ public class PressFireProcedure { M870fireProcedure.execute(entity); AKfireProcedure.execute(entity); if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun"))) - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get()) - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get()) + && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get()) + && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get()) && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") != 1) { { @@ -51,7 +51,7 @@ public class PressFireProcedure { } } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MINIGUN.get() && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo == 0) { { Entity _ent = entity; diff --git a/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java index 9d3e6e813..f6dc80469 100644 --- a/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -33,7 +33,7 @@ public class PullXiaoGuoChiXuShiMeiKeFaShengProcedure { if (entity == null) return; if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).bowpullhold) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("maxammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power") < 12) { @@ -71,7 +71,7 @@ public class PullXiaoGuoChiXuShiMeiKeFaShengProcedure { } } } else { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get()) { + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get()) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("power", 0); } { diff --git a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java index 374302d10..1c8bec40c 100644 --- a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java @@ -12,7 +12,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.CommandSource; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import javax.annotation.Nullable; @@ -272,7 +272,7 @@ public class ReloadsoundstopProcedure { } } } - if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MARLIN.get())) { + if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.MARLIN.get())) { { Entity _ent = entity; if (!_ent.level().isClientSide() && _ent.getServer() != null) { @@ -295,7 +295,7 @@ public class ReloadsoundstopProcedure { } } } - if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_870.get())) { + if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.M_870.get())) { { Entity _ent = entity; if (!_ent.level().isClientSide() && _ent.getServer() != null) { diff --git a/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index 5cef27ad1..84fa2824a 100644 --- a/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.RIFLE_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.RIFLE_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index c1b9d0836..91914e0f9 100644 --- a/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -33,7 +33,7 @@ public class RifleAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.RIFLE_AMMO.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.RIFLE_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java b/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java index 8b849abeb..63dca068d 100644 --- a/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RocketShiTiBeiGongJuJiZhongShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -20,7 +20,7 @@ public class RocketShiTiBeiGongJuJiZhongShiProcedure { if (world instanceof Level _level && !_level.isClientSide()) _level.explode(null, (sourceentity.getX()), (sourceentity.getY() + 1), (sourceentity.getZ()), 6, Level.ExplosionInteraction.NONE); if (sourceentity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.ROCKET.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.ROCKET.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java b/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java index b5cffdc67..f4fd25990 100644 --- a/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpgemptyProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -27,11 +27,11 @@ public class RpgemptyProcedure { private static void execute(@Nullable Event event, Entity entity) { if (entity == null) return; - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.RPG.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 1) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("empty", 0); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemRegistry.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 1) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("empty", 0); } diff --git a/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java index a37d1d4c2..34b6699d8 100644 --- a/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class RpkautofireProcedure { ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.RPK.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.RPK.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 2); diff --git a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index 4c8b70a68..851b5881a 100644 --- a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.SHOTGUN_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.SHOTGUN_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index 9e1a5c6d4..41bbf35e9 100644 --- a/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -33,7 +33,7 @@ public class ShotgunAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.SHOTGUN_AMMO.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.SHOTGUN_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java b/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java index 7b5c96c60..abdf4c931 100644 --- a/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -21,7 +21,7 @@ public class SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure { if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.SNIPER_AMMO_BOX.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.SNIPER_AMMO_BOX.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } { diff --git a/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java index 5ff4a9daf..2f5938709 100644 --- a/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -32,7 +32,7 @@ public class SniperAmmoYouJiKongQiShiShiTiDeWeiZhiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.SNIPER_AMMO.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.SNIPER_AMMO.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 123a9a1e5..fd9892b25 100644 --- a/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -50,7 +50,7 @@ public class TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { if (itemstack.getOrCreateTag().getDouble("maxammo") >= 0) { itemstack.getOrCreateTag().putDouble("ammo", 1); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.ROCKET.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.ROCKET.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); diff --git a/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java index 175364157..c5a65dacc 100644 --- a/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Target1DangYouJiShiTiShiProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.arguments.EntityAnchorArgument; import net.minecraft.world.entity.Entity; @@ -18,7 +18,7 @@ public class Target1DangYouJiShiTiShiProcedure { if (!entity.level().isClientSide()) entity.discard(); if (sourceentity instanceof Player _player) { - ItemStack _setstack = new ItemStack(TargetModItems.TARGETDEPLOYER.get()); + ItemStack _setstack = new ItemStack(ItemRegistry.TARGET_DEPLOYER.get()); _setstack.setCount(1); ItemHandlerHelper.giveItemToPlayer(_player, _setstack); } diff --git a/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java index 7aae24019..910a20893 100644 --- a/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TargetdeployerDangYouJianDianJiFangKuaiShiProcedure.java @@ -1,7 +1,7 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModEntities; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -23,7 +23,7 @@ public class TargetdeployerDangYouJianDianJiFangKuaiShiProcedure { } } if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.TARGETDEPLOYER.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.TARGET_DEPLOYER.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } if (entity instanceof LivingEntity _entity) diff --git a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java index 2b071b44d..a027f3514 100644 --- a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -45,7 +45,7 @@ public class TasercooldownProcedure { if (itemstack.getOrCreateTag().getDouble("maxammo") >= 1) { itemstack.getOrCreateTag().putDouble("ammo", 1); if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.TASER_ELECTRODE.get()); + ItemStack _stktoremove = new ItemStack(ItemRegistry.TASER_ELECTRODE.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); } itemstack.getOrCreateTag().putDouble("reloading", 0); diff --git a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java index aded68773..ecb57ade7 100644 --- a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.resources.ResourceLocation; @@ -43,7 +43,7 @@ public class VecBurstFireProcedure { usehand.getOrCreateTag().putDouble("burst", 0); } } - if (usehand.getItem() == TargetModItems.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck9 && _plrCldCheck9.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("burst") > 0) { if (usehand.getOrCreateTag().getDouble("burst") == 1) { if (entity instanceof Player _player) diff --git a/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java index 25f5e8fcf..f60974efc 100644 --- a/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; @@ -34,7 +34,7 @@ public class VecautofireProcedure { ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + if (usehand.getItem() == ItemRegistry.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 1); diff --git a/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java b/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java index ae7315d8a..0444b91ce 100644 --- a/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/WeaponDrawProcedure.java @@ -1,6 +1,6 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.ItemRegistry; import net.mcreator.target.network.TargetModVariables; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -29,10 +29,10 @@ public class WeaponDrawProcedure { } if (entity instanceof Player _player) _player.getCooldowns().addCooldown(itemstack.getItem(), 16); - if (itemstack.getItem() == TargetModItems.RPG.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { + if (itemstack.getItem() == ItemRegistry.RPG.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { itemstack.getOrCreateTag().putDouble("empty", 1); } - if (itemstack.getItem() == TargetModItems.SKS.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { + if (itemstack.getItem() == ItemRegistry.SKS.get() && itemstack.getOrCreateTag().getDouble("ammo") == 0) { itemstack.getOrCreateTag().putDouble("gj", 1); } } diff --git a/src/main/java/net/mcreator/target/utils/AnimUtils.java b/src/main/java/net/mcreator/target/tools/AnimUtils.java similarity index 96% rename from src/main/java/net/mcreator/target/utils/AnimUtils.java rename to src/main/java/net/mcreator/target/tools/AnimUtils.java index fd6869c22..530adca44 100644 --- a/src/main/java/net/mcreator/target/utils/AnimUtils.java +++ b/src/main/java/net/mcreator/target/tools/AnimUtils.java @@ -1,4 +1,4 @@ -package net.mcreator.target.utils; +package net.mcreator.target.tools; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/net/mcreator/target/util/math/ExtendedEntityRayTraceResult.java b/src/main/java/net/mcreator/target/tools/ExtendedEntityRayTraceResult.java similarity index 92% rename from src/main/java/net/mcreator/target/util/math/ExtendedEntityRayTraceResult.java rename to src/main/java/net/mcreator/target/tools/ExtendedEntityRayTraceResult.java index e5f9c5608..96d4d2e5f 100644 --- a/src/main/java/net/mcreator/target/util/math/ExtendedEntityRayTraceResult.java +++ b/src/main/java/net/mcreator/target/tools/ExtendedEntityRayTraceResult.java @@ -1,4 +1,4 @@ -package net.mcreator.target.util.math; +package net.mcreator.target.tools; import net.mcreator.target.entity.ProjectileEntity; import net.minecraft.world.phys.EntityHitResult; diff --git a/src/main/java/net/mcreator/target/rarity/RarityTool.java b/src/main/java/net/mcreator/target/tools/RarityTool.java similarity index 89% rename from src/main/java/net/mcreator/target/rarity/RarityTool.java rename to src/main/java/net/mcreator/target/tools/RarityTool.java index 83c896b47..5e72e7be7 100644 --- a/src/main/java/net/mcreator/target/rarity/RarityTool.java +++ b/src/main/java/net/mcreator/target/tools/RarityTool.java @@ -1,4 +1,4 @@ -package net.mcreator.target.rarity; +package net.mcreator.target.tools; import net.minecraft.ChatFormatting; import net.minecraft.world.item.Rarity; diff --git a/src/main/resources/assets/target/models/item/cementedcarbidespring.json b/src/main/resources/assets/target/models/item/cemented_carbide_spring.json similarity index 100% rename from src/main/resources/assets/target/models/item/cementedcarbidespring.json rename to src/main/resources/assets/target/models/item/cemented_carbide_spring.json diff --git a/src/main/resources/assets/target/models/item/cementedcarbide_trigger.json b/src/main/resources/assets/target/models/item/cemented_carbide_trigger.json similarity index 100% rename from src/main/resources/assets/target/models/item/cementedcarbide_trigger.json rename to src/main/resources/assets/target/models/item/cemented_carbide_trigger.json diff --git a/src/main/resources/assets/target/models/item/commonmaterialpack.json b/src/main/resources/assets/target/models/item/common_material_pack.json similarity index 100% rename from src/main/resources/assets/target/models/item/commonmaterialpack.json rename to src/main/resources/assets/target/models/item/common_material_pack.json diff --git a/src/main/resources/assets/target/models/item/devotion_bluprint.json b/src/main/resources/assets/target/models/item/devotion_blueprint.json similarity index 100% rename from src/main/resources/assets/target/models/item/devotion_bluprint.json rename to src/main/resources/assets/target/models/item/devotion_blueprint.json diff --git a/src/main/resources/assets/target/models/item/epicmaterialpack.json b/src/main/resources/assets/target/models/item/epic_material_pack.json similarity index 100% rename from src/main/resources/assets/target/models/item/epicmaterialpack.json rename to src/main/resources/assets/target/models/item/epic_material_pack.json diff --git a/src/main/resources/assets/target/models/item/legendarymaterialpack.json b/src/main/resources/assets/target/models/item/legendary_material_pack.json similarity index 100% rename from src/main/resources/assets/target/models/item/legendarymaterialpack.json rename to src/main/resources/assets/target/models/item/legendary_material_pack.json diff --git a/src/main/resources/assets/target/models/item/mortarbarrel.json b/src/main/resources/assets/target/models/item/mortar_barrel.json similarity index 55% rename from src/main/resources/assets/target/models/item/mortarbarrel.json rename to src/main/resources/assets/target/models/item/mortar_barrel.json index 30b3970cf..900d45b65 100644 --- a/src/main/resources/assets/target/models/item/mortarbarrel.json +++ b/src/main/resources/assets/target/models/item/mortar_barrel.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "target:item/motar_barrel" + "layer0": "target:item/mortar_barrel" } } \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/mortar_depolyer.json b/src/main/resources/assets/target/models/item/mortar_bipod.json similarity index 56% rename from src/main/resources/assets/target/models/item/mortar_depolyer.json rename to src/main/resources/assets/target/models/item/mortar_bipod.json index 3832df77f..36c973941 100644 --- a/src/main/resources/assets/target/models/item/mortar_depolyer.json +++ b/src/main/resources/assets/target/models/item/mortar_bipod.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "target:item/motar" + "layer0": "target:item/mortar_bipod" } } \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/mortarbipod.json b/src/main/resources/assets/target/models/item/mortar_deployer.json similarity index 54% rename from src/main/resources/assets/target/models/item/mortarbipod.json rename to src/main/resources/assets/target/models/item/mortar_deployer.json index cd0239313..99a81dc52 100644 --- a/src/main/resources/assets/target/models/item/mortarbipod.json +++ b/src/main/resources/assets/target/models/item/mortar_deployer.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "target:item/motar_bipod" + "layer0": "target:item/mortar_deployer" } } \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/rarematerialpack.json b/src/main/resources/assets/target/models/item/rare_material_pack.json similarity index 100% rename from src/main/resources/assets/target/models/item/rarematerialpack.json rename to src/main/resources/assets/target/models/item/rare_material_pack.json diff --git a/src/main/resources/assets/target/models/item/raw_cemented_carbide_powder.json b/src/main/resources/assets/target/models/item/raw_cemented_carbide_powder.json new file mode 100644 index 000000000..eb39918ef --- /dev/null +++ b/src/main/resources/assets/target/models/item/raw_cemented_carbide_powder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "target:item/raw_cemented_carbide_powder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/soul_steel_ingot.json b/src/main/resources/assets/target/models/item/soul_steel_ingot.json new file mode 100644 index 000000000..85efdaf00 --- /dev/null +++ b/src/main/resources/assets/target/models/item/soul_steel_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "target:item/soul_steel_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/soul_steel_nugget.json b/src/main/resources/assets/target/models/item/soul_steel_nugget.json new file mode 100644 index 000000000..084cd992a --- /dev/null +++ b/src/main/resources/assets/target/models/item/soul_steel_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "target:item/soul_steel_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/soulsteelnugget.json b/src/main/resources/assets/target/models/item/soulsteelnugget.json deleted file mode 100644 index 7e942cb9c..000000000 --- a/src/main/resources/assets/target/models/item/soulsteelnugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "target:item/soulsteel_nugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/specialmaterialpack.json b/src/main/resources/assets/target/models/item/special_material_pack.json similarity index 100% rename from src/main/resources/assets/target/models/item/specialmaterialpack.json rename to src/main/resources/assets/target/models/item/special_material_pack.json diff --git a/src/main/resources/assets/target/models/item/soulsteel_ingot.json b/src/main/resources/assets/target/models/item/target_deployer.json similarity index 54% rename from src/main/resources/assets/target/models/item/soulsteel_ingot.json rename to src/main/resources/assets/target/models/item/target_deployer.json index 2574c70a3..ac1300369 100644 --- a/src/main/resources/assets/target/models/item/soulsteel_ingot.json +++ b/src/main/resources/assets/target/models/item/target_deployer.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "target:item/soulsteel_ingot" + "layer0": "target:item/target_deployer" } } \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/targetdeployer.json b/src/main/resources/assets/target/models/item/targetdeployer.json deleted file mode 100644 index 4a822f277..000000000 --- a/src/main/resources/assets/target/models/item/targetdeployer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "target:item/targetdeploy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/target/models/item/unblastedcementedcarbidepodwer.json b/src/main/resources/assets/target/models/item/unblastedcementedcarbidepodwer.json deleted file mode 100644 index 306600caa..000000000 --- a/src/main/resources/assets/target/models/item/unblastedcementedcarbidepodwer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "target:item/unblasted_cemented_carbide_podwer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/target/textures/item/motar_barrel.png b/src/main/resources/assets/target/textures/item/mortar_barrel.png similarity index 100% rename from src/main/resources/assets/target/textures/item/motar_barrel.png rename to src/main/resources/assets/target/textures/item/mortar_barrel.png diff --git a/src/main/resources/assets/target/textures/item/motar_bipod.png b/src/main/resources/assets/target/textures/item/mortar_bipod.png similarity index 100% rename from src/main/resources/assets/target/textures/item/motar_bipod.png rename to src/main/resources/assets/target/textures/item/mortar_bipod.png diff --git a/src/main/resources/assets/target/textures/item/motar.png b/src/main/resources/assets/target/textures/item/mortar_deployer.png similarity index 100% rename from src/main/resources/assets/target/textures/item/motar.png rename to src/main/resources/assets/target/textures/item/mortar_deployer.png diff --git a/src/main/resources/assets/target/textures/item/unblasted_cemented_carbide_podwer.png b/src/main/resources/assets/target/textures/item/raw_cemented_carbide_powder.png similarity index 100% rename from src/main/resources/assets/target/textures/item/unblasted_cemented_carbide_podwer.png rename to src/main/resources/assets/target/textures/item/raw_cemented_carbide_powder.png diff --git a/src/main/resources/assets/target/textures/item/soulsteel_ingot.png b/src/main/resources/assets/target/textures/item/soul_steel_ingot.png similarity index 100% rename from src/main/resources/assets/target/textures/item/soulsteel_ingot.png rename to src/main/resources/assets/target/textures/item/soul_steel_ingot.png diff --git a/src/main/resources/assets/target/textures/item/soulsteel_nugget.png b/src/main/resources/assets/target/textures/item/soul_steel_nugget.png similarity index 100% rename from src/main/resources/assets/target/textures/item/soulsteel_nugget.png rename to src/main/resources/assets/target/textures/item/soul_steel_nugget.png diff --git a/src/main/resources/assets/target/textures/item/targetdeploy.png b/src/main/resources/assets/target/textures/item/target_deployer.png similarity index 100% rename from src/main/resources/assets/target/textures/item/targetdeploy.png rename to src/main/resources/assets/target/textures/item/target_deployer.png