Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Renamed filter to imprint

Browse source
This commit is contained in:
Henry Mao 2012-12-30 00:03:05 +08:00
parent 56a9ff0add
commit e12c9231e2
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/assemblyline/language/en_US.properties
View file

@ -15,5 +15,5 @@ tile.manipulator.name=Manipulator
tile.rejector.name=Rejector tile.rejector.name=Rejector
# Items # Items
item.filter.name=Filter item.imprint.name=Imprint
item.blueprint.name=Blueprint item.blueprint.name=Blueprint

14
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -14,7 +14,7 @@ import universalelectricity.prefab.UETab;
import universalelectricity.prefab.UpdateNotifier; import universalelectricity.prefab.UpdateNotifier;
import universalelectricity.prefab.network.PacketManager; import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.block.BlockCrate; import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.BlockEngineerTable; import assemblyline.common.block.BlockEncoder;
import assemblyline.common.block.ItemBlockCrate; import assemblyline.common.block.ItemBlockCrate;
import assemblyline.common.machine.BlockManipulator; import assemblyline.common.machine.BlockManipulator;
import assemblyline.common.machine.belt.BlockConveyorBelt; import assemblyline.common.machine.belt.BlockConveyorBelt;
@ -64,14 +64,14 @@ public class AssemblyLine
public static Block blockConveyorBelt; public static Block blockConveyorBelt;
public static Block blockManipulator; public static Block blockManipulator;
public static Block blockEngineerTable; public static Block blockEncoder;
public static Block blockCrate; public static Block blockCrate;
public static Block blockImprinter; public static Block blockImprinter;
public static Block blockDetector; public static Block blockDetector;
public static Block blockRejector; public static Block blockRejector;
public static final int ITEM_ID_PREFIX = 3030; public static final int ITEM_ID_PREFIX = 3030;
public static Item itemFilter; public static Item itemImprint;
@PreInit @PreInit
public void preInit(FMLPreInitializationEvent event) public void preInit(FMLPreInitializationEvent event)
@ -82,20 +82,20 @@ public class AssemblyLine
CONFIGURATION.load(); CONFIGURATION.load();
blockConveyorBelt = new BlockConveyorBelt(CONFIGURATION.getBlock("Conveyor Belt", BLOCK_ID_PREFIX).getInt()); blockConveyorBelt = new BlockConveyorBelt(CONFIGURATION.getBlock("Conveyor Belt", BLOCK_ID_PREFIX).getInt());
blockManipulator = new BlockManipulator(CONFIGURATION.getBlock("Manipulator", BLOCK_ID_PREFIX + 1).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); blockCrate = new BlockCrate(CONFIGURATION.getBlock("Crate", BLOCK_ID_PREFIX + 3).getInt(), 0);
blockImprinter = new BlockImprinter(CONFIGURATION.getBlock("Imprinter", BLOCK_ID_PREFIX + 4).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); blockDetector = new BlockDetector(CONFIGURATION.getBlock("Detector", BLOCK_ID_PREFIX + 5).getInt(), 1);
blockRejector = new BlockRejector(CONFIGURATION.getBlock("Rejector", BLOCK_ID_PREFIX + 6).getInt()); 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(); CONFIGURATION.save();
NetworkRegistry.instance().registerGuiHandler(this, this.proxy); NetworkRegistry.instance().registerGuiHandler(this, this.proxy);
GameRegistry.registerBlock(blockConveyorBelt, "Conveyor Belt"); GameRegistry.registerBlock(blockConveyorBelt, "Conveyor Belt");
GameRegistry.registerBlock(blockCrate, ItemBlockCrate.class, "Crate"); GameRegistry.registerBlock(blockCrate, ItemBlockCrate.class, "Crate");
GameRegistry.registerBlock(blockManipulator, "Manipulator"); GameRegistry.registerBlock(blockManipulator, "Manipulator");
// GameRegistry.registerBlock(blockEngineerTable, "Engineer's Table"); // GameRegistry.registerBlock(blockEngineerTable, "Encoder");
GameRegistry.registerBlock(blockImprinter, "Imprinter"); GameRegistry.registerBlock(blockImprinter, "Imprinter");
GameRegistry.registerBlock(blockDetector, "Detector"); GameRegistry.registerBlock(blockDetector, "Detector");
GameRegistry.registerBlock(blockRejector, "Rejector"); GameRegistry.registerBlock(blockRejector, "Rejector");
@ -113,7 +113,7 @@ public class AssemblyLine
System.out.println(NAME + " Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " languages."); System.out.println(NAME + " Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " languages.");
// Filter // 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 // 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) })); 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) }));

4
src/minecraft/assemblyline/common/block/BlockEngineerTable.java → src/minecraft/assemblyline/common/block/BlockEncoder.java
View file

@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import universalelectricity.prefab.UETab; 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); super(par1, Material.wood);
this.blockIndexInTexture = 59; this.blockIndexInTexture = 59;

3
src/minecraft/assemblyline/common/machine/filter/ItemImprinter.java
View file

@ -3,14 +3,13 @@ package assemblyline.common.machine.filter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import assemblyline.common.AssemblyLine;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import universalelectricity.prefab.UETab; import universalelectricity.prefab.UETab;
import assemblyline.common.AssemblyLine;
public class ItemImprinter extends Item public class ItemImprinter extends Item
{ {

2
src/minecraft/assemblyline/common/machine/filter/SlotFilter.java
View file

@ -15,7 +15,7 @@ public class SlotFilter extends Slot
public boolean isItemValid(ItemStack itemStack) public boolean isItemValid(ItemStack itemStack)
{ {
return itemStack.itemID == AssemblyLine.itemFilter.shiftedIndex; return itemStack.itemID == AssemblyLine.itemImprint.shiftedIndex;
} }
} }