aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author‭huajijam <strhuaji@gmail.com>2019-02-24 11:50:58 +0800
committer‭huajijam <strhuaji@gmail.com>2019-02-24 11:50:58 +0800
commitbc8be3c0c7542ce9ddc0e73d717a1f3b8697deed (patch)
tree65d038a56c5cf53d4f1e91ecd6f3382f41e09e6f
parent60625fd517ee221c804a22629fce0d3153c7559b (diff)
parentcd83af0ce1e38dd75d9661ae1ae708f990c179e3 (diff)
downloadGT5-Unofficial-bc8be3c0c7542ce9ddc0e73d717a1f3b8697deed.tar.gz
GT5-Unofficial-bc8be3c0c7542ce9ddc0e73d717a1f3b8697deed.tar.bz2
GT5-Unofficial-bc8be3c0c7542ce9ddc0e73d717a1f3b8697deed.zip
Automatic synchronization
Former-commit-id: 59b4b4e5dc131913cd21c6eb90e1480b03708512
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/ClientEventHandler.java10
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_LESU.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java11
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java8
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabModule.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java19
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java9
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java19
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/LoaderRegistry.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java7
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java20
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java27
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java25
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java28
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java32
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java19
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_AcidGenerator.java7
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java17
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java7
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java7
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java9
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java7
-rw-r--r--src/main/resources/assets/bartworks/lang/de_DE.lang143
-rw-r--r--src/main/resources/assets/bartworks/lang/en_US.lang93
-rw-r--r--src/main/resources/assets/bartworks/lang/fr_FR.lang144
33 files changed, 544 insertions, 169 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/ClientEventHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/ClientEventHandler.java
index 377632c4ba..79f3cf387e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/ClientEventHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/ClientEventHandler.java
@@ -33,6 +33,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.GT_Values;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
+import net.minecraft.util.StatCollector;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import java.util.HashMap;
@@ -54,9 +55,14 @@ public class ClientEventHandler {
final HashMap<BioVatLogicAdder.BlockMetaPair, Byte> GLASSMAP = BioVatLogicAdder.BioVatGlass.getGlassMap();
if (GLASSMAP.containsKey(PAIR)) {
int tier = GLASSMAP.get(PAIR);
- event.toolTip.add("Glass-Tier: " + BW_Util.getColorForTier(tier) + GT_Values.VN[tier] + ChatColorHelper.RESET);
+ event.toolTip.add(
+ StatCollector.translateToLocal("tooltip.glas.0.name")+
+ " "
+ + BW_Util.getColorForTier(tier) + GT_Values.VN[tier] + ChatColorHelper.RESET);
} else if (BLOCK.getMaterial().equals(Material.glass)) {
- event.toolTip.add("Glass-Tier: " + BW_Util.getColorForTier(3) + GT_Values.VN[3] + ChatColorHelper.RESET);
+ event.toolTip.add(StatCollector.translateToLocal("tooltip.glas.0.name")+
+ " "
+ + BW_Util.getColorForTier(3) + GT_Values.VN[3] + ChatColorHelper.RESET);
}
}
} \ No newline at end of file
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_LESU.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_LESU.java
index 8b96ba44fb..336c9fab92 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_LESU.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_LESU.java
@@ -33,6 +33,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import java.awt.*;
@@ -61,10 +62,10 @@ public class GT_GUIContainer_LESU extends GT_GUIContainer {
this.drawString(this.fontRendererObj, "EU/t OUT: " + String.valueOf(this.mContainer.mOutput), 11, 40, 16448255);
this.drawString(this.fontRendererObj, "AMP/t IN/OUT: " + String.valueOf(c.getBaseMetaTileEntity().getInputAmperage()), 11, 48, 16448255);
if (c.maxEUStore() >= Long.MAX_VALUE - 1) {
- this.drawString(this.fontRendererObj, "Maximum Capacity!", 11, 56, Color.YELLOW.getRGB());
+ this.drawString(this.fontRendererObj, StatCollector.translateToLocal("tooltip.LESU.0.name"), 11, 56, Color.YELLOW.getRGB());
}
if (!this.c.getBaseMetaTileEntity().isActive()) {
- this.drawString(this.fontRendererObj, "Multiple Controllers!", 11, 56, Color.RED.getRGB());
+ this.drawString(this.fontRendererObj, StatCollector.translateToLocal("tooltip.LESU.1.name"), 11, 56, Color.RED.getRGB());
}
}
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java
index 8386ebb857..c9286aec26 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java
@@ -37,6 +37,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
import java.util.List;
@@ -66,7 +67,7 @@ public class BW_ItemBlocks extends ItemBlock {
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList, final boolean aF3_H) {
if (this.field_150939_a instanceof BW_GlasBlocks)
- aList.add("Glass-Tier: " + BW_Util.getColorForTier(BW_Util.getTierFromGlasMeta(aStack.getItemDamage())) + GT_Values.VN[BW_Util.getTierFromGlasMeta(aStack.getItemDamage())]);
+ aList.add(StatCollector.translateToLocal("tooltip.glas.0.name") +" " + BW_Util.getColorForTier(BW_Util.getTierFromGlasMeta(aStack.getItemDamage())) + GT_Values.VN[BW_Util.getTierFromGlasMeta(aStack.getItemDamage())]);
if (this.field_150939_a instanceof ITileAddsInformation) {
for (int i = 0; i < ((ITileAddsInformation) this.field_150939_a).getInfoData().length; i++) {
aList.add(((ITileAddsInformation) this.field_150939_a).getInfoData()[i]);
@@ -75,7 +76,8 @@ public class BW_ItemBlocks extends ItemBlock {
aList.add(this.mNoMobsToolTip);
if (!(this.field_150939_a instanceof ITileEntityProvider))
aList.add(this.mNoTileEntityToolTip);
- aList.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+
+ aList.add(StatCollector.translateToLocal("tooltip.bw.0.name")+ ChatColorHelper.DARKGREEN + " BartWorks");
}
@Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java
index d4184dfc08..66ff1725de 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java
@@ -32,6 +32,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import java.util.List;
@@ -55,9 +56,9 @@ public class BW_SimpleWindMeter extends Item {
@Override
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean p_77624_4_) {
super.addInformation(itemStack, entityPlayer, list, p_77624_4_);
- list.add("A simple Windmeter to choose a place for the Windmill.");
- list.add("Uses left: " + (this.getMaxDamage() - this.getDamage(itemStack)) + "/" + this.getMaxDamage());
- list.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+ list.add(StatCollector.translateToLocal("tooltip.windmeter.0.name"));
+ list.add(StatCollector.translateToLocal("tooltip.windmeter.1.name")+" " + (this.getMaxDamage() - this.getDamage(itemStack)) + "/" + this.getMaxDamage());
+ list.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
}
@Override
@@ -66,8 +67,8 @@ public class BW_SimpleWindMeter extends Item {
return itemStack;
float windStrength = (float) WorldData.get(world).windSim.getWindAt(entityPlayer.posY);
- String windS = windStrength < 1f ? "non existant" : windStrength < 10f ? "pretty low" : windStrength < 20f ? "common" : windStrength < 30f ? "rather strong" : windStrength < 50f ? "very strong" : "too strong";
- entityPlayer.addChatMessage(new ChatComponentText("The wind here seems to be " + windS + "."));
+ String windS = windStrength < 1f ? StatCollector.translateToLocal("tooltip.windmeter.2.name") : windStrength < 10f ? StatCollector.translateToLocal("tooltip.windmeter.3.name") : windStrength < 20f ? StatCollector.translateToLocal("tooltip.windmeter.4.name") : windStrength < 30f ? StatCollector.translateToLocal("tooltip.windmeter.5.name") : windStrength < 50f ? StatCollector.translateToLocal("tooltip.windmeter.6.name") : StatCollector.translateToLocal("tooltip.windmeter.7.name");
+ entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("tooltip.windmeter.8.name")+" " + windS + "."));
itemStack.damageItem(1, entityPlayer);
return itemStack;
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java
index cbe4ce0b23..71d9b0886f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java
@@ -76,13 +76,13 @@ public class BW_Stonage_Rotors extends Item implements IKineticRotor {
} else if (Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator) {
type = WIND;
}
- info.add("Diameter: " + this.DiaMinMax[0]);
- info.add("Durability: " + (this.getMaxDamage() - this.getDamage(itemStack)) + "/" + this.getMaxDamage());
- info.add("Efficiency: " + this.eff);
+ info.add(StatCollector.translateToLocal("tooltip.rotor.0.name")+" " + this.DiaMinMax[0]);
+ info.add(StatCollector.translateToLocal("tooltip.rotor.1.name")+" " + (this.getMaxDamage() - this.getDamage(itemStack)) + "/" + this.getMaxDamage());
+ info.add(StatCollector.translateToLocal("tooltip.rotor.2.name")+" " + this.eff);
if (type != null) {
info.add(StatCollector.translateToLocal(("ic2.itemrotor.fitsin." + this.isAcceptedType(itemStack, type))));
}
- info.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+ info.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
}
@Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
index 6f8fe09229..621394d199 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java
@@ -35,6 +35,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import java.util.List;
@@ -53,8 +54,8 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
super.addInformation(aStack, aPlayer, aList, aF3_H);
if (aStack != null && aStack.getTagCompound() != null)
- aList.add("Has Circuit inside? " + (aStack.getTagCompound().getBoolean("HasChip") ? "Yes" : "No"));
- aList.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+ aList.add(StatCollector.translateToLocal("tooltip.cp.0.name")+" " + (aStack.getTagCompound().getBoolean("HasChip") ? StatCollector.translateToLocal("tooltip.bw.yes.name") : StatCollector.translateToLocal("tooltip.bw.no.name")));
+ aList.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
}
@Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java
index 04fa57efdd..9d06a3e752 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java
@@ -30,6 +30,7 @@ import gregtech.api.items.GT_Generic_Item;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import java.util.List;
@@ -47,7 +48,7 @@ public class GT_Destructopack_Item extends GT_Generic_Item {
@Override
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
super.addInformation(aStack, aPlayer, aList, aF3_H);
- aList.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+ aList.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
}
@Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java
index 38873cd04a..bcca88531f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java
@@ -43,6 +43,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemTool;
import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import java.util.HashSet;
@@ -74,8 +75,8 @@ public class GT_Rockcutter_Item extends ItemTool implements IElectricItem {
}
public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList, final boolean aF3_H) {
- aList.add("Tier: " + GT_Values.VN[this.mTier]);
- aList.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+ aList.add(StatCollector.translateToLocal("tooltip.bw.tier.name") +" " + GT_Values.VN[this.mTier]);
+ aList.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
}
public void onUpdate(ItemStack aStack, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java
index de59f9cec0..4a25b7e951 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java
@@ -39,6 +39,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemTool;
import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
import java.util.List;
import java.util.Set;
@@ -65,8 +66,8 @@ public class GT_Teslastaff_Item extends ItemTool implements IElectricItem {
@Override
public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList, final boolean aF3_H) {
- aList.add("No warranty!");
- aList.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+ aList.add(StatCollector.translateToLocal("tooltip.teslastaff.0.name"));
+ aList.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
}
public boolean hitEntity(ItemStack aStack, EntityLivingBase aTarget, EntityLivingBase aPlayer) {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabModule.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabModule.java
index 9f18e6c457..640fca0014 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabModule.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabModule.java
@@ -25,6 +25,7 @@ package com.github.bartimaeusnek.bartworks.common.items;
import com.github.bartimaeusnek.bartworks.MainMod;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
import java.util.List;
@@ -40,7 +41,7 @@ public class LabModule extends SimpleSubItemClass {
@Override
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
- aList.add("A Module used to change the BioLab's working Mode");
+ aList.add(StatCollector.translateToLocal("tooltip.labmodule.0.name"));
super.addInformation(p_77624_1_, p_77624_2_, aList, p_77624_4_);
}
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java
index 67c1222a28..4ae906c96e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java
@@ -31,6 +31,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
import java.util.List;
@@ -78,19 +79,19 @@ public class LabParts extends SimpleSubItemClass {
if (itemStack.getTagCompound() == null) {
switch (itemStack.getItemDamage()) {
case 0:
- list.add("An empty Sterilized Petri Dish.");
+ list.add(StatCollector.translateToLocal("tooltip.labparts.0.name"));
break;
case 1:
- list.add("An empty DNA Flask.");
+ list.add(StatCollector.translateToLocal("tooltip.labparts.1.name"));
break;
case 2:
- list.add("An empty Plasmid Cell.");
+ list.add(StatCollector.translateToLocal("tooltip.labparts.2.name"));
break;
case 3:
- list.add("A special washing power for Bio Engineering.");
+ list.add(StatCollector.translateToLocal("tooltip.labparts.3.name"));
break;
case 4:
- list.add("A powder for the separation of DNA by electrophoresis.");
+ list.add(StatCollector.translateToLocal("tooltip.labparts.4.name"));
break;
default:
break;
@@ -102,16 +103,16 @@ public class LabParts extends SimpleSubItemClass {
switch (itemStack.getItemDamage()) {
case 0:
- list.add("A Petri Dish containing: " + itemStack.getTagCompound().getString("Name"));
+ list.add(StatCollector.translateToLocal("tooltip.labparts.5.name")+" " + itemStack.getTagCompound().getString("Name"));
if (!itemStack.getTagCompound().getBoolean("Breedable")) {
- list.add("This is a weak culture, it can not be bred in the Bacterial Vat");
+ list.add(StatCollector.translateToLocal("tooltip.labparts.6.name"));
}
break;
case 1:
- list.add("A DNA Flask containing: " + itemStack.getTagCompound().getString("Name"));
+ list.add(StatCollector.translateToLocal("tooltip.labparts.7.name")+" " + itemStack.getTagCompound().getString("Name"));
break;
case 2:
- list.add("A Plasmid Cell containing: " + itemStack.getTagCompound().getString("Name"));
+ list.add(StatCollector.translateToLocal("tooltip.labparts.8.name")+" "+ itemStack.getTagCompound().getString("Name"));
break;
default:
break;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java
index d2c2e17478..c4abbe95b9 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java
@@ -32,6 +32,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
import java.util.List;
@@ -58,7 +59,7 @@ public class SimpleSubItemClass extends Item {
@Override
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
super.addInformation(p_77624_1_, p_77624_2_, aList, p_77624_4_);
- aList.add("Added by" + ChatColorHelper.DARKGREEN + " BartWorks");
+ aList.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
}
@Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
index c0480e2970..00546d6453 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java
@@ -40,6 +40,7 @@ import gregtech.api.util.GT_Utility;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -131,7 +132,7 @@ public class BioRecipeLoader extends RecipeLoader {
}
);
- if (Loader.isModLoaded("croploadcore"))
+ if (Loader.isModLoaded("croploadcore") && OreDictionary.getOres("cropVine").size() > 1)
for (int i = 0; i < OreDictionary.getOres("cropVine").size(); i++) {
GT_Values.RA.addExtractorRecipe(OreDictionary.getOres("cropVine").get(i).splitStack(12), BioItemList.getOther(1), 500, BW_Util.getMachineVoltageFromTier(3));
}
@@ -157,8 +158,8 @@ public class BioRecipeLoader extends RecipeLoader {
Materials[] circuits = {Materials.Advanced, Materials.Data, Materials.Elite, Materials.Master, Materials.Ultimate, Materials.Superconductor};
for (int i = 3; i < GT_Values.VN.length; i++) {
//12625
- BioLab[(i - 3)] = new GT_MetaTileEntity_BioLab(ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, GT_Values.VN[i] + " Bio Lab", GT_Values.VN[i] + " Bio Lab", i, "The BioLab, a Multi-Use Bioengineering Station").getStackForm(1L);
- RadioHatch[(i - 3)] = new GT_MetaTileEntity_RadioHatch(ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, GT_Values.VN[i] + " Radio Hatch", GT_Values.VN[i] + " Radio Hatch", i).getStackForm(1L);
+ BioLab[(i - 3)] = new GT_MetaTileEntity_BioLab(ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, "bw.biolab"+GT_Values.VN[i], GT_Values.VN[i] + " "+StatCollector.translateToLocal("tile.biolab.name"), i).getStackForm(1L);
+ RadioHatch[(i - 3)] = new GT_MetaTileEntity_RadioHatch(ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i ,"bw.radiohatch"+ GT_Values.VN[i], GT_Values.VN[i] + " "+StatCollector.translateToLocal("tile.radiohatch.name"), i).getStackForm(1L);
try {
ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L);
GT_ModHandler.addCraftingRecipe(
@@ -194,7 +195,7 @@ public class BioRecipeLoader extends RecipeLoader {
}
}
GT_ModHandler.addCraftingRecipe(
- new GT_TileEntity_BioVat(ConfigHandler.IDOffset + GT_Values.VN.length * 7, "BioVat", "BioVat").getStackForm(1L),
+ new GT_TileEntity_BioVat(ConfigHandler.IDOffset + GT_Values.VN.length * 7, "bw.biovat", StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L),
RecipeLoader.BITSD,
new Object[]{
"GCG",
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
index 5cf42736b6..bdfe5c9850 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
@@ -47,6 +47,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
import static com.github.bartimaeusnek.bartworks.MainMod.BWT;
import static com.github.bartimaeusnek.bartworks.MainMod.GT2;
@@ -146,20 +147,20 @@ public class ItemRegistry {
GameRegistry.registerItem(WINDMETER, "BW_SimpleWindMeter");
for (int i = 0; i < GT_Values.VN.length; i++) {
- ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, "Cable Diode 2A " + GT_Values.VN[i], "Cable Diode 2A " + GT_Values.VN[i], i).getStackForm(1L);
- ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, "Cable Diode 4A " + GT_Values.VN[i], "Cable Diode 4A " + GT_Values.VN[i], i).getStackForm(1L);
- ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, "Cable Diode 8A " + GT_Values.VN[i], "Cable Diode 8A " + GT_Values.VN[i], i).getStackForm(1L);
- ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, "Cable Diode 12A " + GT_Values.VN[i], "Cable Diode 12A " + GT_Values.VN[i], i).getStackForm(1L);
- ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, "Cable Diode 16A " + GT_Values.VN[i], "Cable Diode 16A " + GT_Values.VN[i], i).getStackForm(1L);
- ItemRegistry.energyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor(ConfigHandler.IDOffset + 1 + i, "Energy Distributor " + GT_Values.VN[i], "Energy Distributor " + GT_Values.VN[i], i, "Splits Amperage into several Sides").getStackForm(1L);
+ ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, "diode"+"2A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name")+" 2A " + GT_Values.VN[i], i).getStackForm(1L);
+ ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, "diode"+"4A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name")+" 4A " + GT_Values.VN[i], i).getStackForm(1L);
+ ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, "diode"+"8A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name")+" 8A " + GT_Values.VN[i], i).getStackForm(1L);
+ ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, "diode"+"12A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name")+" 12A " + GT_Values.VN[i], i).getStackForm(1L);
+ ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode(ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, "diode"+"16A" + GT_Values.VN[i], StatCollec