From b475d15c9faa82a846fd1e7f1e2d29024b3e3a39 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 11 Sep 2016 20:24:10 +0200 Subject: [PATCH] Removed that a lens knows about its item because it doesn't need to --- .../actuallyadditions/api/ActuallyAdditionsAPI.java | 2 +- .../de/ellpeck/actuallyadditions/api/lens/Lens.java | 13 ------------- .../actuallyadditions/mod/items/lens/ItemLens.java | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java index 50b24481a..cddce04aa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java @@ -31,7 +31,7 @@ public final class ActuallyAdditionsAPI{ public static final String MOD_ID = "actuallyadditions"; public static final String API_ID = MOD_ID+"api"; - public static final String API_VERSION = "22"; + public static final String API_VERSION = "23"; public static final List CRUSHER_RECIPES = new ArrayList(); public static final List BALL_OF_FUR_RETURN_ITEMS = new ArrayList(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java index 0d43d2696..7f0cb6e57 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.api.lens; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.Item; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -21,11 +20,6 @@ import net.minecraft.util.math.BlockPos; */ public abstract class Lens{ - /** - * The item that belongs to this lens type - */ - protected Item lensItem; - /** * Invokes the lens type's behavior on a block * @@ -45,13 +39,6 @@ public abstract class Lens{ */ public abstract int getDistance(); - /** - * Sets the item corresponding to the lens - */ - public void setLensItem(Item item){ - this.lensItem = item; - } - /** * @return If the lens can be invoked at the current time */ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java index 4c06fb290..efa22488c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java @@ -23,7 +23,6 @@ public class ItemLens extends ItemBase implements ILensItem{ public ItemLens(String name, Lens type){ super(name); this.type = type; - this.type.setLensItem(this); this.setMaxStackSize(1); }