upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TOPBOTSIDE not being possible...

Browse Source 
Conflicts:
	src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java
This commit is contained in:
tterrag1098 committed 2015-08-27 23:34:55 -04:00
1 parent 6a2c629441
commit 53fde23f5b
1 file changed
+15 -15
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java
+15 -15
View File
@@ -34,21 +34,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public enum TextureType {
// @formatter:off
TOPSIDE("top", "side") {
@Override
protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) {
return new IIcon[]{
register.registerIcon(modName + ":" + texturePath + "-side"),
register.registerIcon(modName + ":" + texturePath + "-top")
};
}
@Override
protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) {
IIcon[] icons = (IIcon[]) cachedObject;
return side > 1 ? icons[0] : icons[1];
}
},
TOPBOTSIDE("top", "bottom", "side"){
@Override
protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) {
@@ -65,6 +50,21 @@ public enum TextureType {
return side > 1 ? icons[0] : icons[side + 1];
}
},
TOPSIDE("top", "side") {
@Override
protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) {
return new IIcon[]{
register.registerIcon(modName + ":" + texturePath + "-side"),
register.registerIcon(modName + ":" + texturePath + "-top")
};
}
@Override
protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) {
IIcon[] icons = (IIcon[]) cachedObject;
return side > 1 ? icons[0] : icons[1];
}
},
CTMV("ctmv", "top"){
@Override