aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2019-08-31 03:00:03 +0100
committerBass <tudurap.com@gmail.com>2019-08-31 03:00:03 +0100
commit77a23fbedcc7d9799475a382c92e2cb6cad02e24 (patch)
treedb1622f48a5d6aad24ea5bb356175225a28094fd /src
parent9002ca978f851fce53f81773ba290a82fea0f027 (diff)
downloadGT5-Unofficial-77a23fbedcc7d9799475a382c92e2cb6cad02e24.tar.gz
GT5-Unofficial-77a23fbedcc7d9799475a382c92e2cb6cad02e24.tar.bz2
GT5-Unofficial-77a23fbedcc7d9799475a382c92e2cb6cad02e24.zip
Lang continued
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java22
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java56
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java106
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang39
4 files changed, 151 insertions, 72 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index 8e0cf294f3..2b0b0f8465 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -283,13 +283,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
if (base_EM.isMaster()) {
double mode = p.get();
if (mode == FUSE_MODE) {
- return "Mode: Fuse";
+ return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.0");//Mode: Fuse
} else if (mode == COLLIDE_MODE) {
- return "Mode: Collide";
+ return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.1");//Mode: Collide
}
- return "Mode: Undefined";
+ return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.2");//Mode: Undefined
}
- return "Currently Slaves...";
+ return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.3");//Currently Slaves...
};
//endregion
@@ -338,11 +338,11 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
private static final byte[] blockMetaFallback = new byte[]{0, 4, 4, 4};
private static final String[] description = new String[]{
EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
- "1 - Classic Hatches or High Power Casing",
- "2 - Elemental Input Hatches or Molecular Casing",
- "3 - Elemental Output Hatches or Molecular Casing",
- "4 - Elemental Overflow Hatches or Molecular Casing",
- "General - Another Controller facing opposite direction",
+ translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing
+ translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"),//2 - Elemental Input Hatches or Molecular Casing
+ translateToLocal("gt.blockmachines.multimachine.em.collider.hint.2"),//3 - Elemental Output Hatches or Molecular Casing
+ translateToLocal("gt.blockmachines.multimachine.em.collider.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing
+ translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction
};
//endregion
@@ -573,8 +573,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
public String[] getDescription() {
return new String[]{
CommonValues.TEC_MARK_EM,
- "Collide matter at extreme velocities.",
- EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Faster than light*!!!"
+ translateToLocal("gt.blockmachines.multimachine.em.collider.desc.0"),//Collide matter at extreme velocities.
+ EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.collider.desc.1")//Faster than light*!!!
};
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
index 0690a30b8b..5b1c54695c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
@@ -22,12 +22,15 @@ import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.util.EnumChatFormatting;
+import org.apache.commons.lang3.reflect.FieldUtils;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -43,6 +46,7 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE
import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine;
import static gregtech.api.enums.GT_Values.E;
import static net.minecraft.util.StatCollector.translateToLocal;
+import static net.minecraft.util.StatCollector.translateToLocalFormatted;
/**
* Created by danie_000 on 17.12.2016.
@@ -55,6 +59,10 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
private String machineType;
private ItemStack holdItem;
private long computationRemaining, computationRequired;
+
+ private static LinkedHashMap<String, String> lServerNames;
+
+ private String clientLocale = "en_US";
//endregion
//region structure
@@ -75,8 +83,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
private static final byte[] blockMetaFallback = new byte[]{1, 0};
private static final String[] description = new String[]{
EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
- "1 - Classic/Data Hatches or Computer casing",
- "2 - Holder Hatch",
+ translateToLocal("gt.blockmachines.multimachine.em.research.hint.0"),//1 - Classic/Data Hatches or Computer casing
+ translateToLocal("gt.blockmachines.multimachine.em.research.hint.1"),//2 - Holder Hatch
};
//endregion
@@ -119,8 +127,6 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
tNBT.setTag("pages", tNBTList);
}
- private static LinkedHashMap<String, String> lServerNames;
-
static {
try {
Class GT_Assemblyline_Server = Class.forName("gregtech.api.util.GT_Assemblyline_Server");
@@ -339,8 +345,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
public String[] getDescription() {
return new String[]{
CommonValues.TEC_MARK_EM,
- "Philosophers didn't even...",
- EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "dream about it!"
+ translateToLocal("gt.blockmachines.multimachine.em.research.desc.0"),//Philosophers didn't even...
+ EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.research.desc.0")//dream about it!
};
}
@@ -362,20 +368,20 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
}
return new String[]{
- "Energy Hatches:",
+ translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":",
EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU",
- (mEUt <= 0 ? "Probably uses: " : "Probably makes: ") +
- EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t at " +
+ (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") +
+ EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t " + translateToLocalFormatted("tt.keyword.at", clientLocale) + " " +
EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A",
- "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
- " Amp Rating: " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
- "Problems: " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
- " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
- "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
- " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid,
- "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET,
- "Computation Remaining:",
+ translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
+ " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
+ translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
+ " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
+ translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
+ " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid,
+ translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET,
+ translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":",
EnumChatFormatting.GREEN + Long.toString(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " +
EnumChatFormatting.YELLOW + computationRequired / 20L
};
@@ -520,6 +526,22 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
}
@Override
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+ if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) {
+ try {
+ EntityPlayerMP player = (EntityPlayerMP) aPlayer;
+ clientLocale = (String) FieldUtils.readField(player, "translator", true);
+ } catch (Exception e) {
+ clientLocale = "en_US";
+ }
+ } else {
+ return true;
+ }
+ System.out.println(clientLocale);
+ return true;
+ }
+
+ @Override
public int getInventoryStackLimit() {
return 1;
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 20ba5eb57f..51d49b3653 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -23,11 +23,14 @@ import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Recipe;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.ForgeDirection;
+import org.apache.commons.lang3.reflect.FieldUtils;
import static com.github.technus.tectech.CommonValues.V;
import static com.github.technus.tectech.CommonValues.VN;
@@ -41,6 +44,7 @@ import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBloc
import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting.crafter;
import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine;
import static net.minecraft.util.StatCollector.translateToLocal;
+import static net.minecraft.util.StatCollector.translateToLocalFormatted;
/**
* Created by danie_000 on 17.12.2016.
@@ -56,8 +60,10 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
private cElementalDefinitionStack objectResearched;
private cElementalInstanceStackMap objectsScanned;
private String machineType;
- private long totalComputationRemaining, totalComputationRequired;
+ private long computationRemaining, computationRequired;
private int[] scanComplexity;
+
+ private String clientLocale = "en_US";
//endregion
//region structure
@@ -139,56 +145,56 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
private void addComputationRequirements(int depthPlus, int capabilities) {
if (areBitsSet(SCAN_GET_NOMENCLATURE, capabilities)) {
- totalComputationRequired += depthPlus * 5L;
+ computationRequired += depthPlus * 5L;
eRequiredData += depthPlus;
}
if (areBitsSet(SCAN_GET_DEPTH_LEVEL, capabilities)) {
- totalComputationRequired += depthPlus * 10L;
+ computationRequired += depthPlus * 10L;
eRequiredData += depthPlus;
}
if (areBitsSet(SCAN_GET_AMOUNT, capabilities)) {
- totalComputationRequired += depthPlus * 64L;
+ computationRequired += depthPlus * 64L;
eRequiredData += depthPlus * 8L;
}
if (areBitsSet(SCAN_GET_CHARGE, capabilities)) {
- totalComputationRequired += depthPlus * 128L;
+ computationRequired += depthPlus * 128L;
eRequiredData += depthPlus * 4L;
}
if (areBitsSet(SCAN_GET_MASS, capabilities)) {
- totalComputationRequired += depthPlus * 256L;
+ computationRequired += depthPlus * 256L;
eRequiredData += depthPlus * 4L;
}
if (areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) {
- totalComputationRequired += depthPlus * 512L;
+ computationRequired += depthPlus * 512L;
eRequiredData += depthPlus * 16L;
}
if (areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
- totalComputationRequired += depthPlus * 1024L;
+ computationRequired += depthPlus * 1024L;
eRequiredData += depthPlus * 32L;
}
if (areBitsSet(SCAN_GET_ENERGY_STATES, capabilities)) {
- totalComputationRequired += depthPlus * 2048L;
+ computationRequired += depthPlus * 2048L;
eRequiredData += depthPlus * 32L;
}
if (areBitsSet(SCAN_GET_COLOR, capabilities)) {
- totalComputationRequired += depthPlus * 1024L;
+ computationRequired += depthPlus * 1024L;
eRequiredData += depthPlus * 48L;
}
if (areBitsSet(SCAN_GET_AGE, capabilities)) {
- totalComputationRequired += depthPlus * 2048L;
+ computationRequired += depthPlus * 2048L;
eRequiredData += depthPlus * 64L;
}
if (areBitsSet(SCAN_GET_TIMESPAN_MULT, capabilities)) {
- totalComputationRequired += depthPlus * 2048L;
+ computationRequired += depthPlus * 2048L;
eRequiredData += depthPlus * 64L;
}
@@ -238,7 +244,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
researchEM.remove(stackEM.definition);
}
if (eRecipe != null && scannerRecipe != null) {//todo make sure it werks
- totalComputationRequired = totalComputationRemaining = scannerRecipe.mDuration * 20L;
+ computationRequired = computationRemaining = scannerRecipe.mDuration * 20L;
mMaxProgresstime = 20;//const
mEfficiencyIncrease = 10000;
eRequiredData = (short) (scannerRecipe.mSpecialValue >>> 16);
@@ -253,7 +259,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
objectsScanned = researchEM.takeAllToNewMap();
cleanMassEM_EM(objectsScanned.getMass());
- totalComputationRequired = 0;
+ computationRequired = 0;
eRequiredData = 0;
eAmpereFlow = objectsScanned.size() + TecTech.RANDOM.next(objectsScanned.size());
mEUt = -(int) V[8];
@@ -279,7 +285,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
System.arraycopy(scanComplexityTemp, 0, scanComplexity, 0, maxDepth);
}
- totalComputationRemaining = totalComputationRequired *= 20;
+ computationRemaining = computationRequired *= 20;
mMaxProgresstime = 20;//const
mEfficiencyIncrease = 10000;
quantumStuff(true);
@@ -289,7 +295,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
}
quantumStuff(false);
objectResearched = null;
- totalComputationRemaining = 0;
+ computationRemaining = 0;
return false;
}
@@ -307,7 +313,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
ElementalDefinitionScanStorage_EM.setContent(mInventory[1], objectsScanned, scanComplexity);
}
objectResearched = null;
- totalComputationRemaining = 0;
+ computationRemaining = 0;
quantumStuff(false);
}
@@ -315,8 +321,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
public String[] getDescription() {
return new String[]{
CommonValues.TEC_MARK_EM,
- "",//What is existing here?
- EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + ""//I HAVE NO IDEA (yet)!
+ translateToLocal("gt.blockmachines.multimachine.em.scanner.desc.0"),//What is existing here?
+ EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.scanner.desc.1")//I HAVE NO IDEA (yet)!
};
}
@@ -338,22 +344,22 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
}
return new String[]{
- "Energy Hatches:",
+ translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":",
EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU",
- (mEUt <= 0 ? "Probably uses: " : "Probably makes: ") +
- EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t at " +
+ (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") +
+ EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t " + translateToLocalFormatted("tt.keyword.at", clientLocale) + " " +
EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A",
- "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
- " Amp Rating: " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
- "Problems: " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
- " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
- "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
- " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid,
- "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET,
- "Computation Remaining:",
- EnumChatFormatting.GREEN + Long.toString(totalComputationRemaining / 20L) + EnumChatFormatting.RESET + " / " +
- EnumChatFormatting.YELLOW + totalComputationRequired / 20L
+ translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
+ " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
+ translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
+ " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
+ translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
+ " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid,
+ translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET,
+ translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":",
+ EnumChatFormatting.GREEN + Long.toString(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " +
+ EnumChatFormatting.YELLOW + computationRequired / 20L
};
}
@@ -376,8 +382,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
@Override
public void saveNBTData(NBTTagCompound aNBT) {
super.saveNBTData(aNBT);
- aNBT.setLong("eComputationRemaining", totalComputationRemaining);
- aNBT.setLong("eComputationRequired", totalComputationRequired);
+ aNBT.setLong("eComputationRemaining", computationRemaining);
+ aNBT.setLong("eComputationRequired", computationRequired);
if (objectResearched != null) {
aNBT.setTag("eObject", objectResearched.toNBT());
} else {
@@ -398,8 +404,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
@Override
public void loadNBTData(NBTTagCompound aNBT) {
super.loadNBTData(aNBT);
- totalComputationRemaining = aNBT.getLong("eComputationRemaining");
- totalComputationRequired = aNBT.getLong("eComputationRequired");
+ computationRemaining = aNBT.getLong("eComputationRemaining");
+ computationRequired = aNBT.getLong("eComputationRequired");
if (aNBT.hasKey("eObject")) {
objectResearched = cElementalDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject"));
if (objectResearched.definition == nbtE__) {
@@ -426,7 +432,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
public void stopMachine() {
quantumStuff(false);
super.stopMachine();
- totalComputationRequired = totalComputationRemaining = 0;
+ computationRequired = computationRemaining = 0;
objectResearched = null;
}
@@ -434,7 +440,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
@Override
public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) {
if (aBaseMetaTileEntity.isServerSide()) {
- if (totalComputationRemaining > 0 && objectResearched != null) {
+ if (computationRemaining > 0 && objectResearched != null) {
eRecipe = null;
if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) {
eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition);
@@ -451,7 +457,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
quantumStuff(false);
objectResearched = null;
eRequiredData = 0;
- totalComputationRequired = totalComputationRemaining = 0;
+ computationRequired = computationRemaining = 0;
mMaxProgresstime = 0;
mEfficiencyIncrease = 0;
} else {
@@ -463,18 +469,34 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
@Override
public boolean onRunningTick(ItemStack aStack) {
- if (totalComputationRemaining <= 0) {
- totalComputationRemaining = 0;
+ if (computationRemaining <= 0) {
+ computationRemaining = 0;
mProgresstime = mMaxProgresstime;
return true;
} else {
- totalComputationRemaining -= eAvailableData;
+ computationRemaining -= eAvailableData;
mProgresstime = 1;
return super.onRunningTick(aStack);
}
}
@Override
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+ if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) {
+ try {
+ EntityPlayerMP player = (EntityPlayerMP) aPlayer;
+ clientLocale = (String) FieldUtils.readField(player, "translator", true);
+ } catch (Exception e) {
+ clientLocale = "en_US";
+ }
+ } else {
+ return true;
+ }
+ System.out.println(clientLocale);
+ return true;
+ }
+
+ @Override
public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
if (aBaseMetaTileEntity.isActive() && (aTick & 0x2) == 0 && aBaseMetaTileEntity.isClientSide()) {
int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 4 + aBaseMetaTileEntity.getXCoord();
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index b9e7b21e4f..c1ba86678c 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -324,6 +324,7 @@ gt.blockmachines.emout.tier.11.name=UIV Elemental Output Hatch
gt.blockmachines.emout.tier.12.name=UMV Elemental Output Hatch
gt.blockmachines.emout.tier.13.name=UXV Elemental Output Hatch
gt.blockmachines.emout.desc=Elemental Output for Multiblocks
+
#Multiblocks
gt.blockmachines.multimachine.em.transformer.name=Active Transformer
gt.blockmachines.multimachine.em.transformer.hint=1 - Energy IO Hatches or High Power Casing
@@ -433,8 +434,23 @@ gt.blockmachines.multimachine.em.scanner.desc.0=What is existing here?
gt.blockmachines.multimachine.em.scanner.desc.1=I HAVE NO IDEA (yet)!
gt.blockmachines.multimachine.em.research.name=Research station
+gt.blockmachines.multimachine.em.research.hint.0=1 - Classic/Data Hatches or Computer casing
+gt.blockmachines.multimachine.em.research.hint.1=2 - Holder Hatch
+gt.blockmachines.multimachine.em.research.desc.0=Philosophers didn't even...
+gt.blockmachines.multimachine.em.research.desc.1=dream about it!
gt.blockmachines.multimachine.em.collider.name=Matter Collider
+gt.blockmachines.multimachine.em.collider.hint.0=1 - Classic Hatches or High Power Casing
+gt.blockmachines.multimachine.em.collider.hint.1=2 - Elemental Input Hatches or Molecular Casing
+gt.blockmachines.multimachine.em.collider.hint.2=3 - Elemental Output Hatches or Molecular Casing
+gt.blockmachines.multimachine.em.collider.hint.3=4 - Elemental Overflow Hatches or Molecular Casing
+gt.blockmachines.multimachine.em.collider.hint.4=General - Another Controller facing opposite direction
+gt.blockmachines.multimachine.em.collider.desc.0=Collide matter at extreme velocities.
+gt.blockmachines.multimachine.em.collider.desc.1=Faster than light*!!!
+gt.blockmachines.multimachine.em.collider.mode.0=Mode: Fuse
+gt.blockmachines.multimachine.em.collider.mode.1=Mode: Collide
+gt.blockmachines.multimachine.em.collider.mode.2=Mode: Undefined
+gt.blockmachines.multimachine.em.collider.mode.3=Currently Slaves...
gt.blockmachines.multimachine.em.infuser.name=Energy Infuser
@@ -452,8 +468,12 @@ gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator
gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator
-
#Keywords and phrases
+#Example: ID:3
+tt.keyword.ID=ID
+#Example: 32EU at 1A
+tt.keyword.at=at
+#These are Thaumcraft aspects
tt.keyword.Air=Air
tt.keyword.Earth=Earth
tt.keyword.Fire=Fire
@@ -468,20 +488,35 @@ tt.keyword.CHARGE=CHARGE
tt.keyword.COLORLESS=COLORLESS
tt.keyword.MASS=MASS
tt.keyword.BOOM=BOOM!
-tt.keyword.ID=ID
tt.keyword.Destination=Destination
tt.keyword.Weight=Weight
tt.keyword.Source=Source
+#Problemns as in maintanance issues
+tt.keyword.Problems=Problems
+tt.keyword.Efficiency=Efficiency
+#Button that allows to pass power to other machines
+tt.keyword.PowerPass=PowerPass
+#Button that vents EM
+tt.keyword.SafeVoid=SafeVoid
tt.keyphrase.LIFE_TIME=LIFE TIME
tt.keyphrase.CARRIES_COLOR=CARRIES COLOR
tt.keyphrase.Hint_Details=Hint Details
tt.keyphrase.At_current_energy_level=At current energy level
+#Used when 0 Elemental Matter Stacks
tt.keyphrase.No_Stacks=No Stacks
tt.keyphrase.Contains_EM=Contains EM
tt.keyphrase.Contained_mass=Contained mass
tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed
tt.keyphrase.Muffler_BOOM=Muffler BOOM!
+tt.keyphrase.Energy_Hatches=Energy Hatches
+tt.keyphrase.Probably_uses=Probably uses
+tt.keyphrase.Probably_makes=Probably makes
+tt.keyphrase.Tier_Rating=Tier Rating
+tt.keyphrase.Amp_Rating=Amp Rating
+tt.keyphrase.Computation_Available=Computation Available
+tt.keyphrase.Computation_Remaining=Computation Remaining
+
#OpenTurrets compatibility
tile.turretHeadEM.name=Elemental Matter Turret
tile.turretBaseEM.name=Elemental Turret Base \ No newline at end of file