swap flux into the electric modifiers old spots in the client proxy

SlimeKnights · Nov 26, 2013 · c429d8e · c429d8e
1 parent f2da066
commit c429d8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java
@@ -539,7 +539,6 @@ public void initManualRecipes ()
         TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye));
         TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4));
 
-        TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), new ItemStack(Block.dirt), new ItemStack(Block.dirt));
         TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt), new ItemStack(Block.dirt));
 
         TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold));
@@ -697,9 +696,9 @@ void addRenderMappings ()
     {
         String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel",
                 "blueslime", "pigiron" };
-        String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis", "quartz", "silk", "beheading", "smite", "spider",
+        String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider",
                 "reinforced", "flux" };
-        int[] universalEffects = { 0, 1, 4, 9, 16, 17 };
+        int[] universalEffects = { 0, 1, 4, 9, 16 };
         int[] weaponEffects = { 3, 5, 7, 13, 14, 15 };
         int[] harvestEffects = { 2 };
         int[] nonUtility = { 6, 8, 10, 11, 12 };

diff --git a/src/main/java/tconstruct/modifiers/ModFlux.java b/src/main/java/tconstruct/modifiers/ModFlux.java
@@ -18,7 +18,7 @@ public class ModFlux extends ModBoolean
 
     public ModFlux()
     {
-        super(new ItemStack[0], 17, "Flux", "\u00a7e", "");
+        super(new ItemStack[0], 9, "Flux", "\u00a7e", "");
     }
 
     @Override