Fix Compile issues with the way I did chat text, and allow support fo…

…r java 8
progwml6 · Sep 30, 2016 · d500d52 · d500d52
1 parent 794840b
commit d500d52
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -53,6 +53,8 @@ repositories {
 }
 
 group = 'com.progwml6.natura'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 // define the properties file
 ext.configFile = file "build.properties"

diff --git a/src/main/java/com/progwml6/natura/common/NaturaPulse.java b/src/main/java/com/progwml6/natura/common/NaturaPulse.java
@@ -195,7 +195,7 @@ protected void addShapedRecipeFirst(List<IRecipe> recipeList, ItemStack itemstac
 
         HashMap<Character, ItemStack> var12;
 
-        for (var12 = new HashMap<>(); var4 < objArray.length; var4 += 2)
+        for (var12 = new HashMap<Character, ItemStack>(); var4 < objArray.length; var4 += 2)
         {
             Character var13 = (Character) objArray[var4];
             ItemStack var14 = null;

diff --git a/src/main/java/com/progwml6/natura/shared/item/ItemEdibleSoup.java b/src/main/java/com/progwml6/natura/shared/item/ItemEdibleSoup.java
@@ -15,7 +15,7 @@ public class ItemEdibleSoup extends ItemNaturaEdible
     public ItemEdibleSoup()
     {
         super();
-        this.bowlsList = new TIntObjectHashMap<>();
+        this.bowlsList = new TIntObjectHashMap<ItemStack>();
     }
 
     public ItemStack addFood(int meta, int food, float saturation, String name, ItemStack bowl, PotionEffect... effects)

diff --git a/src/main/java/com/progwml6/natura/shared/item/ItemNaturaEdible.java b/src/main/java/com/progwml6/natura/shared/item/ItemNaturaEdible.java
@@ -5,6 +5,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.translation.I18n;
 import slimeknights.mantle.item.ItemEdible;
 
@@ -32,11 +33,11 @@ public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String>
             {
                 if (potionEffect.getPotion().isBadEffect())
                 {
-                    tooltip.add("§4" + I18n.translateToLocal(potionEffect.getEffectName()).trim());
+                    tooltip.add(TextFormatting.RED + I18n.translateToLocal(potionEffect.getEffectName()).trim());
                 }
                 else
                 {
-                    tooltip.add("§9" + I18n.translateToLocal(potionEffect.getEffectName()).trim());
+                    tooltip.add(TextFormatting.BLUE + I18n.translateToLocal(potionEffect.getEffectName()).trim());
                 }
             }
         }