Backport pt.2

- Removed Proxy logger - Tweaked config - Corrected tier text - Removed unused IEnergyStorage capability inject
JackyyTV · Jul 10, 2017 · d49ad74 · d49ad74
1 parent 521679b
commit d49ad74
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 25 deletions.
diff --git a/src/main/java/me/jacky1356400/exchangers/Config.java b/src/main/java/me/jacky1356400/exchangers/Config.java
@@ -103,11 +103,11 @@ private static void initConfig(Configuration cfg) {
         cfg.addCustomCategoryComment(CATEGORY_RECIPES,
                 "Progressive recipes - requires the previous tier to craft the next tier exchanger, which means more expensive.");
         vanillaProgressiveRecipes = cfg.getBoolean("Vanilla Progressive Recipes", CATEGORY_RECIPES, true,
-                "[Not implemented!] If true, enables progressive recipes for vanilla-based exchangers.");
+                "If true, enables progressive recipes for vanilla-based exchangers.");
         enderIOProgressiveRecipes = cfg.getBoolean("Ender IO Progressive Recipes", CATEGORY_RECIPES, true,
-                "[Not implemented!] If true, enables progressive recipes for Ender IO-based exchangers.");
+                "If true, enables progressive recipes for Ender IO-based exchangers.");
         thermalExpansionProgressiveRecipes = cfg.getBoolean("Thermal Expansion Progressive Recipes", CATEGORY_RECIPES,
-                true, "[Not implemented!] If true, enables progressive recipes for Thermal Expansion-based exchangers.");
+                true, "If true, enables progressive recipes for Thermal Expansion-based exchangers.");
         mekanismProgressiveRecipes = cfg.getBoolean("Mekanism Progressive Recipes", CATEGORY_RECIPES, true,
                 "If true, enables progressive recipes for Mekanism-based exchangers.");
 
@@ -129,7 +129,7 @@ private static void initConfig(Configuration cfg) {
                 "Set the durability for Obsidian Exchanger");
 
         //Ender IO Tweaks
-        cfg.addCustomCategoryComment(CATEGORY_TWEAKS_EIO, "[Not implemented!] Ender IO Exchanger Tweaks");
+        cfg.addCustomCategoryComment(CATEGORY_TWEAKS_EIO, "Ender IO Exchanger Tweaks");
         conductiveMaxEnergy = cfg.getInt("Conductive Iron Exchanger Capacity", CATEGORY_TWEAKS_EIO, 80000,
                 1000, 100000000, "Set the RF capacity for Conductive Iron Exchanger");
         conductivePerBlockUse = cfg.getInt("Conductive Iron Exchanger Power Consumption",

diff --git a/src/main/java/me/jacky1356400/exchangers/helper/EnergyHelper.java b/src/main/java/me/jacky1356400/exchangers/helper/EnergyHelper.java
@@ -2,13 +2,9 @@
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.capabilities.CapabilityInject;
-import net.minecraftforge.energy.IEnergyStorage;
 
 public class EnergyHelper {
 
-    @CapabilityInject (IEnergyStorage.class)
-
     public static ItemStack setDefaultEnergyTag(ItemStack container, int energy) {
 
         if (!container.hasTagCompound()) {

diff --git a/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemDarkSteelExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemDarkSteelExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(5));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemElectricalSteelExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemElectricalSteelExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(2));
+        tooltip.add(StringHelper.getTierText(3));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemEnergeticExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemEnergeticExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(2));
+        tooltip.add(StringHelper.getTierText(4));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemPulsatingIronExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemPulsatingIronExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(1));
+        tooltip.add(StringHelper.getTierText(2));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemVibrantExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/enderio/ItemVibrantExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(6));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/mekanism/ItemUltimateExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/mekanism/ItemUltimateExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(4));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemHardenedExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemHardenedExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(1));
+        tooltip.add(StringHelper.getTierText(2));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemReinforcedExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemReinforcedExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(2));
+        tooltip.add(StringHelper.getTierText(3));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemResonantExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemResonantExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(5));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemSignalumExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/thermalexpansion/ItemSignalumExchanger.java
@@ -53,7 +53,7 @@ public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemSt
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(4));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemDiamondExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemDiamondExchanger.java
@@ -33,7 +33,7 @@ public void initModel() {
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(5));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemEmeraldExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemEmeraldExchanger.java
@@ -33,7 +33,7 @@ public void initModel() {
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(6));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemGoldenExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemGoldenExchanger.java
@@ -33,7 +33,7 @@ public void initModel() {
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(2));
+        tooltip.add(StringHelper.getTierText(3));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemIronExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemIronExchanger.java
@@ -33,7 +33,7 @@ public void initModel() {
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(2));
+        tooltip.add(StringHelper.getTierText(4));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemObsidianExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemObsidianExchanger.java
@@ -33,7 +33,7 @@ public void initModel() {
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(3));
+        tooltip.add(StringHelper.getTierText(7));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemStoneExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/vanilla/ItemStoneExchanger.java
@@ -33,7 +33,7 @@ public void initModel() {
     @SuppressWarnings("unchecked")
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean bool) {
         super.addInformation(stack, player, tooltip, bool);
-        tooltip.add(StringHelper.getTierText(1));
+        tooltip.add(StringHelper.getTierText(2));
     }
 
 }
diff --git a/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java b/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java
@@ -44,7 +44,6 @@ public void preInit(FMLPreInitializationEvent e){
     }
 
     public void init(FMLInitializationEvent e){
-        Exchangers.logger.info("proxy");
         MinecraftForge.EVENT_BUS.register(new RenderOverlayHandler());
         MinecraftForge.EVENT_BUS.register(new WorldEventHandler());
     }