diff --git a/src/main/java/net/mcreator/target/client/layer/LightSaberLayer.java b/src/main/java/net/mcreator/target/client/layer/LightSaberLayer.java index 669a8228b..daf0c6ddf 100644 --- a/src/main/java/net/mcreator/target/client/layer/LightSaberLayer.java +++ b/src/main/java/net/mcreator/target/client/layer/LightSaberLayer.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.LightSaberItem; +import net.mcreator.target.item.LightSaber; 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 LightSaberLayer extends GeoRenderLayer { +public class LightSaberLayer extends GeoRenderLayer { private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/lightsaber_e.png"); - public LightSaberLayer(GeoRenderer entityRenderer) { + public LightSaberLayer(GeoRenderer entityRenderer) { super(entityRenderer); } @Override - public void render(PoseStack poseStack, LightSaberItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + public void render(PoseStack poseStack, LightSaber 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/LightSaberItemModel.java b/src/main/java/net/mcreator/target/client/model/item/LightSaberItemModel.java index 5e74447ba..4895859fd 100644 --- a/src/main/java/net/mcreator/target/client/model/item/LightSaberItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/LightSaberItemModel.java @@ -1,22 +1,22 @@ package net.mcreator.target.client.model.item; -import net.mcreator.target.item.LightSaberItem; +import net.mcreator.target.item.LightSaber; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; -public class LightSaberItemModel extends GeoModel { +public class LightSaberItemModel extends GeoModel { @Override - public ResourceLocation getAnimationResource(LightSaberItem animatable) { + public ResourceLocation getAnimationResource(LightSaber animatable) { return new ResourceLocation("target", "animations/lightsaber.animation.json"); } @Override - public ResourceLocation getModelResource(LightSaberItem animatable) { + public ResourceLocation getModelResource(LightSaber animatable) { return new ResourceLocation("target", "geo/lightsaber.geo.json"); } @Override - public ResourceLocation getTextureResource(LightSaberItem animatable) { + public ResourceLocation getTextureResource(LightSaber animatable) { return new ResourceLocation("target", "textures/item/lightsaber.png"); } } diff --git a/src/main/java/net/mcreator/target/client/renderer/item/LightSaberItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/LightSaberItemRenderer.java index a90f156e2..9ae9f795a 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/LightSaberItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/LightSaberItemRenderer.java @@ -1,19 +1,19 @@ package net.mcreator.target.client.renderer.item; -import net.mcreator.target.item.LightSaberItem; +import net.mcreator.target.item.LightSaber; import net.mcreator.target.client.layer.LightSaberLayer; import net.mcreator.target.client.model.item.LightSaberItemModel; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.renderer.GeoItemRenderer; -public class LightSaberItemRenderer extends GeoItemRenderer { +public class LightSaberItemRenderer extends GeoItemRenderer { public LightSaberItemRenderer() { super(new LightSaberItemModel()); this.addRenderLayer(new LightSaberLayer(this)); } @Override - public ResourceLocation getTextureLocation(LightSaberItem instance) { + public ResourceLocation getTextureLocation(LightSaber instance) { return super.getTextureLocation(instance); } } diff --git a/src/main/java/net/mcreator/target/init/TargetModItems.java b/src/main/java/net/mcreator/target/init/TargetModItems.java index a29cb6a07..2fa76bdf9 100644 --- a/src/main/java/net/mcreator/target/init/TargetModItems.java +++ b/src/main/java/net/mcreator/target/init/TargetModItems.java @@ -2,7 +2,7 @@ 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.Buckshot; import net.mcreator.target.item.common.ammo.*; import net.mcreator.target.item.common.blueprint.*; import net.mcreator.target.item.common.material.*; @@ -79,21 +79,21 @@ public class TargetModItems { public static final RegistryObject TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetDeployer::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 CLAYMORE_MINE = ITEMS.register("claymore_mine", ClaymoreMine::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 LIGHT_SABER = ITEMS.register("light_saber", LightSaber::new); + public static final RegistryObject HAMMER = ITEMS.register("hammer", Hammer::new); + public static final RegistryObject MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployer::new); + public static final RegistryObject MORTAR_BARREL = ITEMS.register("mortar_barrel", MortarBarrel::new); + public static final RegistryObject MORTAR_BASE_PLATE = ITEMS.register("mortar_base_plate", MortarBasePlate::new); + public static final RegistryObject MORTAR_BIPOD = ITEMS.register("mortar_bipod", MortarBipod::new); + public static final RegistryObject FUSEE = ITEMS.register("fusee", Fusee::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 COPPERPLATE = ITEMS.register("copperplate", Copperplate::new); + public static final RegistryObject INGOT_STEEL = ITEMS.register("ingot_steel", IngotSteel::new); + public static final RegistryObject LEAD_INGOT = ITEMS.register("lead_ingot", LeadIngot::new); + public static final RegistryObject TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", TungstenIngot::new); + public static final RegistryObject CEMENTED_CARBIDE_INGOT = ITEMS.register("cemented_carbide_ingot", CementedCarbideIngot::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); @@ -104,26 +104,26 @@ public class TargetModItems { 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 GALENA = ITEMS.register("galena", Galena::new); + public static final RegistryObject SCHEELITE = ITEMS.register("scheelite", Scheelite::new); + public static final RegistryObject BUCKSHOT = ITEMS.register("buckshot", Buckshot::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 IRON_BARREL = ITEMS.register("iron_barrel", IronBarrel::new); + public static final RegistryObject IRON_ACTION = ITEMS.register("iron_action", IronAction::new); + public static final RegistryObject IRON_TRIGGER = ITEMS.register("iron_trigger", IronTrigger::new); + public static final RegistryObject IRON_SPRING = ITEMS.register("iron_spring", IronSpring::new); + public static final RegistryObject STEEL_BARREL = ITEMS.register("steel_barrel", SteelBarrel::new); + public static final RegistryObject STEEL_ACTION = ITEMS.register("steel_action", SteelAction::new); + public static final RegistryObject STEEL_TRIGGER = ITEMS.register("steel_trigger", SteelTrigger::new); + public static final RegistryObject STEEL_SPRING = ITEMS.register("steel_spring", SteelSpring::new); + public static final RegistryObject CEMENTED_CARBIDE_BARREL = ITEMS.register("cemented_carbide_barrel", CementedCarbideBarrel::new); + public static final RegistryObject CEMENTED_CARBIDE_ACTION = ITEMS.register("cemented_carbide_action", CementedCarbideAction::new); + public static final RegistryObject CEMENTED_CARBIDE_TRIGGER = ITEMS.register("cemented_carbide_trigger", CementedCarbideTrigger::new); + public static final RegistryObject CEMENTED_CARBIDE_SPRING = ITEMS.register("cemented_carbide_spring", CementedCarbideSpring::new); + public static final RegistryObject NETHERITE_BARREL = ITEMS.register("netherite_barrel", NetheriteBarrel::new); + public static final RegistryObject NETHERITE_ACTION = ITEMS.register("netherite_action", NetheriteAction::new); + public static final RegistryObject NETHERITE_TRIGGER = ITEMS.register("netherite_trigger", NetheriteTrigger::new); + public static final RegistryObject NETHERITE_SPRING = ITEMS.register("netherite_spring", NetheriteSpring::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); diff --git a/src/main/java/net/mcreator/target/item/ClaymoreMineItem.java b/src/main/java/net/mcreator/target/item/ClaymoreMine.java similarity index 96% rename from src/main/java/net/mcreator/target/item/ClaymoreMineItem.java rename to src/main/java/net/mcreator/target/item/ClaymoreMine.java index a148c5c5a..005981753 100644 --- a/src/main/java/net/mcreator/target/item/ClaymoreMineItem.java +++ b/src/main/java/net/mcreator/target/item/ClaymoreMine.java @@ -17,8 +17,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class ClaymoreMineItem extends Item { - public ClaymoreMineItem() { +public class ClaymoreMine extends Item { + public ClaymoreMine() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/ScheeliteItem.java b/src/main/java/net/mcreator/target/item/Copperplate.java similarity index 89% rename from src/main/java/net/mcreator/target/item/ScheeliteItem.java rename to src/main/java/net/mcreator/target/item/Copperplate.java index 597f22154..318b85a0d 100644 --- a/src/main/java/net/mcreator/target/item/ScheeliteItem.java +++ b/src/main/java/net/mcreator/target/item/Copperplate.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class ScheeliteItem extends Item { - public ScheeliteItem() { +public class Copperplate extends Item { + public Copperplate() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/FuseeItem.java b/src/main/java/net/mcreator/target/item/Fusee.java similarity index 90% rename from src/main/java/net/mcreator/target/item/FuseeItem.java rename to src/main/java/net/mcreator/target/item/Fusee.java index 7f8a0634c..bef3482db 100644 --- a/src/main/java/net/mcreator/target/item/FuseeItem.java +++ b/src/main/java/net/mcreator/target/item/Fusee.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class FuseeItem extends Item { - public FuseeItem() { +public class Fusee extends Item { + public Fusee() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/GalenaItem.java b/src/main/java/net/mcreator/target/item/Galena.java similarity index 89% rename from src/main/java/net/mcreator/target/item/GalenaItem.java rename to src/main/java/net/mcreator/target/item/Galena.java index 472b3ea72..970c7cf5d 100644 --- a/src/main/java/net/mcreator/target/item/GalenaItem.java +++ b/src/main/java/net/mcreator/target/item/Galena.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class GalenaItem extends Item { - public GalenaItem() { +public class Galena extends Item { + public Galena() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/HammerItem.java b/src/main/java/net/mcreator/target/item/Hammer.java similarity index 95% rename from src/main/java/net/mcreator/target/item/HammerItem.java rename to src/main/java/net/mcreator/target/item/Hammer.java index 19c3d2761..878bdd2d5 100644 --- a/src/main/java/net/mcreator/target/item/HammerItem.java +++ b/src/main/java/net/mcreator/target/item/Hammer.java @@ -7,8 +7,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class HammerItem extends SwordItem { - public HammerItem() { +public class Hammer extends SwordItem { + public Hammer() { super(new Tier() { public int getUses() { return 800; diff --git a/src/main/java/net/mcreator/target/item/LightSaberItem.java b/src/main/java/net/mcreator/target/item/LightSaber.java similarity index 97% rename from src/main/java/net/mcreator/target/item/LightSaberItem.java rename to src/main/java/net/mcreator/target/item/LightSaber.java index dab7e10f3..a7871aa55 100644 --- a/src/main/java/net/mcreator/target/item/LightSaberItem.java +++ b/src/main/java/net/mcreator/target/item/LightSaber.java @@ -28,12 +28,12 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -public class LightSaberItem extends SwordItem implements GeoItem, AnimatedItem { +public class LightSaber extends SwordItem implements GeoItem, AnimatedItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; public static ItemDisplayContext transformType; - public LightSaberItem() { + public LightSaber() { super(Tiers.NETHERITE, 10, -1.8f, new Item.Properties().rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/MortarBarrelItem.java b/src/main/java/net/mcreator/target/item/MortarBarrel.java similarity index 88% rename from src/main/java/net/mcreator/target/item/MortarBarrelItem.java rename to src/main/java/net/mcreator/target/item/MortarBarrel.java index fd8447d30..85e585649 100644 --- a/src/main/java/net/mcreator/target/item/MortarBarrelItem.java +++ b/src/main/java/net/mcreator/target/item/MortarBarrel.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MortarBarrelItem extends Item { - public MortarBarrelItem() { +public class MortarBarrel extends Item { + public MortarBarrel() { super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/MortarBipodItem.java b/src/main/java/net/mcreator/target/item/MortarBasePlate.java similarity index 88% rename from src/main/java/net/mcreator/target/item/MortarBipodItem.java rename to src/main/java/net/mcreator/target/item/MortarBasePlate.java index 653389591..22b308d32 100644 --- a/src/main/java/net/mcreator/target/item/MortarBipodItem.java +++ b/src/main/java/net/mcreator/target/item/MortarBasePlate.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MortarBipodItem extends Item { - public MortarBipodItem() { +public class MortarBasePlate extends Item { + public MortarBasePlate() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/MortarBasePlateItem.java b/src/main/java/net/mcreator/target/item/MortarBasePlateItem.java deleted file mode 100644 index 0dcf55b88..000000000 --- a/src/main/java/net/mcreator/target/item/MortarBasePlateItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.mcreator.target.item; - -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 MortarBasePlateItem extends Item { - public MortarBasePlateItem() { - 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/CopperplateItem.java b/src/main/java/net/mcreator/target/item/MortarBipod.java similarity index 88% rename from src/main/java/net/mcreator/target/item/CopperplateItem.java rename to src/main/java/net/mcreator/target/item/MortarBipod.java index 2fa84fbb3..77ca1fb3b 100644 --- a/src/main/java/net/mcreator/target/item/CopperplateItem.java +++ b/src/main/java/net/mcreator/target/item/MortarBipod.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CopperplateItem extends Item { - public CopperplateItem() { +public class MortarBipod extends Item { + public MortarBipod() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/MortarDeployerItem.java b/src/main/java/net/mcreator/target/item/MortarDeployer.java similarity index 95% rename from src/main/java/net/mcreator/target/item/MortarDeployerItem.java rename to src/main/java/net/mcreator/target/item/MortarDeployer.java index 254a55b22..eba6b8f3d 100644 --- a/src/main/java/net/mcreator/target/item/MortarDeployerItem.java +++ b/src/main/java/net/mcreator/target/item/MortarDeployer.java @@ -17,8 +17,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class MortarDeployerItem extends Item { - public MortarDeployerItem() { +public class MortarDeployer extends Item { + public MortarDeployer() { super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/Scheelite.java b/src/main/java/net/mcreator/target/item/Scheelite.java new file mode 100644 index 000000000..b2d0f568f --- /dev/null +++ b/src/main/java/net/mcreator/target/item/Scheelite.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item; + +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 Scheelite extends Item { + public Scheelite() { + 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/BuckshotItem.java b/src/main/java/net/mcreator/target/item/common/Buckshot.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/BuckshotItem.java rename to src/main/java/net/mcreator/target/item/common/Buckshot.java index a229c81cb..1da71fd16 100644 --- a/src/main/java/net/mcreator/target/item/common/BuckshotItem.java +++ b/src/main/java/net/mcreator/target/item/common/Buckshot.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class BuckshotItem extends Item { - public BuckshotItem() { +public class Buckshot extends Item { + public Buckshot() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/CementedCarbideIngotItem.java b/src/main/java/net/mcreator/target/item/common/material/CementedCarbideIngot.java similarity index 86% rename from src/main/java/net/mcreator/target/item/common/material/CementedCarbideIngotItem.java rename to src/main/java/net/mcreator/target/item/common/material/CementedCarbideIngot.java index 009dd449e..c16b67705 100644 --- a/src/main/java/net/mcreator/target/item/common/material/CementedCarbideIngotItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/CementedCarbideIngot.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CementedCarbideIngotItem extends Item { - public CementedCarbideIngotItem() { +public class CementedCarbideIngot extends Item { + public CementedCarbideIngot() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/LeadIngotItem.java b/src/main/java/net/mcreator/target/item/common/material/IngotSteel.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/LeadIngotItem.java rename to src/main/java/net/mcreator/target/item/common/material/IngotSteel.java index 042356d98..33c8c9da2 100644 --- a/src/main/java/net/mcreator/target/item/common/material/LeadIngotItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/IngotSteel.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class LeadIngotItem extends Item { - public LeadIngotItem() { +public class IngotSteel extends Item { + public IngotSteel() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/IngotSteelItem.java b/src/main/java/net/mcreator/target/item/common/material/LeadIngot.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/IngotSteelItem.java rename to src/main/java/net/mcreator/target/item/common/material/LeadIngot.java index dc95b7c4f..12315df8e 100644 --- a/src/main/java/net/mcreator/target/item/common/material/IngotSteelItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/LeadIngot.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class IngotSteelItem extends Item { - public IngotSteelItem() { +public class LeadIngot extends Item { + public LeadIngot() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/TungstenIngotItem.java b/src/main/java/net/mcreator/target/item/common/material/TungstenIngot.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/TungstenIngotItem.java rename to src/main/java/net/mcreator/target/item/common/material/TungstenIngot.java index ca0bc60d6..02edc97f2 100644 --- a/src/main/java/net/mcreator/target/item/common/material/TungstenIngotItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/TungstenIngot.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class TungstenIngotItem extends Item { - public TungstenIngotItem() { +public class TungstenIngot extends Item { + public TungstenIngot() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideActionItem.java b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideAction.java similarity index 86% rename from src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideActionItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideAction.java index 02ec3a326..b927881c7 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideActionItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideAction.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CementedCarbideActionItem extends Item { - public CementedCarbideActionItem() { +public class CementedCarbideAction extends Item { + public CementedCarbideAction() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideBarrelItem.java b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideBarrel.java similarity index 86% rename from src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideBarrelItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideBarrel.java index 2ff074f19..e1501088a 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideBarrelItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideBarrel.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CementedCarbideBarrelItem extends Item { - public CementedCarbideBarrelItem() { +public class CementedCarbideBarrel extends Item { + public CementedCarbideBarrel() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideSpringItem.java b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideSpring.java similarity index 86% rename from src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideSpringItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideSpring.java index 6e990e8b3..a241a4ba2 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideSpringItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideSpring.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class CementedCarbideSpringItem extends Item { - public CementedCarbideSpringItem() { +public class CementedCarbideSpring extends Item { + public CementedCarbideSpring() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideTriggerItem.java b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideTrigger.java similarity index 86% rename from src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideTriggerItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideTrigger.java index 95fd92e67..d84cc8191 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideTriggerItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/CementedCarbideTrigger.java @@ -9,8 +9,8 @@ import net.minecraft.network.chat.Component; import java.util.List; -public class CementedCarbideTriggerItem extends Item { - public CementedCarbideTriggerItem() { +public class CementedCarbideTrigger extends Item { + public CementedCarbideTrigger() { super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/IronActionItem.java b/src/main/java/net/mcreator/target/item/common/material/component/IronAction.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/component/IronActionItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/IronAction.java index b379aa349..cc544446c 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/IronActionItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/IronAction.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class IronActionItem extends Item { - public IronActionItem() { +public class IronAction extends Item { + public IronAction() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/IronBarrelItem.java b/src/main/java/net/mcreator/target/item/common/material/component/IronBarrel.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/component/IronBarrelItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/IronBarrel.java index ac209d9a4..92aa6e098 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/IronBarrelItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/IronBarrel.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class IronBarrelItem extends Item { - public IronBarrelItem() { +public class IronBarrel extends Item { + public IronBarrel() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/IronSpringItem.java b/src/main/java/net/mcreator/target/item/common/material/component/IronSpring.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/component/IronSpringItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/IronSpring.java index 6ae8c574a..528ad9d6b 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/IronSpringItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/IronSpring.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class IronSpringItem extends Item { - public IronSpringItem() { +public class IronSpring extends Item { + public IronSpring() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/IronTriggerItem.java b/src/main/java/net/mcreator/target/item/common/material/component/IronTrigger.java similarity index 89% rename from src/main/java/net/mcreator/target/item/common/material/component/IronTriggerItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/IronTrigger.java index 1c9c922d6..032ba15f4 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/IronTriggerItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/IronTrigger.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class IronTriggerItem extends Item { - public IronTriggerItem() { +public class IronTrigger extends Item { + public IronTrigger() { super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); } 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/NetheriteAction.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/component/NetheriteActionItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/NetheriteAction.java index b3ab5d08d..2427a3e8c 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/NetheriteAction.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class NetheriteActionItem extends Item { - public NetheriteActionItem() { +public class NetheriteAction extends Item { + public NetheriteAction() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } 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/NetheriteBarrel.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/component/NetheriteBarrelItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/NetheriteBarrel.java index 79574812c..e718cd327 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/NetheriteBarrel.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class NetheriteBarrelItem extends Item { - public NetheriteBarrelItem() { +public class NetheriteBarrel extends Item { + public NetheriteBarrel() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } 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/NetheriteSpring.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/component/NetheriteSpringItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/NetheriteSpring.java index 781a999ab..e3f263c26 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/NetheriteSpring.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class NetheriteSpringItem extends Item { - public NetheriteSpringItem() { +public class NetheriteSpring extends Item { + public NetheriteSpring() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } 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/NetheriteTrigger.java similarity index 87% rename from src/main/java/net/mcreator/target/item/common/material/component/NetheriteTriggerItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/NetheriteTrigger.java index 5c48571ae..6c0540764 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/NetheriteTrigger.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class NetheriteTriggerItem extends Item { - public NetheriteTriggerItem() { +public class NetheriteTrigger extends Item { + public NetheriteTrigger() { super(new Item.Properties().stacksTo(64).rarity(RarityTool.LEGENDARY)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/SteelBarrelItem.java b/src/main/java/net/mcreator/target/item/common/material/component/SteelAction.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/component/SteelBarrelItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/SteelAction.java index 30a799161..4b5af5d5e 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/SteelBarrelItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/SteelAction.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SteelBarrelItem extends Item { - public SteelBarrelItem() { +public class SteelAction extends Item { + public SteelAction() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/SteelSpringItem.java b/src/main/java/net/mcreator/target/item/common/material/component/SteelBarrel.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/component/SteelSpringItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/SteelBarrel.java index 13af170bd..e145b3579 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/SteelSpringItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/SteelBarrel.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SteelSpringItem extends Item { - public SteelSpringItem() { +public class SteelBarrel extends Item { + public SteelBarrel() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/SteelActionItem.java b/src/main/java/net/mcreator/target/item/common/material/component/SteelSpring.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/component/SteelActionItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/SteelSpring.java index 38bae8510..ddc874691 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/SteelActionItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/SteelSpring.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SteelActionItem extends Item { - public SteelActionItem() { +public class SteelSpring extends Item { + public SteelSpring() { super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/common/material/component/SteelTriggerItem.java b/src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java similarity index 88% rename from src/main/java/net/mcreator/target/item/common/material/component/SteelTriggerItem.java rename to src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java index 3bf913b82..1f13cca3c 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/SteelTriggerItem.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java @@ -9,8 +9,8 @@ import net.minecraft.world.level.Level; import java.util.List; -public class SteelTriggerItem extends Item { - public SteelTriggerItem() { +public class SteelTrigger extends Item { + public SteelTrigger() { super(new Item.Properties().stacksTo(64).rarity(Rarity.UNCOMMON)); }