mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Snipe some todos, delete ItemMod class
This commit is contained in:
1 parent
a6dd4d74fa
commit
09352e7285
79 files changed
+161
-180
No files matched your search
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -68,7 +68,6 @@ public class RenderTileAlfPortal extends TileEntityRenderer<TileAlfPortal> {
|
||||
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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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"),
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. 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);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<ItemStack> AMMO_FUNC = s -> s != null && s.getItem() == ModItems.vineBall;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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<EntityType<?>> BLACKLIST = ModTags.Entities.SHADED_MESA_BLACKLIST;
|
||||
private static final float RANGE = 3F;
|
||||
private static final int COST = 2;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in new issue
Block a user