small graphical update (tooltips adjusted) to provide clearance

+ made tooltips on EMT solars coherent
+ added the real output power of the Essentia Gens to the tooltip
+ updated the de_DE.lang
+ version number increase

Signed-off-by: bartimaeusnek <[email protected]>
This commit is contained in:
bartimaeusnek committed 2018-12-14 18:53:15 +01:00
1 parent cddada359b
commit 980df8516a
4 files changed
+44 -23

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
package_group=emt
mc_version=1.7.10
forge_version=10.13.4.1614
mod_version=1.2.7.4
mod_version=1.2.7.5
mod_name=ElectroMagicTools
@@ -2,6 +2,7 @@ package emt.item.block;
import java.util.List;
import gregtech.api.enums.GT_Values;
import org.lwjgl.input.Keyboard;
import emt.util.EMTConfigHandler;
@@ -54,38 +55,48 @@ public class ItemBlockEssentiaGenerators extends ItemBlock {
return meta;
}
private long getOutputAmperage(double EU) {
return (long) (1L + (EU / 20.0D / 20.0D / GT_Values.V[2]));
}
@Override
public void addInformation(ItemStack is, EntityPlayer player, List list, boolean flag) {
if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
switch (is.getItemDamage()) {
case 0:
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Generating")+EMTTextHelper.LIGHT_GRAY+Integer.toString((int)(EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag())/20/20)) +" EU/t");
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Output")+EMTTextHelper.LIGHT_GRAY+"128 EU/t @ "+getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag()))+" A");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.ENERGY.getTag()))) +" EU");
break;
case 1:
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Generating")+EMTTextHelper.LIGHT_GRAY+Integer.toString((int)(EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag())/20/20)) +" EU/t");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))) +" EU");
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Output")+EMTTextHelper.LIGHT_GRAY+"128 EU/t @ "+getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))+" A");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))) +" EU");
break;
case 2:
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Generating")+EMTTextHelper.LIGHT_GRAY+Integer.toString((int)(EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag())/20/20)) +" EU/t");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag()))) +" EU");
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Output")+EMTTextHelper.LIGHT_GRAY+"128 EU/t @ "+getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag()))+" A");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AURA.getTag()))) +" EU");
break;
case 3:
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Generating")+EMTTextHelper.LIGHT_GRAY+Integer.toString((int)(EMTEssentiasOutputs.outputs.get(Aspect.TREE.getTag())/20/20)) +" EU/t");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))) +" EU");
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Output")+EMTTextHelper.LIGHT_GRAY+"128 EU/t @ "+getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.TREE.getTag()))+" A");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.FIRE.getTag()))) +" EU");
break;
case 4:
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Generating")+EMTTextHelper.LIGHT_GRAY+Integer.toString((int)(EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag())/20/20)) +" EU/t");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag()))) +" EU");
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Output")+EMTTextHelper.LIGHT_GRAY+"128 EU/t @ "+getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag()))+" A");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.AIR.getTag()))) +" EU");
break;
case 5:
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Generating")+EMTTextHelper.LIGHT_GRAY+Integer.toString((int)(EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag())/20/20)) +" EU/t");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag()))) +" EU");
list.add(EMTTextHelper.BRIGHT_BLUE+StatCollector.translateToLocal("emt.Output")+EMTTextHelper.LIGHT_GRAY+"128 EU/t @ "+getOutputAmperage(EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag()))+" A");
list.add(EMTTextHelper.BRIGHT_GREEN+StatCollector.translateToLocal("gui.EMT.book.aspect.output.essentia.eu")+": "+EMTTextHelper.LIGHT_GRAY+Double.toString((EMTEssentiasOutputs.outputs.get(Aspect.GREED.getTag()))) +" EU");
break;
default:
@@ -177,35 +177,35 @@ public class ItemBlockSolars extends ItemBlock {
}
case 6: {//dark
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
break;
}
case 7: {
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
break;
}
case 8: {
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
break;
}
case 9: {//ordo
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
break;
}
case 10: {
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
break;
}
case 11: {
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + (2F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.day"));
list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + (0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night"));
break;
}
case 12: {//fire
+15 -5
View File
@@ -11,8 +11,8 @@ gui.EMT.wandRecharge.title=Industrie Stab-Auflade-Station
gui.EMT.inventory=Inventar
gui.EMT.book.aspect.output.eu.title=Essentia Ausgabe Buch
gui.EMT.book.aspect.output.essentia.eu=EU Leistung per Essentia
gui.EMT.key.unequip=Unequip
emt.Output=Leistung:
gui.EMT.key.unequip=Ausziehen
emt.Output=Ausgabe:
emt.Storage=Speicher:
emt.PressShift=<Drücke SHIFT>
emt.Generating=Erzeugt:
@@ -33,13 +33,14 @@ tooltip.EMT.euPerTick=EU/t
tooltip.EMT.night=bei Nacht
tooltip.EMT.forget=Habe ich einen tooltip vergessen?
tooltip.EMT.raining=während des Regens.
tooltip.EMT.thunder=während eines Gewitters
tooltip.EMT.output.triple=Leistung mit 3 multipliziert
tooltip.EMT.output.double=Leistung mit 2 multipliziert
tooltip.EMT.output.double.half=Leistung mit 2.5 multipliziert
tooltip.EMT.output.double.nether=wenn es im Nether steht
tooltip.EMT.output.double.lava=wenn darüber Lava ist
tooltip.EMT.output.double.half.height=wenn der Block über Y = 160 ist
tooltip.EMT.output.double.half.low=wenn der Block unter Y = 10 ist
tooltip.EMT.output.double.lava=wenn mit Ignis Centivis befüllt
tooltip.EMT.output.double.half.height=höhere Leistung in Höhen (x1 bei y=5, x3 bei y=220)
tooltip.EMT.output.double.half.low=höhere Leistung in Tiefen (x1 bei y=220, x3 bei y=5)
#=============Entity Names=============
entity.EMT.laser.name=Laser
@@ -134,6 +135,15 @@ tile.EMT.solar2.earth.name=Erde Infundierte Verdichte Solarzelle
tile.EMT.solar2.doubleearth.name=Erde Infundierte Doppelt Verdichte Solarzelle
tile.EMT.solar2.tripleearth.name=Erde Infundierte Dreifach Verdichte Solarzelle
#===============Gregtech Compat===============
EMT_GTBLOCK_CASEING.0.name=Magie Zurückhaltender Strahlenschutz
EMT_GTBLOCK_CASEING.1.name=Essenz Diffusions Zelle
EMT_GTBLOCK_CASEING.2.name=Iridium Osmiridium Bewehrungskorb
EMT_GTBLOCK_CASEING.3.name=Indium Tungsten Bewehrungskorb
EMT_GTBLOCK_CASEING.4.name=Halb-Fertiger Magie Zurückhaltender Strahlenschutz
EMT_GTBLOCK_CASEING.5.name=Halb-Fertige Essenz Diffusions Zelle
#=============Thaumonomicon Texts=============
emt.rsname.Electric Magic Tools=Electric Magic Tools
emt.tag.Electric Magic Tools=Who says magic and technology can't go together?