From 2e269c967a3a6a4f5aa8a592fd90f52313ae7d93 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 26 Feb 2013 00:28:12 -0500 Subject: [PATCH] Clean up more junk --- .../cpw/mods/fml/client/SpriteHelper.java | 138 ------------------ .../client/registry/RenderingRegistry.java | 9 +- fml/client/net/minecraft/src/ModLoader.java | 4 +- 3 files changed, 6 insertions(+), 145 deletions(-) delete mode 100644 fml/client/cpw/mods/fml/client/SpriteHelper.java diff --git a/fml/client/cpw/mods/fml/client/SpriteHelper.java b/fml/client/cpw/mods/fml/client/SpriteHelper.java deleted file mode 100644 index 637fcd814..000000000 --- a/fml/client/cpw/mods/fml/client/SpriteHelper.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * The FML Forge Mod Loader suite. - * Copyright (C) 2012 cpw - * - * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package cpw.mods.fml.client; - -import java.util.BitSet; -import java.util.HashMap; -import java.util.logging.Level; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; - -/** - * @author cpw - * - */ -public class SpriteHelper -{ - private static HashMap spriteInfo = new HashMap(); - - private static void initMCSpriteMaps() { - BitSet slots = - SpriteHelper.toBitSet( - "0000000000000000" + - "0000000000110000" + - "0000000000100000" + - "0000000001100000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000011111" + - "0000000000000000" + - "0000000001111100" + - "0000000001111000" + - "0000000000000000"); - spriteInfo.put("/terrain.png", slots); - - slots = SpriteHelper.toBitSet( - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0000000000000000" + - "0111110000000000" + - "0111111010000000" + - "0111111110000000" + - "0111111110001000" + - "1111111111111111" + - "0000011111111111" + - "0000000000000000"); - spriteInfo.put("/gui/items.png", slots); - } - /** - * Register a sprite map for ModTextureStatic, to allow for other mods to override - * your sprite page. - * - * - */ - public static void registerSpriteMapForFile(String file, String spriteMap) { - if (spriteInfo.size() == 0) { - initMCSpriteMaps(); - } - if (spriteInfo.containsKey(file)) { - FMLLog.log("fml.TextureManager", Level.FINE, "Duplicate attempt to register a sprite file %s for overriding -- ignoring",file); - return; - } - spriteInfo.put(file, toBitSet(spriteMap)); - } - - public static int getUniqueSpriteIndex(String path) - { - if (!spriteInfo.containsKey("/terrain.png")) - { - initMCSpriteMaps(); - } - - BitSet slots = spriteInfo.get(path); - - if (slots == null) - { - Exception ex = new Exception(String.format("Invalid getUniqueSpriteIndex call for texture: %s", path)); - FMLLog.log("fml.TextureManager", Level.SEVERE, ex, "A critical error has been detected with sprite overrides"); - FMLCommonHandler.instance().raiseException(ex,"Invalid request to getUniqueSpriteIndex",true); - } - - int ret = getFreeSlot(slots); - - if (ret == -1) - { - Exception ex = new Exception(String.format("No more sprite indicies left for: %s", path)); - FMLLog.log("fml.TextureManager", Level.SEVERE, ex, "There are no sprite indicies left for %s", path); - FMLCommonHandler.instance().raiseException(ex,"No more sprite indicies left", true); - } - return ret; - } - - public static BitSet toBitSet(String data) - { - BitSet ret = new BitSet(data.length()); - for (int x = 0; x < data.length(); x++) - { - ret.set(x, data.charAt(x) == '1'); - } - return ret; - } - - public static int getFreeSlot(BitSet slots) - { - int next=slots.nextSetBit(0); - slots.clear(next); - return next; - } - - public static int freeSlotCount(String textureToOverride) - { - return spriteInfo.get(textureToOverride).cardinality(); - } - -} diff --git a/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java b/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java index 696bd1259..80b27a010 100644 --- a/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java +++ b/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java @@ -13,7 +13,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.ObjectArrays; -import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.TextureFXManager; /** @@ -90,11 +89,10 @@ public class RenderingRegistry * @param fileToOverride * @param fileToAdd */ + @Deprecated public static int addTextureOverride(String fileToOverride, String fileToAdd) { - int idx = SpriteHelper.getUniqueSpriteIndex(fileToOverride); - addTextureOverride(fileToOverride, fileToAdd, idx); - return idx; + return -1; } /** @@ -114,9 +112,10 @@ public class RenderingRegistry * * @param path */ + @Deprecated public static int getUniqueTextureIndex(String path) { - return SpriteHelper.getUniqueSpriteIndex(path); + return -1; } @Deprecated public static RenderingRegistry instance() diff --git a/fml/client/net/minecraft/src/ModLoader.java b/fml/client/net/minecraft/src/ModLoader.java index 7f69d6a50..e240904af 100644 --- a/fml/client/net/minecraft/src/ModLoader.java +++ b/fml/client/net/minecraft/src/ModLoader.java @@ -55,7 +55,6 @@ import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.IChunkProvider; import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.TextureFXManager; import cpw.mods.fml.client.modloader.ModLoaderClientHelper; import cpw.mods.fml.client.modloader.ModLoaderKeyBindingHandler; @@ -518,10 +517,11 @@ public class ModLoader return EntityRegistry.findGlobalUniqueEntityId(); } + @Deprecated @SideOnly(CLIENT) public static int getUniqueSpriteIndex(String path) { - return SpriteHelper.getUniqueSpriteIndex(path); + return -1; } /**