diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index 71633eed..6d3c454e 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -39,9 +39,8 @@ Valid input item definitions: - - Must have either: itemID, modID + itemName or oreDictionary - - 'itemID' must be a valid blockID or itemID. - - 'modID' is the identifier registered by the mod with Forge (for example, Ender IO is EnderIO). + - Must have either: modID + itemName or oreDictionary + - 'modID' is the identifier registered by the mod with Forge (for example vanilla blocks use 'minecraft' while Ender IO is 'EnderIO'). This value can be found in the details panel of Forge's 'mods' UI. - 'itemName' the name used to register the block/item with forge. To dump all registered items to config/modObjectsRegistery.txt include: - + @@ -65,9 +63,10 @@ being crafted for each 4 inputs processed by the SAG Mill. Examples: - - - + + + + --> @@ -195,7 +194,7 @@ - + @@ -224,7 +223,7 @@ - + @@ -273,79 +272,80 @@ - + - - + + - + - + - - - - + + + + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + + - + @@ -353,29 +353,10 @@ - - - - - - - - - - - - - - - - - - - - - + + @@ -384,8 +365,8 @@ - - + + @@ -509,7 +490,7 @@ - + @@ -599,22 +580,11 @@ - - - - - - - - - - - - + - + @@ -625,8 +595,8 @@ - - + + @@ -652,7 +622,7 @@ - + @@ -661,7 +631,7 @@ - + @@ -670,7 +640,7 @@ - + diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 52b46094..b57ae0d3 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -36,6 +36,8 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.enderio.conduit.render.ItemConduitRenderer; import crazypants.enderio.enderface.EnderIoRenderer; import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.farm.BlockFarmStation; +import crazypants.enderio.farm.FarmingStationRenderer; import crazypants.enderio.item.PoweredItemRenderer; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; @@ -120,6 +122,9 @@ public class ClientProxy extends CommonProxy { BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); + BlockFarmStation.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new FarmingStationRenderer()); + BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); CombustionGeneratorRenderer cr = new CombustionGeneratorRenderer(); RenderingRegistry.registerBlockHandler(cr); diff --git a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java index 52ec4bb8..7bd3a4e4 100644 --- a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.generator; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -23,9 +22,6 @@ public class BlockCombustionGenerator extends AbstractMachineBlock