mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 12:59:44 +00:00
Tidy up TextureManager
This commit is contained in:
1 parent
76afe30e94
commit
6539ad10af
36 files changed
+150
-137
No files matched your search
@@ -132,20 +132,20 @@ public class BlockAlveary extends BlockStructure {
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
icons = new IIcon[14];
|
||||
icons[0] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.plain");
|
||||
icons[1] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.entrance");
|
||||
icons[2] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.bottom");
|
||||
icons[3] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.left");
|
||||
icons[4] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.right");
|
||||
icons[5] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.swarmer.off");
|
||||
icons[6] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.swarmer.on");
|
||||
icons[7] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.heater.off");
|
||||
icons[8] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.heater.on");
|
||||
icons[9] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.fan.off");
|
||||
icons[10] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.fan.on");
|
||||
icons[11] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.valve");
|
||||
icons[12] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.stabiliser");
|
||||
icons[13] = TextureManager.getInstance().registerTex(register, "apiculture/alveary.sieve");
|
||||
icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain");
|
||||
icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance");
|
||||
icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom");
|
||||
icons[3] = TextureManager.registerTex(register, "apiculture/alveary.left");
|
||||
icons[4] = TextureManager.registerTex(register, "apiculture/alveary.right");
|
||||
icons[5] = TextureManager.registerTex(register, "apiculture/alveary.swarmer.off");
|
||||
icons[6] = TextureManager.registerTex(register, "apiculture/alveary.swarmer.on");
|
||||
icons[7] = TextureManager.registerTex(register, "apiculture/alveary.heater.off");
|
||||
icons[8] = TextureManager.registerTex(register, "apiculture/alveary.heater.on");
|
||||
icons[9] = TextureManager.registerTex(register, "apiculture/alveary.fan.off");
|
||||
icons[10] = TextureManager.registerTex(register, "apiculture/alveary.fan.on");
|
||||
icons[11] = TextureManager.registerTex(register, "apiculture/alveary.valve");
|
||||
icons[12] = TextureManager.registerTex(register, "apiculture/alveary.stabiliser");
|
||||
icons[13] = TextureManager.registerTex(register, "apiculture/alveary.sieve");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -185,8 +185,8 @@ public class BlockBeehives extends BlockContainer {
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
icons = new IIcon[18];
|
||||
for (int i = 1; i < 9; i++) {
|
||||
icons[i * 2] = TextureManager.getInstance().registerTex(register, "beehives/beehive." + i + ".top");
|
||||
icons[(i * 2) + 1] = TextureManager.getInstance().registerTex(register, "beehives/beehive." + i + ".side");
|
||||
icons[i * 2] = TextureManager.registerTex(register, "beehives/beehive." + i + ".top");
|
||||
icons[(i * 2) + 1] = TextureManager.registerTex(register, "beehives/beehive." + i + ".side");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -117,11 +117,11 @@ public class BlockCandle extends BlockTorch {
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
String fileBase = StringUtil.cleanBlockName(this);
|
||||
this.blockIcon = TextureManager.getInstance().registerTex(register, "stump");
|
||||
this.litStump = TextureManager.getInstance().registerTex(register, fileBase + "StumpLit");
|
||||
this.litTip = TextureManager.getInstance().registerTex(register, fileBase + "TipLit");
|
||||
this.unlitStump = TextureManager.getInstance().registerTex(register, fileBase + "StumpUnlit");
|
||||
this.unlitTip = TextureManager.getInstance().registerTex(register, fileBase + "TipUnlit");
|
||||
this.blockIcon = TextureManager.registerTex(register, "stump");
|
||||
this.litStump = TextureManager.registerTex(register, fileBase + "StumpLit");
|
||||
this.litTip = TextureManager.registerTex(register, fileBase + "TipLit");
|
||||
this.unlitStump = TextureManager.registerTex(register, fileBase + "StumpUnlit");
|
||||
this.unlitTip = TextureManager.registerTex(register, fileBase + "TipUnlit");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -46,7 +46,7 @@ public class BlockStump extends BlockTorch {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
this.blockIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanBlockName(this));
|
||||
this.blockIcon = TextureManager.registerTex(register, StringUtil.cleanBlockName(this));
|
||||
}
|
||||
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
|
||||
@@ -213,8 +213,7 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister register) {
|
||||
String beeIconDir = "bees/default/";
|
||||
TextureManager textureManager = TextureManager.getInstance();
|
||||
IIcon body1 = textureManager.registerTex(register, beeIconDir + "body1");
|
||||
IIcon body1 = TextureManager.registerTex(register, beeIconDir + "body1");
|
||||
|
||||
for (int i = 0; i < EnumBeeType.values().length; i++) {
|
||||
EnumBeeType beeType = EnumBeeType.values()[i];
|
||||
@@ -224,13 +223,13 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
|
||||
|
||||
String beeTypeNameBase = beeIconDir + beeType.toString().toLowerCase(Locale.ENGLISH);
|
||||
|
||||
icons[i][0] = textureManager.registerTex(register, beeTypeNameBase + ".outline");
|
||||
icons[i][0] = TextureManager.registerTex(register, beeTypeNameBase + ".outline");
|
||||
if (beeType == EnumBeeType.LARVAE) {
|
||||
icons[i][1] = textureManager.registerTex(register, beeTypeNameBase + ".body");
|
||||
icons[i][1] = TextureManager.registerTex(register, beeTypeNameBase + ".body");
|
||||
} else {
|
||||
icons[i][1] = body1;
|
||||
}
|
||||
icons[i][2] = textureManager.registerTex(register, beeTypeNameBase + ".body2");
|
||||
icons[i][2] = TextureManager.registerTex(register, beeTypeNameBase + ".body2");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArm
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
itemIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this));
|
||||
itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -127,7 +127,7 @@ public class FruitProviderNone implements IFruitProvider {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister register) {
|
||||
if (overlay != null) {
|
||||
TextureManager.getInstance().registerTexUID(register, overlay.texUID, "leaves/fruits." + overlay.ident);
|
||||
TextureManager.registerTexUID(register, overlay.texUID, "leaves/fruits." + overlay.ident);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -36,10 +36,21 @@ public class FruitProviderPod extends FruitProviderNone {
|
||||
PAPAYA((short) 2013, (short) 2014, (short) 2015);//, COCONUT((short)2016, (short)2017, (short)2018);
|
||||
|
||||
public final short[] uids;
|
||||
|
||||
EnumPodType(short stage1, short stage2, short stage3) {
|
||||
uids = new short[]{stage1, stage2, stage3};
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister register) {
|
||||
if (this == COCOA) {
|
||||
return;
|
||||
}
|
||||
|
||||
String name = toString().toLowerCase(Locale.ENGLISH);
|
||||
for (int i = 0; i < 3; i++) {
|
||||
TextureManager.registerTexUID(register, uids[i], "pods/" + name + "." + i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static final ItemStack[] DUMMY = new ItemStack[0];
|
||||
@@ -98,13 +109,7 @@ public class FruitProviderPod extends FruitProviderNone {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister register) {
|
||||
if (type == EnumPodType.COCOA) {
|
||||
return;
|
||||
}
|
||||
|
||||
TextureManager.getInstance().registerTexUID(register, type.uids[0], "pods/" + type.toString().toLowerCase(Locale.ENGLISH) + ".0");
|
||||
TextureManager.getInstance().registerTexUID(register, type.uids[1], "pods/" + type.toString().toLowerCase(Locale.ENGLISH) + ".1");
|
||||
TextureManager.getInstance().registerTexUID(register, type.uids[2], "pods/" + type.toString().toLowerCase(Locale.ENGLISH) + ".2");
|
||||
type.registerIcons(register);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -111,7 +111,7 @@ public class BlockFruitPod extends BlockCocoa {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
defaultIcon = TextureManager.getInstance().registerTex(register, "pods/papaya.2");
|
||||
defaultIcon = TextureManager.registerTex(register, "pods/papaya.2");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -89,7 +89,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
defaultIcon = TextureManager.getInstance().registerTex(register, "germlings/sapling.treeBalsa");
|
||||
defaultIcon = TextureManager.registerTex(register, "germlings/sapling.treeBalsa");
|
||||
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
if (allele instanceof IAlleleTreeSpecies) {
|
||||
|
||||
@@ -30,9 +30,7 @@ public class IconProviderGermling implements IGermlingIconProvider {
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
TextureManager textureManager = TextureManager.getInstance();
|
||||
|
||||
icon = textureManager.registerTex(register, "germlings/sapling." + name);
|
||||
icon = TextureManager.registerTex(register, "germlings/sapling." + name);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -32,9 +32,9 @@ public abstract class IconProviderWood {
|
||||
EnumWoodType woodType = EnumWoodType.VALUES[i];
|
||||
String woodName = woodType.toString().toLowerCase(Locale.ENGLISH);
|
||||
|
||||
icons[0][i] = TextureManager.getInstance().registerTex(register, "wood/planks." + woodName);
|
||||
icons[1][i] = TextureManager.getInstance().registerTex(register, "wood/bark." + woodName);
|
||||
icons[2][i] = TextureManager.getInstance().registerTex(register, "wood/heart." + woodName);
|
||||
icons[0][i] = TextureManager.registerTex(register, "wood/planks." + woodName);
|
||||
icons[1][i] = TextureManager.registerTex(register, "wood/bark." + woodName);
|
||||
icons[2][i] = TextureManager.registerTex(register, "wood/heart." + woodName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -50,13 +50,11 @@ public class TextureLeaves {
|
||||
}
|
||||
|
||||
private void registerIcons(IIconRegister register) {
|
||||
TextureManager textureManager = TextureManager.getInstance();
|
||||
|
||||
String ident = leafType.toString().toLowerCase(Locale.ENGLISH);
|
||||
|
||||
plain = textureManager.registerTex(register, "leaves/" + ident + ".plain");
|
||||
pollinated = textureManager.registerTex(register, "leaves/" + ident + ".changed");
|
||||
fancy = textureManager.registerTex(register, "leaves/" + ident + ".fancy");
|
||||
plain = TextureManager.registerTex(register, "leaves/" + ident + ".plain");
|
||||
pollinated = TextureManager.registerTex(register, "leaves/" + ident + ".changed");
|
||||
fancy = TextureManager.registerTex(register, "leaves/" + ident + ".fancy");
|
||||
}
|
||||
|
||||
public IIcon getPlain() {
|
||||
|
||||
@@ -69,7 +69,7 @@ public class EventHandlerCore {
|
||||
public void handleTextureRemap(TextureStitchEvent.Pre event) {
|
||||
if (event.map.getTextureType() == 1) {
|
||||
ErrorStateRegistry.initIcons(event.map);
|
||||
TextureManager.getInstance().initDefaultIcons(event.map);
|
||||
TextureManager.initDefaultIcons(event.map);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -98,9 +98,9 @@ public class BlockResourceOre extends Block {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
iconApatite = TextureManager.getInstance().registerTex(register, "ores/apatite");
|
||||
iconCopper = TextureManager.getInstance().registerTex(register, "ores/copper");
|
||||
iconTin = TextureManager.getInstance().registerTex(register, "ores/tin");
|
||||
iconApatite = TextureManager.registerTex(register, "ores/apatite");
|
||||
iconCopper = TextureManager.registerTex(register, "ores/copper");
|
||||
iconTin = TextureManager.registerTex(register, "ores/tin");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -51,10 +51,10 @@ public class BlockResourceStorage extends Block {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
iconApatite = TextureManager.getInstance().registerTex(register, "storage/apatite");
|
||||
iconCopper = TextureManager.getInstance().registerTex(register, "storage/copper");
|
||||
iconTin = TextureManager.getInstance().registerTex(register, "storage/tin");
|
||||
iconBronze = TextureManager.getInstance().registerTex(register, "storage/bronze");
|
||||
iconApatite = TextureManager.registerTex(register, "storage/apatite");
|
||||
iconCopper = TextureManager.registerTex(register, "storage/copper");
|
||||
iconTin = TextureManager.registerTex(register, "storage/tin");
|
||||
iconBronze = TextureManager.registerTex(register, "storage/bronze");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -251,9 +251,9 @@ public class BlockSoil extends Block implements IItemTyped {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister register) {
|
||||
iconHumus = TextureManager.getInstance().registerTex(register, "soil/humus");
|
||||
iconBogEarth = TextureManager.getInstance().registerTex(register, "soil/bog");
|
||||
iconPeat = TextureManager.getInstance().registerTex(register, "soil/peat");
|
||||
iconHumus = TextureManager.registerTex(register, "soil/humus");
|
||||
iconBogEarth = TextureManager.registerTex(register, "soil/bog");
|
||||
iconPeat = TextureManager.registerTex(register, "soil/peat");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -95,11 +95,11 @@ public class BlockForestryFluid extends BlockFluidClassic {
|
||||
this.icons = new ArrayList<>(2);
|
||||
|
||||
String still = "liquid/" + fluidName + "_still";
|
||||
this.icons.add(TextureManager.getInstance().registerTex(iconRegister, still));
|
||||
this.icons.add(TextureManager.registerTex(iconRegister, still));
|
||||
|
||||
if (flowTextureExists()) {
|
||||
String flow = "liquid/" + fluidName + "_flow";
|
||||
this.icons.add(TextureManager.getInstance().registerTex(iconRegister, flow));
|
||||
this.icons.add(TextureManager.registerTex(iconRegister, flow));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
itemIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this));
|
||||
itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -89,7 +89,7 @@ public class ItemCrated extends Item {
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
String textureName = (contained == null) ? "crate" : "crate-filled";
|
||||
itemIcon = TextureManager.getInstance().registerTex(register, textureName);
|
||||
itemIcon = TextureManager.registerTex(register, textureName);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -54,6 +54,6 @@ public class ItemForestry extends Item {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
itemIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this));
|
||||
itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this));
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,7 @@ public class ItemForestryFood extends ItemFood {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
itemIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this));
|
||||
itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -29,8 +29,8 @@ public class ItemForestryMultiPass extends ItemForestry {
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
icons = new IIcon[2];
|
||||
icons[0] = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this) + ".0");
|
||||
icons[1] = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this) + ".1");
|
||||
icons[0] = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".0");
|
||||
icons[1] = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".1");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -44,7 +44,7 @@ public class ItemFruit extends ItemForestryFood {
|
||||
public static void registerIcons(IIconRegister register) {
|
||||
icons = new IIcon[VALUES.length];
|
||||
for (int i = 0; i < VALUES.length; i++) {
|
||||
icons[i] = TextureManager.getInstance().registerTex(register, "fruits/" + VALUES[i].toString().toLowerCase(Locale.ENGLISH));
|
||||
icons[i] = TextureManager.registerTex(register, "fruits/" + VALUES[i].toString().toLowerCase(Locale.ENGLISH));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -323,8 +323,8 @@ public class ItemLiquidContainer extends Item {
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
icons = new IIcon[2];
|
||||
icons[0] = TextureManager.getInstance().registerTex(register, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + ".bottle");
|
||||
icons[1] = TextureManager.getInstance().registerTex(register, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + ".contents");
|
||||
icons[0] = TextureManager.registerTex(register, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + ".bottle");
|
||||
icons[1] = TextureManager.registerTex(register, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + ".contents");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -62,7 +62,7 @@ public class ItemMisc extends ItemForestry {
|
||||
|
||||
icons = new IIcon[definition.length];
|
||||
for (int i = 0; i < definition.length; i++) {
|
||||
icons[i] = TextureManager.getInstance().registerTex(register, definition[i]);
|
||||
icons[i] = TextureManager.registerTex(register, definition[i]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -95,9 +95,9 @@ public class ItemOverlay extends ItemForestry {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
primaryIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this) + ".0");
|
||||
primaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".0");
|
||||
if (overlays[0].secondaryColor != 0) {
|
||||
secondaryIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this) + ".1");
|
||||
secondaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".1");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -157,8 +157,8 @@ public class ItemPipette extends ItemForestry implements IToolPipette {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
primaryIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this) + ".0");
|
||||
secondaryIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this) + ".1");
|
||||
primaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".0");
|
||||
secondaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".1");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -12,6 +12,8 @@ package forestry.core.render;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
@@ -26,27 +28,25 @@ import forestry.api.core.ITextureManager;
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TextureManager implements ITextureManager {
|
||||
|
||||
private static TextureManager instance;
|
||||
private static final TextureManager instance = new TextureManager();
|
||||
|
||||
public static TextureManager getInstance() {
|
||||
if (instance == null) {
|
||||
instance = new TextureManager();
|
||||
ForestryAPI.textureManager = instance;
|
||||
}
|
||||
private static final Map<String, IIcon> defaultIcons = new HashMap<>();
|
||||
private static final DefaultIconProvider defaultIconProvider = new DefaultIconProvider();
|
||||
private static final List<IIconProvider> iconProviders = new ArrayList<>();
|
||||
|
||||
return instance;
|
||||
static {
|
||||
ForestryAPI.textureManager = instance;
|
||||
instance.registerIconProvider(defaultIconProvider);
|
||||
}
|
||||
|
||||
private final HashMap<String, IIcon> defaultIcons = new HashMap<>();
|
||||
|
||||
private final IIcon[] textures = new IIcon[2048];
|
||||
|
||||
private final ArrayList<IIconProvider> iconProvider = new ArrayList<>();
|
||||
public static TextureManager getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
private TextureManager() {
|
||||
}
|
||||
|
||||
public void initDefaultIcons(IIconRegister register) {
|
||||
public static void initDefaultIcons(IIconRegister register) {
|
||||
String[] defaultIconNames = new String[]{"habitats/desert", "habitats/end", "habitats/forest", "habitats/hills", "habitats/jungle", "habitats/mushroom",
|
||||
"habitats/nether", "habitats/ocean", "habitats/plains", "habitats/snow", "habitats/swamp", "habitats/taiga", "misc/access.private",
|
||||
"misc/access.viewable", "misc/access.shared", "misc/energy", "misc/hint",
|
||||
@@ -57,30 +57,29 @@ public class TextureManager implements ITextureManager {
|
||||
"slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked",
|
||||
"mail/carrier.player", "mail/carrier.trader"};
|
||||
for (String str : defaultIconNames) {
|
||||
defaultIcons.put(str, registerTex(register, str));
|
||||
IIcon icon = registerTex(register, str);
|
||||
defaultIcons.put(str, icon);
|
||||
}
|
||||
}
|
||||
|
||||
public IIcon getDefault(String ident) {
|
||||
return defaultIcons.get(ident);
|
||||
}
|
||||
|
||||
public IIcon registerTex(IIconRegister register, String identifier) {
|
||||
public static IIcon registerTex(IIconRegister register, String identifier) {
|
||||
return register.registerIcon("forestry:" + identifier);
|
||||
}
|
||||
|
||||
public IIcon registerTexUID(IIconRegister register, short uid, String identifier) {
|
||||
return setTexUID(uid, registerTex(register, identifier));
|
||||
}
|
||||
|
||||
public IIcon setTexUID(short uid, IIcon texture) {
|
||||
textures[uid] = texture;
|
||||
public static IIcon registerTexUID(IIconRegister register, short uid, String identifier) {
|
||||
IIcon texture = registerTex(register, identifier);
|
||||
defaultIconProvider.addTexture(uid, texture);
|
||||
return texture;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getDefault(String ident) {
|
||||
return defaultIcons.get(ident);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIconProvider(IIconProvider provider) {
|
||||
iconProvider.add(provider);
|
||||
iconProviders.add(provider);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -88,17 +87,32 @@ public class TextureManager implements ITextureManager {
|
||||
if (texUID < 0) {
|
||||
return null;
|
||||
}
|
||||
if (texUID < textures.length) {
|
||||
return textures[texUID];
|
||||
}
|
||||
|
||||
for (IIconProvider provider : iconProvider) {
|
||||
IIcon retr = provider.getIcon(texUID);
|
||||
if (retr != null) {
|
||||
return retr;
|
||||
for (IIconProvider provider : iconProviders) {
|
||||
IIcon icon = provider.getIcon(texUID);
|
||||
if (icon != null) {
|
||||
return icon;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static class DefaultIconProvider implements IIconProvider {
|
||||
private final Map<Short, IIcon> textures = new HashMap<>();
|
||||
|
||||
public void addTexture(short texUID, IIcon texture) {
|
||||
textures.put(texUID, texture);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(short texUID) {
|
||||
return textures.get(texUID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -190,7 +190,7 @@ public class MachineDefinition {
|
||||
}
|
||||
|
||||
for (int i = 0; i < 8; i++) {
|
||||
icons[i] = TextureManager.getInstance().registerTex(register, teIdent.replace("forestry.", "").toLowerCase(Locale.ENGLISH) + "." + faceMap[i]);
|
||||
icons[i] = TextureManager.registerTex(register, teIdent.replace("forestry.", "").toLowerCase(Locale.ENGLISH) + "." + faceMap[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ public abstract class Trigger implements ITriggerExternal {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister register) {
|
||||
icon = TextureManager.getInstance().registerTex(register, "triggers/" + unlocalized.replace("trigger.", ""));
|
||||
icon = TextureManager.registerTex(register, "triggers/" + unlocalized.replace("trigger.", ""));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -42,16 +42,15 @@ public enum EnumFarmBlockTexture {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void registerIcons(IIconRegister register) {
|
||||
TextureManager textureManager = TextureManager.getInstance();
|
||||
icons = Arrays.asList(
|
||||
textureManager.registerTex(register, "farm/plain"),
|
||||
textureManager.registerTex(register, "farm/reverse"),
|
||||
textureManager.registerTex(register, "farm/top"),
|
||||
textureManager.registerTex(register, "farm/band"),
|
||||
textureManager.registerTex(register, "farm/gears"),
|
||||
textureManager.registerTex(register, "farm/hatch"),
|
||||
textureManager.registerTex(register, "farm/valve"),
|
||||
textureManager.registerTex(register, "farm/control")
|
||||
TextureManager.registerTex(register, "farm/plain"),
|
||||
TextureManager.registerTex(register, "farm/reverse"),
|
||||
TextureManager.registerTex(register, "farm/top"),
|
||||
TextureManager.registerTex(register, "farm/band"),
|
||||
TextureManager.registerTex(register, "farm/gears"),
|
||||
TextureManager.registerTex(register, "farm/hatch"),
|
||||
TextureManager.registerTex(register, "farm/valve"),
|
||||
TextureManager.registerTex(register, "farm/control")
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -67,8 +67,8 @@ public class ItemBeverage extends ItemForestryFood {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister register) {
|
||||
iconBottle = TextureManager.getInstance().registerTex(register, "liquids/" + iconType + ".bottle");
|
||||
iconContents = TextureManager.getInstance().registerTex(register, "liquids/" + iconType + ".contents");
|
||||
iconBottle = TextureManager.registerTex(register, "liquids/" + iconType + ".bottle");
|
||||
iconContents = TextureManager.registerTex(register, "liquids/" + iconType + ".contents");
|
||||
}
|
||||
|
||||
public static List<IBeverageEffect> loadEffects(ItemStack stack) {
|
||||
|
||||
@@ -185,12 +185,12 @@ public class ItemButterflyGE extends ItemGE {
|
||||
icons = new IIcon[2];
|
||||
switch (this.type) {
|
||||
case CATERPILLAR:
|
||||
icons[0] = TextureManager.getInstance().registerTex(register, "caterpillar.body");
|
||||
icons[1] = TextureManager.getInstance().registerTex(register, "caterpillar.body2");
|
||||
icons[0] = TextureManager.registerTex(register, "caterpillar.body");
|
||||
icons[1] = TextureManager.registerTex(register, "caterpillar.body2");
|
||||
break;
|
||||
default:
|
||||
icons[0] = TextureManager.getInstance().registerTex(register, "liquids/jar.contents");
|
||||
icons[1] = TextureManager.getInstance().registerTex(register, "liquids/jar.bottle");
|
||||
icons[0] = TextureManager.registerTex(register, "liquids/jar.contents");
|
||||
icons[1] = TextureManager.registerTex(register, "liquids/jar.bottle");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -85,10 +85,10 @@ public class ItemLetter extends ItemInventoried {
|
||||
public void registerIcons(IIconRegister register) {
|
||||
icons = new IIcon[3][4];
|
||||
for (int i = 0; i < 3; i++) {
|
||||
icons[i][0] = TextureManager.getInstance().registerTex(register, "mail/letter." + i + ".fresh");
|
||||
icons[i][1] = TextureManager.getInstance().registerTex(register, "mail/letter." + i + ".stamped");
|
||||
icons[i][2] = TextureManager.getInstance().registerTex(register, "mail/letter." + i + ".opened");
|
||||
icons[i][3] = TextureManager.getInstance().registerTex(register, "mail/letter." + i + ".emptied");
|
||||
icons[i][0] = TextureManager.registerTex(register, "mail/letter." + i + ".fresh");
|
||||
icons[i][1] = TextureManager.registerTex(register, "mail/letter." + i + ".stamped");
|
||||
icons[i][2] = TextureManager.registerTex(register, "mail/letter." + i + ".opened");
|
||||
icons[i][3] = TextureManager.registerTex(register, "mail/letter." + i + ".emptied");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -253,12 +253,12 @@ public class ItemBackpack extends ItemInventoried {
|
||||
EnumBackpackType t = type == EnumBackpackType.APIARIST ? EnumBackpackType.T1 : type;
|
||||
String typeTag = "backpacks/" + t.toString().toLowerCase(Locale.ENGLISH);
|
||||
|
||||
icons[0] = TextureManager.getInstance().registerTex(register, typeTag + ".cloth");
|
||||
icons[1] = TextureManager.getInstance().registerTex(register, typeTag + ".outline");
|
||||
icons[2] = TextureManager.getInstance().registerTex(register, "backpacks/neutral");
|
||||
icons[3] = TextureManager.getInstance().registerTex(register, "backpacks/locked");
|
||||
icons[4] = TextureManager.getInstance().registerTex(register, "backpacks/receive");
|
||||
icons[5] = TextureManager.getInstance().registerTex(register, "backpacks/resupply");
|
||||
icons[0] = TextureManager.registerTex(register, typeTag + ".cloth");
|
||||
icons[1] = TextureManager.registerTex(register, typeTag + ".outline");
|
||||
icons[2] = TextureManager.registerTex(register, "backpacks/neutral");
|
||||
icons[3] = TextureManager.registerTex(register, "backpacks/locked");
|
||||
icons[4] = TextureManager.registerTex(register, "backpacks/receive");
|
||||
icons[5] = TextureManager.registerTex(register, "backpacks/resupply");
|
||||
}
|
||||
|
||||
// Return true to enable color overlay - client side only
|
||||
|
||||
Reference in new issue
Block a user