aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2020-11-25 17:25:05 +0100
committerTec <daniel112092@gmail.com>2020-11-25 17:25:05 +0100
commit0304d1464f38ac75cf338ac470f1cc7228cd6d5c (patch)
tree810b83d3832035085a34b1521f87f94ce52582e7
parent7fc2f07281062f043aa958fe66efed42c48150a7 (diff)
downloadGT5-Unofficial-0304d1464f38ac75cf338ac470f1cc7228cd6d5c.tar.gz
GT5-Unofficial-0304d1464f38ac75cf338ac470f1cc7228cd6d5c.tar.bz2
GT5-Unofficial-0304d1464f38ac75cf338ac470f1cc7228cd6d5c.zip
Implement anti-laser target hatches!
https://www.livescience.com/anti-laser-wireless-charging.html
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java4
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang2
-rw-r--r--src/main/resources/assets/tectech/lang/zh_CN.lang2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 9af6d40df7..8abb027d3f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -1440,7 +1440,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
euVar = tHatch.maxEUOutput();
if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar &&
- aBaseMetaTileEntity.decreaseStoredEnergyUnits(euVar + Math.max(euVar >> 7, 1), false)) {
+ aBaseMetaTileEntity.decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, 1), false)) {
tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar);
}
}
@@ -1449,7 +1449,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
euVar = tHatch.maxEUOutput() * tHatch.Amperes;
if (tHatch.getBaseMetaTileEntity().getStoredEU() <= tHatch.maxEUStore() - euVar &&
- aBaseMetaTileEntity.decreaseStoredEnergyUnits(euVar + Math.max(euVar >> 7, tHatch.Amperes), false)) {
+ aBaseMetaTileEntity.decreaseStoredEnergyUnits(euVar + Math.max(euVar / 24576, tHatch.Amperes), false)) {
tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar);
}
}
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index dc4af9970b..b81b865b22 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -538,7 +538,7 @@ gt.blockmachines.multimachine.em.transformer.name=Active Transformer
gt.blockmachines.multimachine.em.transformer.hint=1 - Energy IO Hatches or High Power Casing
gt.blockmachines.multimachine.em.transformer.desc.0=Power substation
gt.blockmachines.multimachine.em.transformer.desc.1=All the transformation!
-gt.blockmachines.multimachine.em.transformer.desc.2=Only 0.78125% power loss, HAYO!
+gt.blockmachines.multimachine.em.transformer.desc.2=Only 0.004% power loss, HAYO!
gt.blockmachines.multimachine.tm.microwave.name=Microwave Grinder
gt.blockmachines.multimachine.tm.microwave.hint.0=1 - Classic Hatches or Clean Stainless Steel Casing
diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang
index 6aae89bb1b..cfa23fb88d 100644
--- a/src/main/resources/assets/tectech/lang/zh_CN.lang
+++ b/src/main/resources/assets/tectech/lang/zh_CN.lang
@@ -535,7 +535,7 @@ gt.blockmachines.multimachine.em.transformer.name=有源变压器
gt.blockmachines.multimachine.em.transformer.hint=1 - 能源仓、动力仓或超能机械方块
gt.blockmachines.multimachine.em.transformer.desc.0=变电站
gt.blockmachines.multimachine.em.transformer.desc.1=任意电压间的相互转换!
-gt.blockmachines.multimachine.em.transformer.desc.2=只有0.78125%的能量损失, HAYO!
+gt.blockmachines.multimachine.em.transformer.desc.2=只有0.004%的能量损失, HAYO!
gt.blockmachines.multimachine.tm.microwave.name=微波发生仪
gt.blockmachines.multimachine.tm.microwave.hint.0=1 - 基础仓室或洁净不锈钢机械方块