Skip to content

Commit

Permalink
Finish up by adding the recipes and locale
Browse files Browse the repository at this point in the history
  • Loading branch information
Victorious3 committed Nov 12, 2015
1 parent 3e43f8f commit d52e79c
Show file tree
Hide file tree
Showing 11 changed files with 187 additions and 176 deletions.
10 changes: 7 additions & 3 deletions src/main/java/moe/nightfall/vic/integratedcircuits/Recipes.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package moe.nightfall.vic.integratedcircuits;

import codechicken.microblock.ItemMicroPart;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistry;
import moe.nightfall.vic.integratedcircuits.item.recipe.RecipeCircuit;
import moe.nightfall.vic.integratedcircuits.item.recipe.RecipeDyeable;
import net.minecraft.init.Blocks;
Expand All @@ -9,9 +12,6 @@
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import codechicken.microblock.ItemMicroPart;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistry;

public class Recipes {
public static void loadRecipes() {
Expand Down Expand Up @@ -112,6 +112,10 @@ public static void loadRecipes() {
's', Blocks.stone,
'p', Content.itemPCBChip);

GameRegistry.addRecipe(new ItemStack(Content.blockPrinter), "iii", "#d#", "sps",

'i', Items.iron_ingot, '#', Blocks.piston, 's', Blocks.stone, 'p', Content.itemPCBChip);

GameRegistry.addRecipe(new ItemStack(Content.itemFloppyDisk),
"iii",
"i#i",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ public void onRenderTick(RenderTickEvent event) {
@SubscribeEvent
public void onRenderInItemFrame(final RenderItemInFrameEvent event) throws Exception {
if (event.item.getItem() == Content.itemPCBPrint) {

if (!textures.containsKey(event.item)) {
TextureRenderer.Entry entry = new TextureRenderer.Entry() {
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package moe.nightfall.vic.integratedcircuits.compat;

import codechicken.nei.NEIClientConfig;
import codechicken.nei.api.API;
import moe.nightfall.vic.integratedcircuits.Content;
import moe.nightfall.vic.integratedcircuits.IntegratedCircuits;
import net.minecraft.item.ItemStack;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.api.API;

public class NEIAddon {
public void initialize() {
API.hideItem(new ItemStack(Content.blockSocket));
API.hideItem(new ItemStack(Content.itemPCBPrint));
}

public static void hideGUI(boolean hide) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

import java.util.List;

import com.mojang.realmsclient.gui.ChatFormatting;

import moe.nightfall.vic.integratedcircuits.Config;
import moe.nightfall.vic.integratedcircuits.misc.MiscUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;

import com.mojang.realmsclient.gui.ChatFormatting;

import net.minecraft.util.StatCollector;

public class ItemFloppyDisk extends ItemBase {
Expand All @@ -23,19 +22,21 @@ public void addInformation(ItemStack stack, EntityPlayer player, List itemInform
NBTTagCompound comp = stack.getTagCompound();
if (comp != null && comp.hasKey("circuit")) {
comp = comp.getCompoundTag("circuit");
Integer size = comp.getInteger("size");
itemInformation.add(ChatFormatting.GRAY
+ StatCollector.translateToLocalFormatted(getUnlocalizedName() + ".tooltip.name",
ChatFormatting.WHITE + comp.getCompoundTag("properties").getString("name")));
itemInformation.add(ChatFormatting.GRAY
+ StatCollector.translateToLocalFormatted(getUnlocalizedName() + ".tooltip.size", ""
+ ChatFormatting.WHITE + size + "x" + size));
itemInformation.add(ChatFormatting.GRAY
+ StatCollector.translateToLocalFormatted(getUnlocalizedName() + ".tooltip.author",
ChatFormatting.WHITE + comp.getCompoundTag("properties").getString("author")));
addInformation(comp, itemInformation, true);
} else if (Config.enableTooltips) {
itemInformation.addAll(MiscUtils.appendToAll(ChatFormatting.GRAY + "" + ChatFormatting.ITALIC,
MiscUtils.splitTranslateToLocalFormatted(getUnlocalizedName() + ".tooltip.info")));
MiscUtils.splitTranslateToLocalFormatted("circuit.tooltip.info")));
}
}

public static void addInformation(NBTTagCompound comp, List itemInformation, boolean author) {
int size = comp.getInteger("size");
itemInformation.add(ChatFormatting.GRAY + StatCollector.translateToLocalFormatted("circuit.tooltip.name",
ChatFormatting.WHITE + comp.getCompoundTag("properties").getString("name")));
itemInformation.add(ChatFormatting.GRAY + StatCollector.translateToLocalFormatted("circuit.tooltip.size",
"" + ChatFormatting.WHITE + size + "x" + size));
if (author)
itemInformation.add(ChatFormatting.GRAY + StatCollector.translateToLocalFormatted("circuit.tooltip.author",
ChatFormatting.WHITE + comp.getCompoundTag("properties").getString("author")));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;

import com.mojang.realmsclient.gui.ChatFormatting;

public class ItemPCB extends ItemBase {
public ItemPCB() {
super("pcb");
Expand All @@ -21,10 +19,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List itemInform
NBTTagCompound comp = stack.getTagCompound();
if (comp != null && comp.hasKey("circuit")) {
comp = comp.getCompoundTag("circuit");
int size = comp.getInteger("size");
itemInformation.add(ChatFormatting.GRAY + "Name: " + ChatFormatting.WHITE
+ comp.getCompoundTag("properties").getString("name"));
itemInformation.add(ChatFormatting.GRAY + "Size: " + ChatFormatting.WHITE + size + "x" + size);
ItemFloppyDisk.addInformation(comp, itemInformation, false);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.util.List;

import com.mojang.realmsclient.gui.ChatFormatting;

import moe.nightfall.vic.integratedcircuits.Content;
import moe.nightfall.vic.integratedcircuits.cp.CircuitData;
import net.minecraft.entity.Entity;
Expand All @@ -22,7 +24,7 @@ public static ItemStack create(CircuitData cdata) {
}

public ItemPCBPrint() {
ItemBase.register(this, "bcp_print");
ItemBase.register(this, "pcb_print");
this.setCreativeTab(null);
this.setMaxStackSize(1);
}
Expand Down Expand Up @@ -58,7 +60,12 @@ public void onCreated(ItemStack stack, World world, EntityPlayer player) {
}

@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par5) {

public void addInformation(ItemStack stack, EntityPlayer player, List itemInformation, boolean par5) {
NBTTagCompound comp = stack.getTagCompound();
if (comp != null) {
ItemFloppyDisk.addInformation(comp, itemInformation, false);
} else {
itemInformation.add(ChatFormatting.RED + "Kill me...");
}
}
}
8 changes: 4 additions & 4 deletions src/main/resources/assets/integratedcircuits/lang/PT_BR.lang
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ itemGroup.integratedcircuits.ctab=Circuitos Integrados
tooltip.integratedcircuits.socket=Você tem que levar um ferro de solda%npara soldar para um soquete

# Item tooltips
item.integratedcircuits.floppy.tooltip.name=Nome: %s
item.integratedcircuits.floppy.tooltip.size=Tamanho: %s
item.integratedcircuits.floppy.tooltip.author=Autor: %s
item.integratedcircuits.floppy.tooltip.info=Clique com o botao direito no drive(A barra preta)%nna parte de baixo do montador CAD...
circuit.tooltip.name=Nome: %s
circuit.tooltip.size=Tamanho: %s
circuit.tooltip.author=Autor: %s
circuit.tooltip.info=Clique com o botao direito no drive(A barra preta)%nna parte de baixo do montador CAD...

# Forge Direction
fdirection.north.name=NORTE
Expand Down
12 changes: 8 additions & 4 deletions src/main/resources/assets/integratedcircuits/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ item.integratedcircuits.laser.name=Laser
item.integratedcircuits.pcb.name=Raw Circuit Board
item.integratedcircuits.pcb.printed.name=Printed Circuit Board
item.integratedcircuits.pcb_chip.name=Circuit Board
item.integratedcircuits.pcb_print.name=Circuit Blueprint
item.integratedcircuits.silicon.name=Silicon
item.integratedcircuits.silicon_drop.name=Silicon Drop
item.integratedcircuits.coalcompound.name=Sandy Coal Compound
Expand All @@ -19,6 +20,7 @@ item.integratedcircuits.circuit.name=Integrated Circuit (%s)
# blocks
tile.integratedcircuits.pcblayoutcad.name=PCB Layout CAD
tile.integratedcircuits.assembler.name=Assembler
tile.integratedcircuits.pcbprinter.name=Printer

# parts
part.integratedcircuits.iobit.name=IOBit
Expand Down Expand Up @@ -101,6 +103,8 @@ gui.integratedcircuits.cad.simulation.pause=Pause
gui.integratedcircuits.cad.simulation.play=Play
gui.integratedcircuits.cad.simulation.step=Step

gui.integratedcircuits.cad.print=Print

gui.integratedcircuits.assembler.statuscode.2=Out of Materials!
gui.integratedcircuits.assembler.statuscode.3=Out of PCBs!

Expand Down Expand Up @@ -164,10 +168,10 @@ itemGroup.integratedcircuits.ctab=Integrated Circuits
tooltip.integratedcircuits.socket=You have to carry a soldering iron%nto solder onto a socket

# Item tooltips
item.integratedcircuits.floppy.tooltip.name=Name: %s
item.integratedcircuits.floppy.tooltip.size=Size: %s
item.integratedcircuits.floppy.tooltip.author=Author: %s
item.integratedcircuits.floppy.tooltip.info=Right click on the drive (the black bar)%non the bottom of the assembler or CAD...
circuit.tooltip.name=Name: %s
circuit.tooltip.size=Size: %s
circuit.tooltip.author=Author: %s
circuit.tooltip.info=Right click on the drive (the black bar)%non the bottom of the assembler or CAD...

# Forge Direction
fdirection.north.name=NORTH
Expand Down
Loading

1 comment on commit d52e79c

@skyem123
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears that your git client has somehow messed up the encoding of the Russian language files.

Please sign in to comment.