Replace workaround for red roses with complete icon registration

codewarrior0 · Oct 2, 2017 · 3448d63 · 3448d63
1 parent 70d7dac
commit 3448d63
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 75 deletions.
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/CustomSubTileSignature.java b/src/main/java/com/gmail/pharaun/gregtania/botania/CustomSubTileSignature.java
@@ -6,6 +6,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import vazkii.botania.api.subtile.signature.SubTileSignature;
+import vazkii.botania.common.block.BlockSpecialFlower;
 
 import java.util.List;
 
@@ -21,6 +22,8 @@ public CustomSubTileSignature(String name) {
     @Override
     public void registerIcons(IIconRegister register) {
         icon = register.registerIcon(Reference.MODID + ":" + this.name);
+        BlockSpecialFlower.icons.put(name, icon);
+        BlockSpecialFlower.iconsAlt.put(name, icon);
     }
 
     @Override

diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumI.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumI.java
@@ -68,11 +68,4 @@ public int getColor() {
 	public LexiconEntry getEntry() {
 		return LexiconData.orechidIgnem;
 	}
-
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidEndiumI").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumII.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumII.java
@@ -27,10 +27,4 @@ public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightEnd.get(ORE_TIER);
 	}
 
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidEndiumII").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumIII.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumIII.java
@@ -27,10 +27,4 @@ public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightEnd.get(ORE_TIER);
 	}
 
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidEndiumIII").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumIV.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidEndiumIV.java
@@ -27,11 +27,4 @@ public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightEnd.get(ORE_TIER);
 	}
 
-
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidEndiumIV").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidI.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidI.java
@@ -73,10 +73,4 @@ public LexiconEntry getEntry() {
 		return LexiconData.orechid;
 	}
 
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidI").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidII.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidII.java
@@ -28,11 +28,4 @@ public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightOverworld.get(ORE_TIER);
 	}
 
-
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidII").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIII.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIII.java
@@ -27,12 +27,4 @@ public class OrechidIII extends OrechidI {
 	public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightOverworld.get(ORE_TIER);
 	}
-
-
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidIII").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIV.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIV.java
@@ -27,12 +27,4 @@ public class OrechidIV extends OrechidI {
 	public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightOverworld.get(ORE_TIER);
 	}
-
-
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidIV").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIgnemI.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIgnemI.java
@@ -72,10 +72,4 @@ public LexiconEntry getEntry() {
 		return LexiconData.orechidIgnem;
 	}
 
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidIgnemI").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIgnemII.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIgnemII.java
@@ -28,11 +28,4 @@ public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightNether.get(ORE_TIER);
 	}
 
-
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidIgnemII").getIconForStack(null);
-	}
 }
diff --git a/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIgnemIII.java b/src/main/java/com/gmail/pharaun/gregtania/botania/tiers/OrechidIgnemIII.java
@@ -28,11 +28,4 @@ public Map<String, Integer> getOreMap() {
     	return BotaniaHelper.tieredOreWeightNether.get(ORE_TIER);
 	}
 
-
-	// TODO: This is a workaround for getting a red rose cos i haven't been able to track down why
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return BotaniaAPI.getSignatureForName("evolvedOrechidIgnemIII").getIconForStack(null);
-	}
 }