From 09352e7285b15c70ab136f7eb0ec2bf9c614b0f8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jan 2020 14:56:20 -0600 Subject: [PATCH] Snipe some todos, delete ItemMod class --- .../client/core/helper/ShaderHelper.java | 7 -- .../botania/client/model/ModelAvatar.java | 1 - .../botania/client/model/ModelBellows.java | 1 - .../botania/client/model/ModelHourglass.java | 2 +- .../botania/client/model/ModelSpreader.java | 4 - .../client/model/ModelTeruTeruBozu.java | 3 +- .../botania/client/model/PlatformModel.java | 1 - .../client/model/armor/ModelArmor.java | 1 - .../render/tile/RenderTileAlfPortal.java | 1 - .../common/core/handler/EquipmentHandler.java | 2 +- .../botania/common/item/Item16Colors.java | 3 +- .../botania/common/item/ItemAncientWill.java | 3 +- .../botania/common/item/ItemAstrolabe.java | 3 +- .../common/item/ItemAutocraftingHalo.java | 3 +- .../botania/common/item/ItemBaubleBox.java | 3 +- .../common/item/ItemBlackHoleTalisman.java | 3 +- .../botania/common/item/ItemBlackLotus.java | 3 +- .../botania/common/item/ItemBottledMana.java | 3 +- .../botania/common/item/ItemCacophonium.java | 3 +- .../common/item/ItemCorporeaSpark.java | 3 +- .../botania/common/item/ItemCraftPattern.java | 3 +- .../botania/common/item/ItemCraftingHalo.java | 3 +- .../vazkii/botania/common/item/ItemElven.java | 3 +- .../botania/common/item/ItemEnderHand.java | 3 +- .../botania/common/item/ItemFertilizer.java | 3 +- .../botania/common/item/ItemFlowerBag.java | 3 +- .../botania/common/item/ItemGrassSeeds.java | 3 +- .../vazkii/botania/common/item/ItemHorn.java | 3 +- .../botania/common/item/ItemKeepIvy.java | 3 +- .../botania/common/item/ItemLaputaShard.java | 3 +- .../botania/common/item/ItemLexicon.java | 3 +- .../botania/common/item/ItemManaCookie.java | 3 +- .../botania/common/item/ItemManaGun.java | 3 +- .../botania/common/item/ItemManaMirror.java | 3 +- .../botania/common/item/ItemManaTablet.java | 3 +- .../vazkii/botania/common/item/ItemMod.java | 20 ----- .../common/item/ItemObedienceStick.java | 3 +- .../botania/common/item/ItemOpenBucket.java | 3 +- .../common/item/ItemOvergrowthSeed.java | 3 +- .../botania/common/item/ItemPinkinator.java | 3 +- .../botania/common/item/ItemPoolMinecart.java | 3 +- .../botania/common/item/ItemSextant.java | 3 +- .../botania/common/item/ItemSlimeBottle.java | 3 +- .../botania/common/item/ItemSlingshot.java | 3 +- .../vazkii/botania/common/item/ItemSpark.java | 3 +- .../botania/common/item/ItemSparkUpgrade.java | 3 +- .../botania/common/item/ItemSpawnerMover.java | 3 +- .../botania/common/item/ItemSpellCloth.java | 3 +- .../common/item/ItemTemperanceStone.java | 3 +- .../botania/common/item/ItemThornChakram.java | 3 +- .../botania/common/item/ItemTwigWand.java | 2 +- .../botania/common/item/ItemVineBall.java | 3 +- .../vazkii/botania/common/item/ItemVirus.java | 3 +- .../botania/common/item/ItemWaterBowl.java | 3 +- .../botania/common/item/ItemWorldSeed.java | 3 +- .../vazkii/botania/common/item/ModItems.java | 74 ++++++------------- .../common/item/brew/ItemBrewBase.java | 4 +- .../common/item/brew/ItemIncenseStick.java | 4 +- .../botania/common/item/brew/ItemVial.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 4 +- .../thaumcraft/ItemManaInkwell.java | 4 +- .../botania/common/item/lens/ItemLens.java | 4 +- .../common/item/material/ItemEnderAir.java | 4 +- .../item/material/ItemManaResource.java | 4 +- .../common/item/material/ItemRune.java | 4 +- .../item/material/ItemSelfReturning.java | 4 +- .../botania/common/item/relic/ItemRelic.java | 4 +- .../common/item/rod/ItemCobbleRod.java | 4 +- .../botania/common/item/rod/ItemDirtRod.java | 4 +- .../common/item/rod/ItemDiviningRod.java | 4 +- .../common/item/rod/ItemExchangeRod.java | 4 +- .../botania/common/item/rod/ItemFireRod.java | 4 +- .../common/item/rod/ItemGravityRod.java | 4 +- .../common/item/rod/ItemMissileRod.java | 4 +- .../common/item/rod/ItemRainbowRod.java | 4 +- .../botania/common/item/rod/ItemSmeltRod.java | 4 +- .../common/item/rod/ItemTerraformRod.java | 4 +- .../common/item/rod/ItemTornadoRod.java | 4 +- .../botania/common/item/rod/ItemWaterRod.java | 5 +- 79 files changed, 161 insertions(+), 180 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/item/ItemMod.java diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 2e76e6990..4aa6a1d3f 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -66,7 +66,6 @@ public final class ShaderHelper { private static boolean hasIncompatibleMods = false; private static boolean checkedIncompatibility = false; - private static boolean lighting; @SuppressWarnings("deprecation") public static void initShaders() { @@ -107,9 +106,6 @@ public final class ShaderHelper { if(!useShaders()) return; - // todo 1.15 is this still necessary? only has an effect without a vsh and we now have passthrough vsh for every program - lighting = GL11.glGetBoolean(GL11.GL_LIGHTING); - RenderSystem.disableLighting(); ShaderLinkHelper.useProgram(shader); int time = GlStateManager.getUniformLocation(shader, "time"); @@ -124,9 +120,6 @@ public final class ShaderHelper { } public static void releaseShader() { - // todo 1.15 see above - if(lighting) - RenderSystem.enableLighting(); ShaderLinkHelper.useProgram(0); } diff --git a/src/main/java/vazkii/botania/client/model/ModelAvatar.java b/src/main/java/vazkii/botania/client/model/ModelAvatar.java index 5b7dca414..5102a1214 100644 --- a/src/main/java/vazkii/botania/client/model/ModelAvatar.java +++ b/src/main/java/vazkii/botania/client/model/ModelAvatar.java @@ -56,7 +56,6 @@ public class ModelAvatar extends Model { @Override public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { - float scale = 1F / 15F; // todo 1.15 check this? leftleg.render(ms, buffer, light, overlay, r, g, b, a); rightarm.render(ms, buffer, light, overlay, r, g, b, a); leftarm.render(ms, buffer, light, overlay, r, g, b, a); diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 300891745..895ae8055 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -51,7 +51,6 @@ public class ModelBellows extends Model { } public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float alpha, float fract) { - float f5 = 1F / 16F; // todo 1.15 check this base.render(ms, buffer, light, overlay, r, g, b, alpha); pipe.render(ms, buffer, light, overlay, r, g, b, alpha); diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index 296b8197f..9b4ce3a6e 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -74,7 +74,7 @@ public class ModelHourglass extends Model { fract2 = tmp; } - float f = 1F / 16F; //todo 1.15 check + float f = 1F / 16F; ring.render(ms, buffer, light, overlay, 1, 1, 1, a); top.render(ms, buffer, light, overlay, 1, 1, 1, a); bottom.render(ms, buffer, light, overlay, 1, 1, 1, a); diff --git a/src/main/java/vazkii/botania/client/model/ModelSpreader.java b/src/main/java/vazkii/botania/client/model/ModelSpreader.java index 9665ecf65..ddfb815b8 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpreader.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpreader.java @@ -72,8 +72,6 @@ public class ModelSpreader extends Model { @Override public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { - float f = 1F / 16F; // todo 1.15 - top.render(ms, buffer, light, overlay, r, g, b, a); sideL.render(ms, buffer, light, overlay, r, g, b, a); sideR.render(ms, buffer, light, overlay, r, g, b, a); @@ -87,8 +85,6 @@ public class ModelSpreader extends Model { } public void renderCube(MatrixStack ms, IVertexBuilder buffer, int light, int overlay) { - float f = 1F / 16F; // todo 1.15 - inside.render(ms, buffer, light, overlay); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index 974aa7e27..815d5f9b1 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -25,7 +25,7 @@ public class ModelTeruTeruBozu extends Model { public final ModelRenderer sadFace; public ModelTeruTeruBozu() { - super(RenderType::getEntityCutoutNoCull); // todo 1.15 check if this is the appropriate layer + super(RenderType::getEntityCutoutNoCull); textureWidth = 64; textureHeight = 32; sadFace = new ModelRenderer(this, 32, 0); @@ -47,7 +47,6 @@ public class ModelTeruTeruBozu extends Model { @Override public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { - float f5 = 1F / 16F; // todo 1.15 check this if(Minecraft.getInstance().world.isRaining()) sadFace.render(ms, buffer, light, overlay, r, g, b, a); else happyFace.render(ms, buffer, light, overlay, r, g, b, a); diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 4f6a1c5af..600a376a6 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -74,7 +74,6 @@ public class PlatformModel implements IDynamicBakedModel { // Steal camo's model IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModel(heldState); - // todo possible to reimplement calling camo's smart model stuff too? return model.getQuads(heldState, side, rand, EmptyModelData.INSTANCE); } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java index 7a968c308..6ce2bbc5c 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java @@ -16,7 +16,6 @@ public class ModelArmor extends BipedModel { // [VanillaCopy] ArmorStandArmorModel.setRotationAngles because armor stands are dumb // This fixes the armor "breathing" and helmets always facing south on armor stands - // todo 1.15 recheck param names @Override public void setAngles(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { if (!(entity instanceof ArmorStandEntity)) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 285cf44df..841ba2c47 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -68,7 +68,6 @@ public class RenderTileAlfPortal extends TileEntityRenderer { IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityTranslucent()); Matrix4f model = ms.peek().getModel(); Matrix3f normal = ms.peek().getNormal(); - // todo 1.15 these normals are 100% wrong lol buffer.vertex(model, x, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMaxV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); buffer.vertex(model, x + width, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMaxV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); buffer.vertex(model, x + width, y, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMinV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); diff --git a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java index 1c7474d78..202d6f052 100644 --- a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java @@ -37,7 +37,7 @@ import java.util.function.Predicate; public abstract class EquipmentHandler { public static EquipmentHandler instance; - public static void init() { //todo maybe support baubles when/if that gets released + public static void init() { if(Botania.curiosLoaded) { instance = new CurioIntegration(); FMLJavaModLoadingContext.get().getModEventBus().register(CurioIntegration.class); diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 99294676d..3e522886b 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -11,8 +11,9 @@ package vazkii.botania.common.item; import net.minecraft.item.DyeColor; +import net.minecraft.item.Item; -public class Item16Colors extends ItemMod { +public class Item16Colors extends Item { public final DyeColor color; public Item16Colors(DyeColor color, Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 0a5bc45dc..b0f77137d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; @@ -23,7 +24,7 @@ import vazkii.botania.api.item.IAncientWillContainer; import java.util.List; import java.util.Locale; -public class ItemAncientWill extends ItemMod { +public class ItemAncientWill extends Item { public final IAncientWillContainer.AncientWillType type; public ItemAncientWill(IAncientWillContainer.AncientWillType variant, Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index 329014d76..3ce3b72b9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.NBTUtil; @@ -46,7 +47,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemAstrolabe extends ItemMod { +public class ItemAstrolabe extends Item { private static final String TAG_BLOCKSTATE = "blockstate"; private static final String TAG_SIZE = "size"; diff --git a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java index c37347d5d..3eb843375 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -22,7 +23,7 @@ public class ItemAutocraftingHalo extends ItemCraftingHalo { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_CYAN); - public ItemAutocraftingHalo(Properties props) { + public ItemAutocraftingHalo(Item.Properties props) { super(props); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index e3506089e..4c81e97c9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.INamedContainerProvider; import net.minecraft.inventory.container.SimpleNamedContainerProvider; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; @@ -39,7 +40,7 @@ import vazkii.botania.common.core.handler.EquipmentHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class ItemBaubleBox extends ItemMod { +public class ItemBaubleBox extends Item { public ItemBaubleBox(Properties props) { super(props); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 976abd4fa..5af33ee9b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.Items; @@ -46,7 +47,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { +public class ItemBlackHoleTalisman extends Item implements IBlockProvider { private static final String TAG_ACTIVE = "active"; private static final String TAG_BLOCK_NAME = "blockName"; private static final String TAG_BLOCK_COUNT = "blockCount"; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 49032a4e3..4f17170c4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.item.ItemEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.ITextComponent; @@ -29,7 +30,7 @@ import vazkii.botania.common.network.PacketHandler; import java.util.List; -public class ItemBlackLotus extends ItemMod implements IManaDissolvable { +public class ItemBlackLotus extends Item implements IManaDissolvable { private static final int MANA_PER = 8000; private static final int MANA_PER_T2 = 100000; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 07a8becf1..21ade48a1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -16,6 +16,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.UseAction; @@ -46,7 +47,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class ItemBottledMana extends ItemMod { +public class ItemBottledMana extends Item { private static final int SWIGS = 6; private static final String TAG_SWIGS_LEFT = "swigsLeft"; private static final String TAG_SEED = "randomSeed"; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 47a0cf420..a6bbfac9f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -18,6 +18,7 @@ import net.minecraft.entity.MobEntity; import net.minecraft.entity.monster.CreeperEntity; import net.minecraft.entity.monster.SlimeEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.UseAction; @@ -50,7 +51,7 @@ import javax.annotation.Nullable; import java.lang.reflect.InvocationTargetException; import java.util.List; -public class ItemCacophonium extends ItemMod { +public class ItemCacophonium extends Item { private static final String TAG_SOUND = "sound"; private static final String TAG_SOUND_NAME = "soundName"; diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 4eb9d842b..66f9613b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; @@ -22,7 +23,7 @@ import vazkii.botania.common.entity.EntityCorporeaSpark; import javax.annotation.Nonnull; -public class ItemCorporeaSpark extends ItemMod { +public class ItemCorporeaSpark extends Item { public ItemCorporeaSpark(Properties props) { super(props); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 458437c04..d5280d100 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.block.BlockState; +import net.minecraft.item.Item; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; @@ -21,7 +22,7 @@ import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; -public class ItemCraftPattern extends ItemMod { +public class ItemCraftPattern extends Item { public final CratePattern pattern; public ItemCraftPattern(CratePattern pattern, Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index ff37364c6..d7bd2e84e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -32,6 +32,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.container.SimpleNamedContainerProvider; import net.minecraft.inventory.container.WorkbenchContainer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; @@ -72,7 +73,7 @@ import javax.annotation.Nonnull; import java.util.Arrays; import java.util.Optional; -public class ItemCraftingHalo extends ItemMod { +public class ItemCraftingHalo extends Item { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_GREEN); private static final ItemStack craftingTable = new ItemStack(Blocks.CRAFTING_TABLE); diff --git a/src/main/java/vazkii/botania/common/item/ItemElven.java b/src/main/java/vazkii/botania/common/item/ItemElven.java index 14430b84b..08af9a8ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemElven.java +++ b/src/main/java/vazkii/botania/common/item/ItemElven.java @@ -10,10 +10,11 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -public class ItemElven extends ItemMod implements IElvenItem { +public class ItemElven extends Item implements IElvenItem { public ItemElven(Properties props) { super(props); } diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index cc4406866..ecec7a55e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -16,6 +16,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ChestContainer; import net.minecraft.inventory.container.SimpleNamedContainerProvider; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -31,7 +32,7 @@ import vazkii.botania.common.item.rod.ItemExchangeRod; import javax.annotation.Nonnull; -public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProvider { +public class ItemEnderHand extends Item implements IManaUsingItem, IBlockProvider { private static final int COST_PROVIDE = 5; private static final int COST_SELF = 250; diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 5ea2ea5dc..d6fc1cd2c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.item.DyeColor; +import net.minecraft.item.Item; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; @@ -22,7 +23,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemFertilizer extends ItemMod { +public class ItemFertilizer extends Item { public ItemFertilizer(Properties props) { super(props); diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index f4e491dee..2c906ab3a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.INamedContainerProvider; import net.minecraft.inventory.container.SimpleNamedContainerProvider; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.CompoundNBT; @@ -49,7 +50,7 @@ import vazkii.botania.common.block.BlockModFlower; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class ItemFlowerBag extends ItemMod { +public class ItemFlowerBag extends Item { public ItemFlowerBag(Properties props) { super(props); MinecraftForge.EVENT_BUS.addListener(this::onPickupItem); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 31f911dde..3523a7d07 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -14,6 +14,7 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; @@ -39,7 +40,7 @@ import java.util.Random; import java.util.Set; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { +public class ItemGrassSeeds extends Item implements IFloatingFlowerVariant { /** * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. diff --git a/src/main/java/vazkii/botania/common/item/ItemHorn.java b/src/main/java/vazkii/botania/common/item/ItemHorn.java index 00f6b0736..19be7d2e8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemHorn.java @@ -16,6 +16,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.BushBlock; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.tags.BlockTags; @@ -38,7 +39,7 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -public class ItemHorn extends ItemMod { +public class ItemHorn extends Item { public ItemHorn(Properties props) { super(props); addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "vuvuzela"), diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 1e64fb4b4..99bf6ada9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.event.entity.living.LivingDropsEvent; @@ -25,7 +26,7 @@ import java.util.ArrayList; import java.util.List; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class ItemKeepIvy extends ItemMod { +public class ItemKeepIvy extends Item { public static final String TAG_KEEP = "Botania_keepIvy"; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 81cf0b7de..34ad37df5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -17,6 +17,7 @@ import net.minecraft.block.FallingBlock; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.projectile.ThrowableEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; @@ -51,7 +52,7 @@ import vazkii.botania.common.entity.EntityManaBurst; import javax.annotation.Nonnull; import java.util.List; -public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanetExcempt { +public class ItemLaputaShard extends Item implements ILensEffect, ITinyPlanetExcempt { private static final String TAG_STATE = "_state"; private static final String TAG_TILE = "_tile"; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index df9663ea6..ef2f64b19 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -15,6 +15,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -44,7 +45,7 @@ import vazkii.patchouli.common.network.message.MessageOpenBookGui; import javax.annotation.Nonnull; import java.util.List; -public class ItemLexicon extends ItemMod implements IElvenItem { +public class ItemLexicon extends Item implements IElvenItem { public static final String TAG_ELVEN_UNLOCK = "botania:elven_unlock"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 2db6fe193..49b07927f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.lib.LibMisc; import java.util.Locale; -public class ItemManaCookie extends ItemMod { +public class ItemManaCookie extends Item { public ItemManaCookie(Properties props) { super(props); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index ad03693e5..3756d89a5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -16,6 +16,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.EffectInstance; @@ -47,7 +48,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemManaGun extends ItemMod implements IManaUsingItem { +public class ItemManaGun extends Item implements IManaUsingItem { private static final String TAG_LENS = "lens"; private static final String TAG_CLIP = "clip"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 7273c2bcc..f39b98fac 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.server.MinecraftServer; @@ -34,7 +35,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import javax.annotation.Nonnull; -public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { +public class ItemManaMirror extends Item implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_BACKLOG = "manaBacklog"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index e6f005305..090eaf95f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -30,7 +31,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import javax.annotation.Nonnull; import java.util.List; -public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { +public class ItemManaTablet extends Item implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { public static final int MAX_MANA = 500000; diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java deleted file mode 100644 index c436d6c6a..000000000 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 14, 2014, 5:30:18 PM (GMT)] - */ -package vazkii.botania.common.item; - -import net.minecraft.item.Item; - -// todo 1.13 reevaluate need for this -public class ItemMod extends Item { - public ItemMod(Item.Properties props) { - super(props); - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 2150a6b96..d0f782bc8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; @@ -25,7 +26,7 @@ import vazkii.botania.common.core.helper.Vector3; import javax.annotation.Nonnull; import java.util.function.BiFunction; -public class ItemObedienceStick extends ItemMod { +public class ItemObedienceStick extends Item { public ItemObedienceStick(Properties props) { super(props); diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index acfd2ca89..e8d9fcc1e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.particles.ParticleTypes; import net.minecraft.stats.Stats; @@ -33,7 +34,7 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; -public class ItemOpenBucket extends ItemMod { +public class ItemOpenBucket extends Item { public ItemOpenBucket(Properties props) { super(props); diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 0d0a2706a..83d6fd46b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; @@ -21,7 +22,7 @@ import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; -public class ItemOvergrowthSeed extends ItemMod { +public class ItemOvergrowthSeed extends Item { public ItemOvergrowthSeed(Properties props) { super(props); diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index b911c9d4d..d730889b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -15,6 +15,7 @@ import net.minecraft.entity.SpawnReason; import net.minecraft.entity.boss.WitherEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -35,7 +36,7 @@ import vazkii.botania.common.entity.EntityPinkWither; import javax.annotation.Nonnull; import java.util.List; -public class ItemPinkinator extends ItemMod { +public class ItemPinkinator extends Item { public ItemPinkinator(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 7033e7e26..509a91004 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.BlockState; import net.minecraft.entity.item.minecart.AbstractMinecartEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.state.properties.RailShape; @@ -24,7 +25,7 @@ import vazkii.botania.common.entity.EntityPoolMinecart; import javax.annotation.Nonnull; -public class ItemPoolMinecart extends ItemMod { +public class ItemPoolMinecart extends Item { public ItemPoolMinecart(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index debd3fb99..81245d9f7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.util.ActionResult; @@ -51,7 +52,7 @@ import java.util.Map; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -public class ItemSextant extends ItemMod { +public class ItemSextant extends Item { public static final ResourceLocation MULTIBLOCK_ID = prefix("sextant"); private static final int MAX_RADIUS = 256; private static final String TAG_SOURCE_X = "sourceX"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index a7e77b1f9..bc64e1273 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.Entity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -19,7 +20,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibMisc; -public class ItemSlimeBottle extends ItemMod { +public class ItemSlimeBottle extends Item { private static final String TAG_ACTIVE = "active"; public ItemSlimeBottle(Properties builder) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 2efbbe42c..ab6127683 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.util.ActionResult; @@ -26,7 +27,7 @@ import vazkii.botania.common.entity.EntityVineBall; import javax.annotation.Nonnull; import java.util.function.Predicate; -public class ItemSlingshot extends ItemMod { +public class ItemSlingshot extends Item { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() == ModItems.vineBall; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index f1062d382..50145a8e0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; @@ -23,7 +24,7 @@ import vazkii.botania.common.entity.EntitySpark; import javax.annotation.Nonnull; -public class ItemSpark extends ItemMod implements IManaGivingItem { +public class ItemSpark extends Item implements IManaGivingItem { public ItemSpark(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 3212da2b7..69fcfa94a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -10,10 +10,11 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.spark.SparkUpgradeType; -public class ItemSparkUpgrade extends ItemMod { +public class ItemSparkUpgrade extends Item { public final SparkUpgradeType type; public ItemSparkUpgrade(Properties builder, SparkUpgradeType type) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 4d051af78..77bb32d5e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -15,6 +15,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.CompoundNBT; @@ -39,7 +40,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -public class ItemSpawnerMover extends ItemMod { +public class ItemSpawnerMover extends Item { private static final String TAG_SPAWNER = "spawner"; private static final String TAG_SPAWN_DATA = "SpawnData"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index 7e118405b..9b63c6528 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -10,11 +10,12 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -public class ItemSpellCloth extends ItemMod { +public class ItemSpellCloth extends Item { public ItemSpellCloth(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 64ef44c0f..c07a763fc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -31,7 +32,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public class ItemTemperanceStone extends ItemMod { +public class ItemTemperanceStone extends Item { public static final String TAG_ACTIVE = "active"; public ItemTemperanceStone(Properties builder) { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 4f02e4351..d5aca1a9c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -22,7 +23,7 @@ import vazkii.botania.common.entity.EntityThornChakram; import javax.annotation.Nonnull; -public class ItemThornChakram extends ItemMod { +public class ItemThornChakram extends Item { public ItemThornChakram(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 5fbb8baf6..7588cdc99 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -71,7 +71,7 @@ import java.awt.*; import java.util.List; import java.util.Optional; -public class ItemTwigWand extends ItemMod implements ICoordBoundItem { +public class ItemTwigWand extends Item implements ICoordBoundItem { private static final String TAG_COLOR1 = "color1"; private static final String TAG_COLOR2 = "color2"; diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 34de208f4..becbd84d0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -22,7 +23,7 @@ import vazkii.botania.common.entity.EntityVineBall; import javax.annotation.Nonnull; -public class ItemVineBall extends ItemMod { +public class ItemVineBall extends Item { public ItemVineBall(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 91126d879..48b23b1bb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -24,6 +24,7 @@ import net.minecraft.entity.passive.horse.LlamaEntity; import net.minecraft.entity.passive.horse.SkeletonHorseEntity; import net.minecraft.entity.passive.horse.ZombieHorseEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.DamageSource; @@ -38,7 +39,7 @@ import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.lib.LibMisc; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class ItemVirus extends ItemMod { +public class ItemVirus extends Item { public ItemVirus(Properties builder) { super(builder); } diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index 32cd200e8..0653388b8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.fluid.Fluids; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; @@ -21,7 +22,7 @@ import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimpl import javax.annotation.Nonnull; -public class ItemWaterBowl extends ItemMod { +public class ItemWaterBowl extends Item { public ItemWaterBowl(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index cac0e1fb7..755805963 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -26,7 +27,7 @@ import vazkii.botania.common.core.helper.MathHelper; import javax.annotation.Nonnull; -public class ItemWorldSeed extends ItemMod { +public class ItemWorldSeed extends Item { public ItemWorldSeed(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 40b810895..54168941a 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -472,29 +472,29 @@ public final class ModItems { } register(r, new ItemSelfReturning(unstackable()), LibItemNames.PESTLE_AND_MORTAR); register(r, new ItemTwigWand(unstackable()), LibItemNames.TWIG_WAND); - register(r, new ItemMod(defaultBuilder()), LibItemNames.MANASTEEL_INGOT); - register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_PEARL); - register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_DIAMOND); - register(r, new ItemMod(defaultBuilder()), LibItemNames.LIVINGWOOD_TWIG); + register(r, new Item(defaultBuilder()), LibItemNames.MANASTEEL_INGOT); + register(r, new Item(defaultBuilder()), LibItemNames.MANA_PEARL); + register(r, new Item(defaultBuilder()), LibItemNames.MANA_DIAMOND); + register(r, new Item(defaultBuilder()), LibItemNames.LIVINGWOOD_TWIG); register(r, new ItemManaResource(defaultBuilder()), LibItemNames.TERRASTEEL_INGOT); - register(r, new ItemMod(defaultBuilder()), LibItemNames.LIFE_ESSENCE); - register(r, new ItemMod(defaultBuilder()), LibItemNames.REDSTONE_ROOT); + register(r, new Item(defaultBuilder()), LibItemNames.LIFE_ESSENCE); + register(r, new Item(defaultBuilder()), LibItemNames.REDSTONE_ROOT); register(r, new ItemElven(defaultBuilder()), LibItemNames.ELEMENTIUM_INGOT); register(r, new ItemElven(defaultBuilder()), LibItemNames.PIXIE_DUST); register(r, new ItemElven(defaultBuilder()), LibItemNames.DRAGONSTONE); register(r, new ItemSelfReturning(defaultBuilder()), LibItemNames.PLACEHOLDER); - register(r, new ItemMod(defaultBuilder()), LibItemNames.RED_STRING); - register(r, new ItemMod(defaultBuilder()), LibItemNames.DREAMWOOD_TWIG); + register(r, new Item(defaultBuilder()), LibItemNames.RED_STRING); + register(r, new Item(defaultBuilder()), LibItemNames.DREAMWOOD_TWIG); register(r, new ItemManaResource(defaultBuilder()), LibItemNames.GAIA_INGOT); register(r, new ItemEnderAir(defaultBuilder()), LibItemNames.ENDER_AIR_BOTTLE); - register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_STRING); - register(r, new ItemMod(defaultBuilder()), LibItemNames.MANASTEEL_NUGGET); - register(r, new ItemMod(defaultBuilder()), LibItemNames.TERRASTEEL_NUGGET); - register(r, new ItemMod(defaultBuilder()), LibItemNames.ELEMENTIUM_NUGGET); + register(r, new Item(defaultBuilder()), LibItemNames.MANA_STRING); + register(r, new Item(defaultBuilder()), LibItemNames.MANASTEEL_NUGGET); + register(r, new Item(defaultBuilder()), LibItemNames.TERRASTEEL_NUGGET); + register(r, new Item(defaultBuilder()), LibItemNames.ELEMENTIUM_NUGGET); register(r, new ItemManaResource(defaultBuilder()), LibItemNames.LIVING_ROOT); - register(r, new ItemMod(defaultBuilder()), LibItemNames.PEBBLE); - register(r, new ItemMod(defaultBuilder()), LibItemNames.MANAWEAVE_CLOTH); - register(r, new ItemMod(defaultBuilder()), LibItemNames.MANA_POWDER); + register(r, new Item(defaultBuilder()), LibItemNames.PEBBLE); + register(r, new Item(defaultBuilder()), LibItemNames.MANAWEAVE_CLOTH); + register(r, new Item(defaultBuilder()), LibItemNames.MANA_POWDER); register(r, new ItemLens(unstackable(), new Lens(), ItemLens.PROP_NONE), LibItemNames.LENS_NORMAL); register(r, new ItemLens(unstackable(), new LensSpeed(), ItemLens.PROP_NONE), LibItemNames.LENS_SPEED); register(r, new ItemLens(unstackable(), new LensPower(), ItemLens.PROP_POWER), LibItemNames.LENS_POWER); @@ -588,13 +588,13 @@ public final class ModItems { register(r, new ItemDivaCharm(unstackable()), LibItemNames.DIVA_CHARM); register(r, new ItemFlightTiara(unstackable()), LibItemNames.FLIGHT_TIARA); register(r, new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()), LibItemNames.ENDER_DAGGER); - register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_DARK); - register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_MANA); - register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_BLAZE); - register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_LAVENDER); - register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_RED); - register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_ELVEN); - register(r, new ItemMod(defaultBuilder()), LibItemNames.QUARTZ_SUNNY); + register(r, new Item(defaultBuilder()), LibItemNames.QUARTZ_DARK); + register(r, new Item(defaultBuilder()), LibItemNames.QUARTZ_MANA); + register(r, new Item(defaultBuilder()), LibItemNames.QUARTZ_BLAZE); + register(r, new Item(defaultBuilder()), LibItemNames.QUARTZ_LAVENDER); + register(r, new Item(defaultBuilder()), LibItemNames.QUARTZ_RED); + register(r, new Item(defaultBuilder()), LibItemNames.QUARTZ_ELVEN); + register(r, new Item(defaultBuilder()), LibItemNames.QUARTZ_SUNNY); register(r, new ItemWaterRod(unstackable()), LibItemNames.WATER_ROD); register(r, new ItemElementiumHelm(unstackable()), LibItemNames.ELEMENTIUM_HELM); register(r, new ItemElementiumHelmRevealing(unstackable()), LibItemNames.ELEMENTIUM_HELM_R); @@ -646,7 +646,7 @@ public final class ModItems { register(r, new ItemBlackLotus(defaultBuilder()), LibItemNames.BLACK_LOTUS); register(r, new ItemBlackLotus(defaultBuilder()), LibItemNames.BLACKER_LOTUS); register(r, new ItemMonocle(unstackable()), LibItemNames.MONOCLE); - register(r, new ItemMod(unstackable()), LibItemNames.CLIP); + register(r, new Item(unstackable()), LibItemNames.CLIP); register(r, new ItemCobbleRod(unstackable()), LibItemNames.COBBLE_ROD); register(r, new ItemSmeltRod(unstackable()), LibItemNames.SMELT_ROD); register(r, new ItemWorldSeed(defaultBuilder()), LibItemNames.WORLD_SEED); @@ -680,7 +680,7 @@ public final class ModItems { register(r, new ItemSwapRing(unstackable()), LibItemNames.SWAP_RING); register(r, new ItemFlowerBag(unstackable()), LibItemNames.FLOWER_BAG); - register(r, new ItemMod(defaultBuilder()), LibItemNames.PHANTOM_INK); + register(r, new Item(defaultBuilder()), LibItemNames.PHANTOM_INK); register(r, new ItemPoolMinecart(unstackable()), LibItemNames.POOL_MINECART); register(r, new ItemPinkinator(unstackable()), LibItemNames.PINKINATOR); register(r, new ItemInfiniteFruit(unstackable()), LibItemNames.INFINITE_FRUIT); @@ -719,8 +719,6 @@ public final class ModItems { register(r, new ItemThirdEye(unstackable()), LibItemNames.THIRD_EYE); register(r, new ItemAstrolabe(unstackable()), LibItemNames.ASTROLABE); register(r, new ItemGoddessCharm(unstackable()), LibItemNames.GODDESS_CHARM); - - registerOreDictionary(); } @SubscribeEvent @@ -760,30 +758,6 @@ public final class ModItems { ScreenManager.registerFactory(box, GuiBaubleBox::new); }); } - - - private static void registerOreDictionary() { - /* TODO 1.13 reevaluate these - OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar); - OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaPearl)); - OreDictionary.registerOre(LibOreDict.LIVINGWOOD_TWIG, new ItemStack(livingwoodTwig)); - OreDictionary.registerOre(LibOreDict.LIFE_ESSENCE, new ItemStack(lifeEssence)); - OreDictionary.registerOre(LibOreDict.REDSTONE_ROOT, new ItemStack(redstoneRoot)); - OreDictionary.registerOre(LibOreDict.PIXIE_DUST, new ItemStack(pixieDust)); - OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(placeholder)); - OreDictionary.registerOre(LibOreDict.RED_STRING, new ItemStack(redString)); - OreDictionary.registerOre(LibOreDict.DREAMWOOD_TWIG, new ItemStack(dreamwoodTwig)); - OreDictionary.registerOre(LibOreDict.GAIA_INGOT, new ItemStack(gaiaIngot)); - OreDictionary.registerOre(LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(enderAirBottle)); - OreDictionary.registerOre(LibOreDict.MANA_STRING, new ItemStack(manaString)); - OreDictionary.registerOre(LibOreDict.ROOT, new ItemStack(livingroot)); - OreDictionary.registerOre(LibOreDict.PEBBLE, new ItemStack(pebble)); - OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaweaveCloth)); - - OreDictionary.registerOre("powderBlaze", Items.BLAZE_POWDER); - OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); - */ - } public static Item getPetal(DyeColor color) { switch (color) { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index a75736d56..ec9c5e922 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -42,7 +42,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -50,7 +50,7 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; -public class ItemBrewBase extends ItemMod implements IBrewItem { +public class ItemBrewBase extends Item implements IBrewItem { private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 7f5341358..52c64215c 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -28,12 +28,12 @@ import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; import java.util.List; -public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer { +public class ItemIncenseStick extends Item implements IBrewItem, IBrewContainer { private static final String TAG_BREW_KEY = "brewKey"; public static final int TIME_MULTIPLIER = 60; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 5dbb38a0f..45521ada4 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -13,10 +13,10 @@ package vazkii.botania.common.item.brew; import net.minecraft.item.ItemStack; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.item.ModItems; -public class ItemVial extends ItemMod implements IBrewContainer { +public class ItemVial extends Item implements IBrewContainer { public ItemVial(Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 3f04998f4..05976a824 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -36,7 +36,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -45,7 +45,7 @@ import java.util.List; import java.util.UUID; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public abstract class ItemBauble extends ItemMod implements ICosmeticAttachable, IPhantomInkable { +public abstract class ItemBauble extends Item implements ICosmeticAttachable, IPhantomInkable { private static final String TAG_BAUBLE_UUID_MOST = "baubleUUIDMost"; private static final String TAG_BAUBLE_UUID_LEAST = "baubleUUIDLeast"; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index f7ad5f3df..5461d6c9a 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -17,11 +17,11 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; -public class ItemManaInkwell extends ItemMod implements IManaItem { +public class ItemManaInkwell extends Item implements IManaItem { private static final int COST_PER_USE = 50; private static final int USES = 150; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 979ed0344..999a30b80 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -32,14 +32,14 @@ import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.awt.*; import java.util.List; -public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { +public class ItemLens extends Item implements ILensControl, ICompositableLens, ITinyPlanetExcempt { public static final int PROP_NONE = 0, PROP_POWER = 1, PROP_ORIENTATION = 1 << 1, diff --git a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java index 96bdbed9e..101d9eabc 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java @@ -15,14 +15,14 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.entity.EntityEnderAirBottle; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class ItemEnderAir extends ItemMod { +public class ItemEnderAir extends Item { public ItemEnderAir(Properties props) { super(props); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 8a7a29ada..bba5b1ec6 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -15,12 +15,12 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.item.Items; import net.minecraft.util.ActionResultType; import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -public class ItemManaResource extends ItemMod { +public class ItemManaResource extends Item { public ItemManaResource(Properties props) { super(props); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index fe3476dab..2136ae50a 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -13,9 +13,9 @@ package vazkii.botania.common.item.material; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.ICustomApothecaryColor; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; -public class ItemRune extends ItemMod implements ICustomApothecaryColor { +public class ItemRune extends Item implements ICustomApothecaryColor { public ItemRune(Item.Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemSelfReturning.java b/src/main/java/vazkii/botania/common/item/material/ItemSelfReturning.java index 2f1ba2a9e..e15dd5add 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemSelfReturning.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemSelfReturning.java @@ -12,9 +12,9 @@ package vazkii.botania.common.item.material; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; -public class ItemSelfReturning extends ItemMod { +public class ItemSelfReturning extends Item { public ItemSelfReturning(Item.Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 39c74e30d..88b862fc5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -30,14 +30,14 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.advancements.RelicBindTrigger; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; -public class ItemRelic extends ItemMod implements IRelic { +public class ItemRelic extends Item implements IRelic { private static final String TAG_SOULBIND_UUID = "soulbindUUID"; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 9bef3417d..6ece4d788 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -19,11 +19,11 @@ import net.minecraft.util.ActionResultType; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; -public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProvider { +public class ItemCobbleRod extends Item implements IManaUsingItem, IBlockProvider { static final int COST = 150; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index b255b1a99..8c134b68a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -32,11 +32,11 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.PlayerHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; -public class ItemDirtRod extends ItemMod implements IManaUsingItem, IBlockProvider, IAvatarWieldable { +public class ItemDirtRod extends Item implements IManaUsingItem, IBlockProvider, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_DIRT); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 1f97422ff..2b1b403cb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -30,12 +30,12 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; import java.util.Random; -public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { +public class ItemDiviningRod extends Item implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_DIVINING); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 1ce9bc03e..ee05a6155 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -45,13 +45,13 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.common.block.BlockPlatform; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWireframeCoordinateListProvider { +public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeCoordinateListProvider { private static final int RANGE = 3; private static final int COST = 40; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index b95870830..72de8f273 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -27,11 +27,11 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityFlameRing; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; -public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { +public class ItemFireRod extends Item implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_FIRE); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 3bb424db0..4b5eebfd5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -32,7 +32,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityThrownItem; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.ModTags; @@ -40,7 +40,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemGravityRod extends ItemMod implements IManaUsingItem { +public class ItemGravityRod extends Item implements IManaUsingItem { private static final Tag> BLACKLIST = ModTags.Entities.SHADED_MESA_BLACKLIST; private static final float RANGE = 3F; private static final int COST = 2; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 333a39fe9..989776ee2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.rod; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.tileentity.TileEntity; @@ -29,11 +30,10 @@ import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.entity.EntityMagicMissile; -import vazkii.botania.common.item.ItemMod; import javax.annotation.Nonnull; -public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { +public class ItemMissileRod extends Item implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_MISSILE); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index cfaa9d076..34380e595 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -35,12 +35,12 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; import java.util.List; -public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { +public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_RAINBOW); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 9106fb65b..f8ce43d74 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -33,7 +33,7 @@ import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.fx.WispParticleData; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import vazkii.botania.common.item.equipment.tool.ToolCommons; import javax.annotation.Nonnull; @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Optional; import java.util.WeakHashMap; -public class ItemSmeltRod extends ItemMod implements IManaUsingItem { +public class ItemSmeltRod extends Item implements IManaUsingItem { private static final int TIME = 10; private static final int COST = 300; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 1cf829e49..2ecdce406 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -18,6 +18,7 @@ import net.minecraft.block.DoublePlantBlock; import net.minecraft.block.FlowerBlock; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.util.ActionResult; @@ -34,14 +35,13 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockProvider { +public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProvider { private static final int COST_PER = 55; // todo 1.13 migrate rest of these diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index ce375013a..3cd55f7cb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.rod; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.potion.EffectInstance; @@ -34,12 +35,11 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.brew.ModPotions; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemMod; import javax.annotation.Nonnull; import java.util.List; -public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { +public class ItemTornadoRod extends Item implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_TORNADO); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index 0045e1a35..8fc759ee4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -6,6 +6,7 @@ import net.minecraft.block.ILiquidContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.BucketItem; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.stats.Stats; @@ -20,11 +21,11 @@ import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.item.ItemMod; +import net.minecraft.item.Item; import javax.annotation.Nonnull; -public class ItemWaterRod extends ItemMod implements IManaUsingItem { +public class ItemWaterRod extends Item implements IManaUsingItem { public static final int COST = 75;