From 4659fcf404ae2d51c2ba5f6eab8fdab76c02df4e Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Wed, 25 Sep 2013 16:37:41 -0400 Subject: [PATCH] Auto-Sync --- .../al/textures/blocks/imprinter_top.png | Bin 4612 -> 4549 bytes .../client/render/RenderProcessor.java | 2 +- .../machine/processor/BlockProcessor.java | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/assets/al/textures/blocks/imprinter_top.png b/resources/assets/al/textures/blocks/imprinter_top.png index 8c3cab6cd548e48bdb2a390ac18274bc2573783f..29097637d43a7e1820414c59ee5b5b38aee60f81 100644 GIT binary patch delta 4531 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 delta 4595 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 diff --git a/src/minecraft/dark/assembly/client/render/RenderProcessor.java b/src/minecraft/dark/assembly/client/render/RenderProcessor.java index ec14e197c..73073d22e 100644 --- a/src/minecraft/dark/assembly/client/render/RenderProcessor.java +++ b/src/minecraft/dark/assembly/client/render/RenderProcessor.java @@ -76,7 +76,7 @@ public class RenderProcessor extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) + public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8) { if (tileEntity instanceof TileEntityProcessor) this.renderAModelAt((TileEntityProcessor) tileEntity, var2, var4, var6, var8); diff --git a/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java b/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java index 32b1a677b..02bbd5a71 100644 --- a/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java +++ b/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java @@ -3,8 +3,6 @@ package dark.assembly.common.machine.processor; import java.util.List; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,6 +13,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.core.UniversalElectricity; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly;