From e12c9231e2e9ad51d461314903dea8e3491577aa Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Sun, 30 Dec 2012 00:03:05 +0800 Subject: [PATCH] Renamed filter to imprint --- resources/assemblyline/language/en_US.properties | 2 +- .../assemblyline/common/AssemblyLine.java | 14 +++++++------- .../{BlockEngineerTable.java => BlockEncoder.java} | 4 ++-- .../common/machine/filter/ItemImprinter.java | 3 +-- .../common/machine/filter/SlotFilter.java | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) rename src/minecraft/assemblyline/common/block/{BlockEngineerTable.java => BlockEncoder.java} (92%) diff --git a/resources/assemblyline/language/en_US.properties b/resources/assemblyline/language/en_US.properties index c1fd3cd9..829a09c1 100644 --- a/resources/assemblyline/language/en_US.properties +++ b/resources/assemblyline/language/en_US.properties @@ -15,5 +15,5 @@ tile.manipulator.name=Manipulator tile.rejector.name=Rejector # Items -item.filter.name=Filter +item.imprint.name=Imprint item.blueprint.name=Blueprint \ No newline at end of file diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index 87a92ff1..b747ccc1 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -14,7 +14,7 @@ import universalelectricity.prefab.UETab; import universalelectricity.prefab.UpdateNotifier; import universalelectricity.prefab.network.PacketManager; import assemblyline.common.block.BlockCrate; -import assemblyline.common.block.BlockEngineerTable; +import assemblyline.common.block.BlockEncoder; import assemblyline.common.block.ItemBlockCrate; import assemblyline.common.machine.BlockManipulator; import assemblyline.common.machine.belt.BlockConveyorBelt; @@ -64,14 +64,14 @@ public class AssemblyLine public static Block blockConveyorBelt; public static Block blockManipulator; - public static Block blockEngineerTable; + public static Block blockEncoder; public static Block blockCrate; public static Block blockImprinter; public static Block blockDetector; public static Block blockRejector; public static final int ITEM_ID_PREFIX = 3030; - public static Item itemFilter; + public static Item itemImprint; @PreInit public void preInit(FMLPreInitializationEvent event) @@ -82,20 +82,20 @@ public class AssemblyLine CONFIGURATION.load(); blockConveyorBelt = new BlockConveyorBelt(CONFIGURATION.getBlock("Conveyor Belt", BLOCK_ID_PREFIX).getInt()); blockManipulator = new BlockManipulator(CONFIGURATION.getBlock("Manipulator", BLOCK_ID_PREFIX + 1).getInt()); - blockEngineerTable = new BlockEngineerTable(CONFIGURATION.getBlock("Architect's Table", BLOCK_ID_PREFIX + 2).getInt()); + blockEncoder = new BlockEncoder(CONFIGURATION.getBlock("Encoder", BLOCK_ID_PREFIX + 2).getInt()); blockCrate = new BlockCrate(CONFIGURATION.getBlock("Crate", BLOCK_ID_PREFIX + 3).getInt(), 0); blockImprinter = new BlockImprinter(CONFIGURATION.getBlock("Imprinter", BLOCK_ID_PREFIX + 4).getInt(), 0); blockDetector = new BlockDetector(CONFIGURATION.getBlock("Detector", BLOCK_ID_PREFIX + 5).getInt(), 1); blockRejector = new BlockRejector(CONFIGURATION.getBlock("Rejector", BLOCK_ID_PREFIX + 6).getInt()); - itemFilter = new ItemImprinter(CONFIGURATION.getBlock("Filter", ITEM_ID_PREFIX).getInt()); + itemImprint = new ItemImprinter(CONFIGURATION.getBlock("Imprint", ITEM_ID_PREFIX).getInt()); CONFIGURATION.save(); NetworkRegistry.instance().registerGuiHandler(this, this.proxy); GameRegistry.registerBlock(blockConveyorBelt, "Conveyor Belt"); GameRegistry.registerBlock(blockCrate, ItemBlockCrate.class, "Crate"); GameRegistry.registerBlock(blockManipulator, "Manipulator"); - // GameRegistry.registerBlock(blockEngineerTable, "Engineer's Table"); + // GameRegistry.registerBlock(blockEngineerTable, "Encoder"); GameRegistry.registerBlock(blockImprinter, "Imprinter"); GameRegistry.registerBlock(blockDetector, "Detector"); GameRegistry.registerBlock(blockRejector, "Rejector"); @@ -113,7 +113,7 @@ public class AssemblyLine System.out.println(NAME + " Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " languages."); // Filter - GameRegistry.addRecipe(new ShapedOreRecipe(itemFilter, new Object[] { "R", "P", "I", 'P', Item.paper, 'R', Item.redstone, 'I', new ItemStack(Item.dyePowder, 1, 0) })); + GameRegistry.addRecipe(new ShapedOreRecipe(itemImprint, new Object[] { "R", "P", "I", 'P', Item.paper, 'R', Item.redstone, 'I', new ItemStack(Item.dyePowder, 1, 0) })); // Stamper GameRegistry.addRecipe(new ShapedOreRecipe(blockImprinter, new Object[] { "SIS", "SPS", "WWW", 'S', "ingotSteel", 'W', Block.wood, 'P', Block.pistonStickyBase, 'I', new ItemStack(Item.dyePowder, 1, 0) })); diff --git a/src/minecraft/assemblyline/common/block/BlockEngineerTable.java b/src/minecraft/assemblyline/common/block/BlockEncoder.java similarity index 92% rename from src/minecraft/assemblyline/common/block/BlockEngineerTable.java rename to src/minecraft/assemblyline/common/block/BlockEncoder.java index 3d2cbd4a..422b6427 100644 --- a/src/minecraft/assemblyline/common/block/BlockEngineerTable.java +++ b/src/minecraft/assemblyline/common/block/BlockEncoder.java @@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import universalelectricity.prefab.UETab; -public class BlockEngineerTable extends Block +public class BlockEncoder extends Block { - public BlockEngineerTable(int par1) + public BlockEncoder(int par1) { super(par1, Material.wood); this.blockIndexInTexture = 59; diff --git a/src/minecraft/assemblyline/common/machine/filter/ItemImprinter.java b/src/minecraft/assemblyline/common/machine/filter/ItemImprinter.java index 2b11eab5..2bd635c5 100644 --- a/src/minecraft/assemblyline/common/machine/filter/ItemImprinter.java +++ b/src/minecraft/assemblyline/common/machine/filter/ItemImprinter.java @@ -3,14 +3,13 @@ package assemblyline.common.machine.filter; import java.util.ArrayList; import java.util.List; -import assemblyline.common.AssemblyLine; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import universalelectricity.prefab.UETab; +import assemblyline.common.AssemblyLine; public class ItemImprinter extends Item { diff --git a/src/minecraft/assemblyline/common/machine/filter/SlotFilter.java b/src/minecraft/assemblyline/common/machine/filter/SlotFilter.java index 34fe85a7..3e78acb6 100644 --- a/src/minecraft/assemblyline/common/machine/filter/SlotFilter.java +++ b/src/minecraft/assemblyline/common/machine/filter/SlotFilter.java @@ -15,7 +15,7 @@ public class SlotFilter extends Slot public boolean isItemValid(ItemStack itemStack) { - return itemStack.itemID == AssemblyLine.itemFilter.shiftedIndex; + return itemStack.itemID == AssemblyLine.itemImprint.shiftedIndex; } }