From 1ed3851672863d5dcd805067f1140dc9fdee7fd3 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 21 May 2015 21:35:32 -0700 Subject: [PATCH] Remove ILegacyHandler (see #677) --- api/forestry | 2 +- .../forestry/core/genetics/Chromosome.java | 1 - .../core/genetics/alleles/Allele.java | 133 ------------------ .../core/genetics/alleles/AlleleRegistry.java | 24 +--- .../java/forestry/plugins/PluginCore.java | 2 - 5 files changed, 2 insertions(+), 160 deletions(-) diff --git a/api/forestry b/api/forestry index e3fbf6587..e0232ddae 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit e3fbf65873ef668d3da7c95cc2001a412c47d9c7 +Subproject commit e0232ddaee910f7ffc2511dfa2b2dd38342a16cc diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index 77a8db9f3..ca761ae6c 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -19,7 +19,6 @@ import net.minecraft.nbt.NBTTagCompound; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; -import forestry.api.genetics.ILegacyHandler; import forestry.core.proxy.Proxies; public class Chromosome implements IChromosome { diff --git a/src/main/java/forestry/core/genetics/alleles/Allele.java b/src/main/java/forestry/core/genetics/alleles/Allele.java index ec81deb83..5ecd6c521 100644 --- a/src/main/java/forestry/core/genetics/alleles/Allele.java +++ b/src/main/java/forestry/core/genetics/alleles/Allele.java @@ -21,7 +21,6 @@ import forestry.api.arboriculture.IAlleleGrowth; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.genetics.ILegacyHandler; import forestry.api.lepidopterology.IAlleleButterflySpecies; public abstract class Allele implements IAllele { @@ -199,138 +198,6 @@ public abstract class Allele implements IAllele { public static final Allele plantTypeNether = new AllelePlantType(EnumPlantType.Nether); public static final Allele plantTypeCrop = new AllelePlantType(EnumPlantType.Crop); - public static void setupAPI() { - // LEGACY MAPPINGS - ILegacyHandler legacy = (ILegacyHandler) AlleleManager.alleleRegistry; - - legacy.registerLegacyMapping(0, "forestry.speciesForest"); - legacy.registerLegacyMapping(1, "forestry.speciesMeadows"); - legacy.registerLegacyMapping(2, "forestry.speciesCommon"); - legacy.registerLegacyMapping(3, "forestry.speciesCultivated"); - - legacy.registerLegacyMapping(4, "forestry.speciesNoble"); - legacy.registerLegacyMapping(5, "forestry.speciesMajestic"); - legacy.registerLegacyMapping(6, "forestry.speciesImperial"); - - legacy.registerLegacyMapping(7, "forestry.speciesDiligent"); - legacy.registerLegacyMapping(8, "forestry.speciesUnweary"); - legacy.registerLegacyMapping(9, "forestry.speciesIndustrious"); - - legacy.registerLegacyMapping(10, "forestry.speciesSteadfast"); - legacy.registerLegacyMapping(11, "forestry.speciesValiant"); - legacy.registerLegacyMapping(12, "forestry.speciesHeroic"); - - legacy.registerLegacyMapping(13, "forestry.speciesSinister"); - legacy.registerLegacyMapping(14, "forestry.speciesFiendish"); - legacy.registerLegacyMapping(15, "forestry.speciesDemonic"); - - legacy.registerLegacyMapping(16, "forestry.speciesModest"); - legacy.registerLegacyMapping(17, "forestry.speciesFrugal"); - legacy.registerLegacyMapping(18, "forestry.speciesAustere"); - - legacy.registerLegacyMapping(19, "forestry.speciesTropical"); - legacy.registerLegacyMapping(20, "forestry.speciesExotic"); - legacy.registerLegacyMapping(21, "forestry.speciesEdenic"); - - legacy.registerLegacyMapping(22, "forestry.speciesEnded"); - - legacy.registerLegacyMapping(25, "forestry.speciesWintry"); - - legacy.registerLegacyMapping(28, "forestry.speciesVindictive"); - legacy.registerLegacyMapping(29, "forestry.speciesVengeful"); - legacy.registerLegacyMapping(30, "forestry.speciesAvenging"); - - legacy.registerLegacyMapping(34, "forestry.speciesLeporine"); - - legacy.registerLegacyMapping(40, "forestry.speciesRural"); - - legacy.registerLegacyMapping(43, "forestry.speciesMarshy"); - - // Flowers - legacy.registerLegacyMapping(1500, "forestry.flowersVanilla"); - legacy.registerLegacyMapping(1501, "forestry.flowersNether"); - legacy.registerLegacyMapping(1502, "forestry.flowersCacti"); - legacy.registerLegacyMapping(1503, "forestry.flowersMushrooms"); - legacy.registerLegacyMapping(1504, "forestry.flowersEnd"); - legacy.registerLegacyMapping(1505, "forestry.flowersJungle"); - legacy.registerLegacyMapping(1506, "forestry.flowersSnow"); - legacy.registerLegacyMapping(1507, "forestry.flowersWheat"); - - // Effects - legacy.registerLegacyMapping(1800, "forestry.effectNone"); - legacy.registerLegacyMapping(1801, "forestry.effectAggressive"); - legacy.registerLegacyMapping(1802, "forestry.effectHeroic"); - legacy.registerLegacyMapping(1803, "forestry.effectBeatific"); - legacy.registerLegacyMapping(1804, "forestry.effectMiasmic"); - legacy.registerLegacyMapping(1805, "forestry.effectMisanthrope"); - legacy.registerLegacyMapping(1806, "forestry.effectGlacial"); - legacy.registerLegacyMapping(1807, "forestry.effectRadioactive"); - legacy.registerLegacyMapping(1808, "forestry.effectCreeper"); - legacy.registerLegacyMapping(1809, "forestry.effectIgnition"); - legacy.registerLegacyMapping(1810, "forestry.effectExploration"); - legacy.registerLegacyMapping(1811, "forestry.effectFestiveEaster"); - - // Generic - legacy.registerLegacyMapping(1024, "forestry.boolFalse"); - legacy.registerLegacyMapping(1025, "forestry.boolTrue"); - - // Speed - legacy.registerLegacyMapping(1100, "forestry.speedSlowest"); - legacy.registerLegacyMapping(1101, "forestry.speedSlower"); - legacy.registerLegacyMapping(1102, "forestry.speedSlow"); - legacy.registerLegacyMapping(1103, "forestry.speedNorm"); - legacy.registerLegacyMapping(1104, "forestry.speedFast"); - legacy.registerLegacyMapping(1105, "forestry.speedFaster"); - legacy.registerLegacyMapping(1106, "forestry.speedFastest"); - - // Lifespan - legacy.registerLegacyMapping(1200, "forestry.lifespanShortest"); - legacy.registerLegacyMapping(1201, "forestry.lifespanShorter"); - legacy.registerLegacyMapping(1202, "forestry.lifespanShort"); - legacy.registerLegacyMapping(1203, "forestry.lifespanShortened"); - legacy.registerLegacyMapping(1204, "forestry.lifespanNormal"); - legacy.registerLegacyMapping(1205, "forestry.lifespanElongated"); - legacy.registerLegacyMapping(1206, "forestry.lifespanLong"); - legacy.registerLegacyMapping(1207, "forestry.lifespanLonger"); - legacy.registerLegacyMapping(1208, "forestry.lifespanLongest"); - - // Fertility - legacy.registerLegacyMapping(1300, "forestry.fertilityLow"); - legacy.registerLegacyMapping(1301, "forestry.fertilityNormal"); - legacy.registerLegacyMapping(1302, "forestry.fertilityHigh"); - legacy.registerLegacyMapping(1303, "forestry.fertilityMaximum"); - - // Tolerance - legacy.registerLegacyMapping(1450, "forestry.toleranceNone"); - legacy.registerLegacyMapping(1451, "forestry.toleranceBoth1"); - legacy.registerLegacyMapping(1452, "forestry.toleranceBoth2"); - legacy.registerLegacyMapping(1453, "forestry.toleranceBoth3"); - legacy.registerLegacyMapping(1454, "forestry.toleranceBoth4"); - legacy.registerLegacyMapping(1455, "forestry.toleranceBoth5"); - legacy.registerLegacyMapping(1456, "forestry.toleranceUp1"); - legacy.registerLegacyMapping(1457, "forestry.toleranceUp2"); - legacy.registerLegacyMapping(1458, "forestry.toleranceUp3"); - legacy.registerLegacyMapping(1459, "forestry.toleranceUp4"); - legacy.registerLegacyMapping(1460, "forestry.toleranceUp5"); - legacy.registerLegacyMapping(1461, "forestry.toleranceDown1"); - legacy.registerLegacyMapping(1462, "forestry.toleranceDown2"); - legacy.registerLegacyMapping(1463, "forestry.toleranceDown3"); - legacy.registerLegacyMapping(1464, "forestry.toleranceDown4"); - legacy.registerLegacyMapping(1465, "forestry.toleranceDown5"); - - // Flower growth - legacy.registerLegacyMapping(1700, "forestry.floweringSlowest"); - legacy.registerLegacyMapping(1701, "forestry.floweringSlower"); - legacy.registerLegacyMapping(1702, "forestry.floweringSlow"); - legacy.registerLegacyMapping(1710, "forestry.floweringMaximum"); - - // Territory - legacy.registerLegacyMapping(1750, "forestry.territoryDefault"); - legacy.registerLegacyMapping(1751, "forestry.territoryLarge"); - legacy.registerLegacyMapping(1752, "forestry.territoryLarger"); - legacy.registerLegacyMapping(1753, "forestry.territoryLargest"); - } - @Override public String getName() { return StatCollector.translateToLocal(getUnlocalizedName()); diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java index c6b478e6b..f64954054 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java @@ -13,7 +13,6 @@ package forestry.core.genetics.alleles; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; @@ -30,14 +29,13 @@ import forestry.api.genetics.IClassification; import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.genetics.IFruitFamily; import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ILegacyHandler; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.config.ForestryItem; import forestry.core.genetics.Classification; import forestry.core.genetics.ItemResearchNote.EnumNoteType; -public class AlleleRegistry implements IAlleleRegistry, ILegacyHandler { +public class AlleleRegistry implements IAlleleRegistry { private static final int ALLELE_ARRAY_SIZE = 2048; @@ -104,11 +102,6 @@ public class AlleleRegistry implements IAlleleRegistry, ILegacyHandler { private final LinkedHashMap classificationMap = new LinkedHashMap(128); private final LinkedHashMap fruitMap = new LinkedHashMap(64); - private final HashMap metaMapToUID = new HashMap(); - private final HashMap uidMapToMeta = new HashMap(); - - private final HashMap legacyMap = new HashMap(); - /* * Internal HashSet of all alleleHandlers, which trigger when an allele or branch is registered */ @@ -225,21 +218,6 @@ public class AlleleRegistry implements IAlleleRegistry, ILegacyHandler { return fruitMap.get(uid); } - /* LEGACY MAPPINGS */ - @Override - public void registerLegacyMapping(int id, String uid) { - this.legacyMap.put(id, uid); - } - - @Override - public IAllele getFromLegacyMap(int id) { - if (!legacyMap.containsKey(id)) { - return null; - } - - return getAllele(legacyMap.get(id)); - } - /* ALLELE HANDLERS */ @Override public void registerAlleleHandler(IAlleleHandler handler) { diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index a3e2aee86..7be397075 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -100,8 +100,6 @@ public class PluginCore extends ForestryPlugin { AlleleManager.climateHelper = new ClimateHelper(); AlleleManager.alleleFactory = new AlleleFactory(); alleleRegistry.initialize(); - - Allele.setupAPI(); } @Override