Fixed a stupid Bug of mine

build.gradle

@@ -18,7 +18,7 @@ buildscript {
 apply plugin: 'forge'
 apply plugin: 'maven'
 
-version = "1.7.10-0.0.4.1"
+version = "1.7.10-0.0.4.2"
 group = "ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 

newestVersion.txt

@@ -1 +1 @@
-1.7.10-0.0.4.1
+1.7.10-0.0.4.2

src/main/java/ellpeck/actuallyadditions/PLANNED.txt

@@ -56,3 +56,8 @@
 
 -File Jukebox
     -Plays Sound Files put into your Minecraft Folder
+
+-RF Implementation
+    -Power Acceptor Block that powers Machines
+    -Machines still don't accept RF themselves!
+    -Solar Panel & Heat Collector produce RF

src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java

@@ -32,7 +32,7 @@ public class ItemPotionRing extends Item implements INameableItem{
 
     @Override
     public String getOredictName(){
-        return "";
+        return this.getName();
     }
 
     @Override
@@ -91,7 +91,7 @@ public class ItemPotionRing extends Item implements INameableItem{
     @SuppressWarnings("unchecked")
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld){
-        ItemUtil.addInformation(this, list, 2, "", allRings[stack.getItemDamage()].getOredictName());
+        ItemUtil.addInformation(this, list, 2, "", this.getOredictName());
 
         if(KeyUtil.isShiftPressed()){
             if(stack.getItemDamage() == ThePotionRings.SATURATION.ordinal()){

src/main/java/ellpeck/actuallyadditions/items/ItemUpgrade.java

@@ -16,7 +16,7 @@ import java.util.List;
 
 public class ItemUpgrade extends Item implements INameableItem{
 
-    private String name;
+    private final String name;
     public UpgradeType type;
     private int textAmount;
 

src/main/java/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java

@@ -61,6 +61,6 @@ public enum ThePotionRings implements INameableItem{
 
     @Override
     public String getOredictName(){
-        return "itemPotionRing";
+        return "";
     }
 }

src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java

@@ -4,6 +4,7 @@ import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.ItemList;
 import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
+import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import ellpeck.actuallyadditions.inventory.GuiGrinder;
 import ellpeck.actuallyadditions.recipe.GrinderRecipes;
@@ -28,6 +29,11 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler{
 
     public static ArrayList<Fuel> fuels;
 
+    public CrusherRecipeHandler(){
+        super();
+        RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0);
+    }
+
     public class CachedCrush extends CachedRecipe{
 
         public PositionedStack ingredient;
@@ -37,9 +43,9 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler{
 
         public CachedCrush(ItemStack in, ItemStack resultOne, ItemStack resultTwo, int secondChance){
             in.stackSize = 1;
-            this.ingredient = new PositionedStack(in, 7, 37);
-            this.resultOne = new PositionedStack(resultOne, 60, 39);
-            if(resultTwo != null) this.resultTwo = new PositionedStack(resultTwo, 86, 39);
+            this.ingredient = new PositionedStack(in, 80, 21);
+            this.resultOne = new PositionedStack(resultOne, 66, 69);
+            if(resultTwo != null) this.resultTwo = new PositionedStack(resultTwo, 94, 69);
             this.secondChance = secondChance;
         }
 
@@ -67,10 +73,15 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler{
         }
     }
 
+    @Override
+    public int recipiesPerPage(){
+        return 1;
+    }
+
     public static class Fuel{
 
         public Fuel(ItemStack in, int burnTime){
-            this.stack = new PositionedStack(in, 7, 3, false);
+            this.stack = new PositionedStack(in, 51, 21, false);
             this.burnTime = burnTime;
         }
 
@@ -80,8 +91,8 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler{
 
     @Override
     public void loadTransferRects(){
-        transferRects.add(new RecipeTransferRect(new Rectangle(29, 3, 16, 16), FUEL));
-        transferRects.add(new RecipeTransferRect(new Rectangle(29, 32, 22, 22), NAME));
+        transferRects.add(new RecipeTransferRect(new Rectangle(51, 5, 14, 14), FUEL));
+        transferRects.add(new RecipeTransferRect(new Rectangle(80, 40, 24, 22), NAME));
     }
 
     @Override
@@ -139,26 +150,26 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler{
 
     @Override
     public String getGuiTexture(){
-        return ModUtil.MOD_ID_LOWER + ":textures/gui/nei/grinder.png";
+        return ModUtil.MOD_ID_LOWER + ":textures/gui/guiGrinder.png";
     }
 
     @Override
     public void drawBackground(int recipeIndex){
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         GuiDraw.changeTexture(getGuiTexture());
-        GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 113, 66);
+        GuiDraw.drawTexturedModalRect(49, 5, 49, 5, 66, 86);
     }
 
     @Override
     public void drawExtras(int recipe){
-        drawProgressBar(29, 4, 113, 44, 14, 14, 48, 7);
-        drawProgressBar(29, 32, 113, 0, 22, 22, 48, 0);
+        drawProgressBar(51, 5, 176, 44, 14, 14, 48, 7);
+        drawProgressBar(80, 40, 176, 0, 24, 23, 48, 1);
 
         CachedCrush crush = (CachedCrush)this.arecipes.get(recipe);
         if(crush.resultTwo != null){
             int secondChance = crush.secondChance;
             String secondString = secondChance + "%";
-            GuiDraw.drawString(secondString, 87, 24, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false);
+            GuiDraw.drawString(secondString, 118, 73, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false);
         }
     }
 

src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java

@@ -44,7 +44,7 @@ public class BlockUtil{
         block.setBlockName(createUnlocalizedName(block));
         GameRegistry.registerBlock(block, itemBlock, ((INameableItem)block).getName());
         for(Enum current : list){
-            OreDictionary.registerOre(((INameableItem)current).getOredictName(), new ItemStack(block, 1, current.ordinal()));
+            if(!((INameableItem)current).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)current).getOredictName(), new ItemStack(block, 1, current.ordinal()));
         }
     }
 
@@ -52,7 +52,7 @@ public class BlockUtil{
         block.setCreativeTab(CreativeTab.instance);
         block.setBlockName(createUnlocalizedName(block));
         GameRegistry.registerBlock(block, itemBlock, ((INameableItem)block).getName());
-        OreDictionary.registerOre(((INameableItem)block).getOredictName(), block);
+        if(!((INameableItem)block).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)block).getOredictName(), block);
     }
 
 }

src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java

@@ -46,7 +46,7 @@ public class ItemUtil{
         item.setCreativeTab(CreativeTab.instance);
         item.setUnlocalizedName(createUnlocalizedName(item));
         GameRegistry.registerItem(item, ((INameableItem)item).getName());
-        OreDictionary.registerOre(((INameableItem)item).getOredictName(), item);
+        if(!((INameableItem)item).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)item).getOredictName(), item);
     }
 
     public static void register(Item item, Enum[] list){
@@ -54,7 +54,7 @@ public class ItemUtil{
         item.setUnlocalizedName(createUnlocalizedName(item));
         GameRegistry.registerItem(item, ((INameableItem)item).getName());
         for(Enum current : list){
-            OreDictionary.registerOre(((INameableItem)current).getOredictName(), new ItemStack(item, 1, current.ordinal()));
+            if(!((INameableItem)current).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)current).getOredictName(), new ItemStack(item, 1, current.ordinal()));
         }
     }
 

src/main/java/ellpeck/actuallyadditions/util/ModUtil.java

@@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
 
 public class ModUtil{
 
-    public static final String VERSION = "1.7.10-0.0.4.1";
+    public static final String VERSION = "1.7.10-0.0.4.2";
 
     public static final String MOD_ID = "ActuallyAdditions";
     public static final String NAME = "Actually Additions";

src/main/resources/mcmod.info

@@ -3,7 +3,7 @@
   "modid": "ActuallyAdditions",
   "name": "Actually Additions",
   "description": "Actually Additions is a Mod that offers a bunch of things from Machines for Automation and tons of food to advanced Hopper Mechanisms and Effect Rings!",
-  "version": "0.0.4.1",
+  "version": "0.0.4.2",
   "mcversion": "1.7.10",
   "url": "https://github.com/Ellpeck/ActuallyAdditions",
   "updateUrl": "",