diff --git a/src/minecraft/dark/assembly/common/machine/BlockAssembly.java b/src/minecraft/dark/assembly/common/machine/BlockAssembly.java index 1418be86..97b6601b 100644 --- a/src/minecraft/dark/assembly/common/machine/BlockAssembly.java +++ b/src/minecraft/dark/assembly/common/machine/BlockAssembly.java @@ -10,7 +10,7 @@ import dark.core.common.DMCreativeTab; import dark.core.prefab.machine.BlockMachine; import dark.core.registration.ModObjectRegistry.BlockBuildData; -public abstract class BlockAssembly extends BlockMachine +public class BlockAssembly extends BlockMachine { public Icon machine_icon; diff --git a/src/minecraft/dark/assembly/common/machine/belt/BlockConveyorBelt.java b/src/minecraft/dark/assembly/common/machine/belt/BlockConveyorBelt.java index a7f7bf40..f0430dde 100644 --- a/src/minecraft/dark/assembly/common/machine/belt/BlockConveyorBelt.java +++ b/src/minecraft/dark/assembly/common/machine/belt/BlockConveyorBelt.java @@ -20,10 +20,11 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.assembly.client.render.BlockRenderingHandler; import dark.assembly.common.machine.BlockAssembly; import dark.assembly.common.machine.belt.TileEntityConveyorBelt.SlantType; +import dark.core.common.DarkMain; import dark.core.registration.ModObjectRegistry.BlockBuildData; /** The block for the actual conveyor belt! - * + * * @author Calclavia, DarkGuardsman */ public class BlockConveyorBelt extends BlockAssembly { @@ -335,7 +336,7 @@ public class BlockConveyorBelt extends BlockAssembly @Override public int getRenderType() { - return BlockRenderingHandler.BLOCK_RENDER_ID; + return DarkMain.zeroRendering ? 0 : BlockRenderingHandler.BLOCK_RENDER_ID; } @Override diff --git a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java index ae0b16b1..f5059f88 100644 --- a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java @@ -18,10 +18,11 @@ import universalelectricity.prefab.tile.IRotatable; import dark.assembly.api.IBelt; import dark.assembly.common.AssemblyLine; import dark.assembly.common.machine.TileEntityAssembly; +import dark.core.common.DarkMain; import dark.core.network.PacketHandler; /** Conveyer belt TileEntity that allows entities of all kinds to be moved - * + * * @author DarkGuardsman */ public class TileEntityConveyorBelt extends TileEntityAssembly implements IPacketReceiver, IBelt, IRotatable { @@ -74,27 +75,29 @@ public class TileEntityConveyorBelt extends TileEntityAssembly implements IPacke { this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "mods.assemblyline.conveyor", 0.5f, 0.7f, true); } - - this.wheelRotation = (40 + this.wheelRotation) % 360; - - float wheelRotPct = wheelRotation / 360f; - - // Sync the animation. Slant belts are slower. - if (this.getSlant() == SlantType.NONE || this.getSlant() == SlantType.TOP) + if (!DarkMain.zeroAnimation) { - this.animFrame = (int) (wheelRotPct * MAX_FRAME); - if (this.animFrame < 0) - this.animFrame = 0; - if (this.animFrame > MAX_FRAME) - this.animFrame = MAX_FRAME; - } - else - { - this.animFrame = (int) (wheelRotPct * MAX_SLANT_FRAME); - if (this.animFrame < 0) - this.animFrame = 0; - if (this.animFrame > MAX_SLANT_FRAME) - this.animFrame = MAX_SLANT_FRAME; + this.wheelRotation = (40 + this.wheelRotation) % 360; + + float wheelRotPct = wheelRotation / 360f; + + // Sync the animation. Slant belts are slower. + if (this.getSlant() == SlantType.NONE || this.getSlant() == SlantType.TOP) + { + this.animFrame = (int) (wheelRotPct * MAX_FRAME); + if (this.animFrame < 0) + this.animFrame = 0; + if (this.animFrame > MAX_FRAME) + this.animFrame = MAX_FRAME; + } + else + { + this.animFrame = (int) (wheelRotPct * MAX_SLANT_FRAME); + if (this.animFrame < 0) + this.animFrame = 0; + if (this.animFrame > MAX_SLANT_FRAME) + this.animFrame = MAX_SLANT_FRAME; + } } } diff --git a/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java b/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java index 8823c0c9..41217c99 100644 --- a/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java +++ b/src/minecraft/dark/assembly/common/machine/processor/BlockProcessor.java @@ -14,7 +14,6 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.core.UniversalElectricity; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.ProcessorRecipes.ProcessorType; @@ -22,12 +21,11 @@ import dark.assembly.client.render.BlockRenderingHandler; import dark.assembly.common.AssemblyLine; import dark.assembly.common.CommonProxy; import dark.core.common.DMCreativeTab; -import dark.core.prefab.IExtraObjectInfo; import dark.core.prefab.helpers.Pair; import dark.core.prefab.machine.BlockMachine; import dark.core.registration.ModObjectRegistry.BlockBuildData; -public class BlockProcessor extends BlockMachine implements IExtraObjectInfo +public class BlockProcessor extends BlockMachine { public BlockProcessor() @@ -90,6 +88,7 @@ public class BlockProcessor extends BlockMachine implements IExtraObjectInfo @Override public void loadExtraConfigs(Configuration config) { + super.loadExtraConfigs(config); for (ProcessorData data : ProcessorData.values()) { data.enabled = config.get(data.unlocalizedName, "Enabled", true).getBoolean(true);