From 2856c01cce3b97832e97bf991d2d9480cd39df9b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 3 Feb 2016 23:43:44 +0100 Subject: [PATCH] Removed Lens registry. It wasn't needed. --- .../actuallyadditions/api/ActuallyAdditionsAPI.java | 2 -- .../java/de/ellpeck/actuallyadditions/api/lens/Lens.java | 9 --------- .../ellpeck/actuallyadditions/mod/items/lens/Lenses.java | 8 ++++---- 3 files changed, 4 insertions(+), 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 82acde7b5..79ecd9e3b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.api; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; -import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; @@ -33,7 +32,6 @@ public class ActuallyAdditionsAPI{ public static List crusherRecipes = new ArrayList(); public static List ballOfFurReturnItems = new ArrayList(); public static List treasureChestLoot = new ArrayList(); - public static List reconstructorLenses = new ArrayList(); public static List reconstructorLensNoneRecipes = new ArrayList(); public static List coffeeMachineIngredients = 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 cf6693465..de2bd038c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.api.lens; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import net.minecraft.item.Item; import net.minecraft.util.BlockPos; @@ -45,14 +44,6 @@ public abstract class Lens{ */ public abstract int getDistance(); - /** - * Registers the lense type - */ - public Lens register(){ - ActuallyAdditionsAPI.reconstructorLenses.add(this); - return this; - } - /** * Sets the item corresponding to the lense */ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java index 1d4a143fb..f09d0c45d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java @@ -14,8 +14,8 @@ import de.ellpeck.actuallyadditions.api.lens.Lens; public class Lenses{ - public static final Lens LENS_NONE = new LensNone().register(); - public static final Lens LENS_DETONATION = new LensDetonation().register(); - public static final Lens LENS_DEATH = new LensDeath().register(); - public static final Lens LENS_COLOR = new LensColor().register(); + public static final Lens LENS_NONE = new LensNone(); + public static final Lens LENS_DETONATION = new LensDetonation(); + public static final Lens LENS_DEATH = new LensDeath(); + public static final Lens LENS_COLOR = new LensColor(); }