tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Resolved #433 - Added more localizations

Browse source
This commit is contained in:
Calclavia 2014-03-13 21:14:50 +08:00
parent 7ca7d6f570
commit 3f29f38449
12 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
archaic/src/main/java/resonantinduction/archaic/engineering/TileEngineeringTable.java
View file

@ -24,7 +24,6 @@ import org.apache.commons.lang3.ArrayUtils;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;
import resonantinduction.core.prefab.imprint.ItemImprint;
import resonantinduction.core.render.RenderItemOverlayTile;
import universalelectricity.api.vector.Vector2;

1
archaic/src/main/java/resonantinduction/archaic/filter/TileFilter.java
View file

@ -1,6 +1,5 @@
package resonantinduction.archaic.filter;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;

6
electrical/src/main/java/resonantinduction/electrical/Electrical.java
View file

@ -16,7 +16,6 @@ import resonantinduction.electrical.battery.BlockBattery;
import resonantinduction.electrical.battery.ItemBlockBattery;
import resonantinduction.electrical.battery.TileBattery;
import resonantinduction.electrical.charger.ItemCharger;
import resonantinduction.electrical.encoder.ItemDisk;
import resonantinduction.electrical.generator.BlockMotor;
import resonantinduction.electrical.generator.TileMotor;
import resonantinduction.electrical.generator.solar.BlockSolarPanel;
@ -115,7 +114,7 @@ public class Electrical
// blockArmbot = contentRegistry.createTile(BlockArmbot.lass, TileEncoder.clclass,
// TileArmbot.class);
// blockEncoder = contentRegistry.createTile(BlockEncoder.cass);
itemDisk = contentRegistry.createItem(ItemDisk.class);
// itemDisk = contentRegistry.createItem(ItemDisk.class);
itemInsulation = contentRegistry.createItem("insulation", ItemResourcePart.class);
// Generator
@ -165,7 +164,8 @@ public class Electrical
/** Multimeter */
GameRegistry.addRecipe(new ShapedOreRecipe(itemMultimeter, "WWW", "ICI", 'W', "wire", 'C', UniversalRecipe.BATTERY.get(), 'I', UniversalRecipe.PRIMARY_METAL.get()));
GameRegistry.addRecipe(new ShapedOreRecipe(itemDisk, "PPP", "RRR", "WWW", 'W', "wire", 'P', Item.paper, 'R', Item.redstone));
// GameRegistry.addRecipe(new ShapedOreRecipe(itemDisk, "PPP", "RRR", "WWW", 'W', "wire",
// 'P', Item.paper, 'R', Item.redstone));
/** Battery */
ItemStack tierOneBattery = ItemBlockBattery.setTier(new ItemStack(blockBattery, 1, 0), (byte) 0);

3
electrical/src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
View file

@ -33,7 +33,8 @@ public class ItemBlockBattery extends ItemBlock implements IEnergyItem, IVoltage
@Override
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4)
{
list.add("Tier: " + (getTier(itemStack) + 1));
list.add(LanguageUtility.getLocal("tooltip.tier") + ": " + (getTier(itemStack) + 1));
String color = "";
long joules = this.getEnergy(itemStack);

1
electrical/src/main/java/resonantinduction/electrical/wire/PartAdvancedWire.java
View file

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;

1
mechanical/src/main/java/resonantinduction/mechanical/logistic/rail/PartRailing.java
View file

@ -1,6 +1,5 @@
package resonantinduction.mechanical.logistic.rail;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;

5
src/main/java/resonantinduction/core/prefab/imprint/ItemImprint.java
View file

@ -5,7 +5,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import calclavia.lib.utility.nbt.NBTUtility;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
@ -18,6 +17,8 @@ import net.minecraft.nbt.NBTTagList;
import resonantinduction.core.Reference;
import resonantinduction.core.Settings;
import resonantinduction.core.TabRI;
import calclavia.lib.utility.LanguageUtility;
import calclavia.lib.utility.nbt.NBTUtility;
public class ItemImprint extends Item
{
@ -63,7 +64,7 @@ public class ItemImprint extends Item
}
else
{
list.add("No filters");
list.add(LanguageUtility.getLocal("tooltip.noImprint"));
}
}

1
src/main/java/resonantinduction/core/prefab/imprint/TileFilterable.java
View file

@ -7,7 +7,6 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.api.IFilterable;
import universalelectricity.api.vector.Vector3;

2
src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java
View file

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -13,7 +12,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition;
import resonantinduction.core.MultipartUtility;
import resonantinduction.electrical.Electrical;
import codechicken.lib.data.MCDataInput;
import codechicken.lib.data.MCDataOutput;

4
src/main/java/resonantinduction/core/resource/ResourceGenerator.java
View file

@ -153,7 +153,7 @@ public class ResourceGenerator implements IVirtualObject
fluidMolten.setViscosity(5000);
fluidMolten.setTemperature(273 + 1538);
FluidRegistry.registerFluid(fluidMolten);
LanguageRegistry.instance().addStringLocalization(fluidMolten.getUnlocalizedName(), "Molten " + localizedName);
LanguageRegistry.instance().addStringLocalization(fluidMolten.getUnlocalizedName(), LanguageUtility.getLocal("tooltip.molten") + " " + localizedName);
BlockFluidMaterial blockFluidMaterial = new BlockFluidMaterial(fluidMolten);
GameRegistry.registerBlock(blockFluidMaterial, "molten" + nameCaps);
ResonantInduction.blockMoltenFluid.put(getID(materialName), blockFluidMaterial);
@ -163,7 +163,7 @@ public class ResourceGenerator implements IVirtualObject
FluidColored fluidMixture = new FluidColored(materialNameToMixture(materialName));
FluidRegistry.registerFluid(fluidMixture);
BlockFluidMixture blockFluidMixture = new BlockFluidMixture(fluidMixture);
LanguageRegistry.instance().addStringLocalization(fluidMixture.getUnlocalizedName(), localizedName + " Mixture");
LanguageRegistry.instance().addStringLocalization(fluidMixture.getUnlocalizedName(), localizedName + " " + LanguageUtility.getLocal("tooltip.mixture"));
GameRegistry.registerBlock(blockFluidMixture, "mixture" + nameCaps);
ResonantInduction.blockMixtureFluids.put(getID(materialName), blockFluidMixture);
FluidContainerRegistry.registerFluidContainer(fluidMixture, ResonantInduction.itemBucketMixture.getStackFromMaterial(materialName));

1
src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java
View file

@ -14,7 +14,6 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event;
import net.minecraftforge.event.entity.player.FillBucketEvent;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.core.Reference;
import resonantinduction.core.TabRI;
import resonantinduction.core.resource.ItemOreResource;

2
src/main/resources/assets/resonantinduction/languages

@ -1 +1 @@
Subproject commit def05c696b12c72fd9e0d34d2e201ca695ef1ad9
Subproject commit 09738c5f87ec83d559c33492a440b0a666657663