aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2019-08-25 16:45:20 +0100
committerBass <tudurap.com@gmail.com>2019-08-25 16:45:20 +0100
commit29ca5bf60833827aea03eea8dcda6c40f2e1383b (patch)
tree1e37c28a952bd1b827238a39970813c9f8261c99 /src/main/java/com
parentd633c17a949aef4328eeb5cf4f74354864fcba23 (diff)
downloadGT5-Unofficial-29ca5bf60833827aea03eea8dcda6c40f2e1383b.tar.gz
GT5-Unofficial-29ca5bf60833827aea03eea8dcda6c40f2e1383b.tar.bz2
GT5-Unofficial-29ca5bf60833827aea03eea8dcda6c40f2e1383b.zip
More Lang
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java7
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java41
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java9
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java15
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java26
6 files changed, 51 insertions, 49 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index 6f6d4865fc..ececaa70dc 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -157,7 +157,6 @@ public class MachineLoader implements Runnable {
eM_energyMulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
15128, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L));
-
// ===================================================================================================
// Multi AMP Laser INPUTS
// ===================================================================================================
@@ -303,7 +302,6 @@ public class MachineLoader implements Runnable {
// Multi AMP Power OUTPUTS
// ===================================================================================================
-
eM_dynamoMulti4_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo Hatch", 5, 4).getStackForm(1L));
eM_dynamoMulti16_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
index 1ba4854b62..81ad00ea06 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
@@ -8,6 +8,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
import static com.github.technus.tectech.CommonValues.V;
import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
@@ -19,9 +20,9 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch
public final int Amperes;
public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
- super(aID, aName, aNameRegional, aTier, 0, "Multiple Ampere Energy Extractor for Multiblocks");
+ super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0"));//Multiple Ampere Energy Extractor for Multiblocks
Amperes = aAmp;
- Util.setTier(aTier,this);
+ Util.setTier(aTier, this);
}
public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
@@ -117,4 +118,4 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch
//"Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A"
};
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
index 2e1a62f46d..95bb0bc60d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
@@ -12,6 +12,7 @@ import gregtech.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
import static com.github.technus.tectech.CommonValues.TRANSFER_AT;
import static com.github.technus.tectech.CommonValues.V;
@@ -22,8 +23,8 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_
*/
public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatch_DynamoMulti implements IConnectsToEnergyTunnel {
public GT_MetaTileEntity_Hatch_DynamoTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
- super(aID, aName, aNameRegional, aTier, 0, "Energy extracting terminal for Multiblocks",aAmp);
- Util.setTier(aTier,this);
+ super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"), aAmp);//Energy extracting terminal for Multiblocks
+ Util.setTier(aTier, this);
}
public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
@@ -105,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
return new String[]{
CommonValues.TEC_MARK_GENERAL,
mDescription,
- "Throughput: "+ EnumChatFormatting.YELLOW +(Amperes*maxEUOutput())+EnumChatFormatting.RESET+" EU/t"
+ StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + EnumChatFormatting.YELLOW + (Amperes * maxEUOutput()) + EnumChatFormatting.RESET + " EU/t"//Throughput
};
}
@@ -114,13 +115,13 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
if (aBaseMetaTileEntity.isServerSide()) {
byte Tick = (byte) (aTick % 20);
if (TRANSFER_AT == Tick) {
- if(aBaseMetaTileEntity.getStoredEU()>0){
- setEUVar(aBaseMetaTileEntity.getStoredEU()-Amperes);
- if(aBaseMetaTileEntity.getStoredEU()<0){
+ if (aBaseMetaTileEntity.getStoredEU() > 0) {
+ setEUVar(aBaseMetaTileEntity.getStoredEU() - Amperes);
+ if (aBaseMetaTileEntity.getStoredEU() < 0) {
setEUVar(0);
}
}
- if(aBaseMetaTileEntity.getStoredEU()>getMinimumStoredEU()){
+ if (aBaseMetaTileEntity.getStoredEU() > getMinimumStoredEU()) {
moveAround(aBaseMetaTileEntity);
}
}
@@ -141,30 +142,30 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
if (aMetaTileEntity != null) {
if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyTunnel &&
opposite == tGTTileEntity.getFrontFacing()) {
- if(maxEUOutput()>((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()){
+ if (maxEUOutput() > ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) {
aMetaTileEntity.doExplosion(maxEUOutput());
- setEUVar(aBaseMetaTileEntity.getStoredEU()-maxEUOutput());
+ setEUVar(aBaseMetaTileEntity.getStoredEU() - maxEUOutput());
return;
- }else if(maxEUOutput()==((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) {
- long diff=Math.min(
- Amperes*20,
+ } else if (maxEUOutput() == ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) {
+ long diff = Math.min(
+ Amperes * 20,
Math.min(
- ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUStore()-
+ ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUStore() -
aMetaTileEntity.getBaseMetaTileEntity().getStoredEU(),
- maxEUStore()-aBaseMetaTileEntity.getStoredEU()
- )/maxEUOutput()
- )*maxEUOutput();
+ maxEUStore() - aBaseMetaTileEntity.getStoredEU()
+ ) / maxEUOutput()
+ ) * maxEUOutput();
- setEUVar(aBaseMetaTileEntity.getStoredEU()-diff);
+ setEUVar(aBaseMetaTileEntity.getStoredEU() - diff);
((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity)
- .setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU()+diff);
+ .setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU() + diff);
}
return;
} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy) {
if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount < 2) {
return;
- }else {
+ } else {
((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).markUsed();
}
} else {
@@ -183,4 +184,4 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
public boolean canConnect(byte side) {
return isOutputFacing(side);
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
index 06bdd4faba..b9030d2dbe 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
@@ -9,6 +9,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
import static com.github.technus.tectech.CommonValues.V;
import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
@@ -20,9 +21,9 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch
public final int Amperes;
public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
- super(aID, aName, aNameRegional, aTier, 0, "Multiple Ampere Energy Injector for Multiblocks");
+ super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"));//Multiple Ampere Energy Injector for Multiblocks
Amperes = aAmp;
- Util.setTier(aTier,this);
+ Util.setTier(aTier, this);
}
public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
@@ -30,7 +31,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch
Amperes = aAmp;
}
- public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, String description,int aAmp) {
+ public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, String description, int aAmp) {
super(aID, aName, aNameRegional, aTier, 0, description);
Amperes = aAmp;
}
@@ -115,7 +116,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch
return new String[]{
CommonValues.TEC_MARK_GENERAL,
mDescription,
- "Amperes In: " + EnumChatFormatting.AQUA + maxAmperesIn() + " A"
+ StatCollector.translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " + EnumChatFormatting.AQUA + maxAmperesIn() + " A"//Amperes In
};
}
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
index e074f9dabb..118a659e93 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
import static com.github.technus.tectech.CommonValues.TRANSFER_AT;
import static com.github.technus.tectech.CommonValues.V;
@@ -20,8 +21,8 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_
*/
public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatch_EnergyMulti implements IConnectsToEnergyTunnel {
public GT_MetaTileEntity_Hatch_EnergyTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
- super(aID, aName, aNameRegional, aTier, 0, "Energy injecting terminal for Multiblocks",aAmp);
- Util.setTier(aTier,this);
+ super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.0"), aAmp);//Energy injecting terminal for Multiblocks
+ Util.setTier(aTier, this);
}
public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
@@ -113,7 +114,7 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc
return new String[]{
CommonValues.TEC_MARK_GENERAL,
mDescription,
- "Throughput: "+ EnumChatFormatting.YELLOW +(Amperes*maxEUInput())+EnumChatFormatting.RESET+" EU/t"
+ StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + EnumChatFormatting.YELLOW + (Amperes * maxEUInput()) + EnumChatFormatting.RESET + " EU/t"//Throughput
};
}
@@ -127,13 +128,13 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc
if (aBaseMetaTileEntity.isServerSide()) {
byte Tick = (byte) (aTick % 20);
if (TRANSFER_AT == Tick) {
- if(aBaseMetaTileEntity.getStoredEU()>0){
- setEUVar(aBaseMetaTileEntity.getStoredEU()-Amperes);
- if(aBaseMetaTileEntity.getStoredEU()<0){
+ if (aBaseMetaTileEntity.getStoredEU() > 0) {
+ setEUVar(aBaseMetaTileEntity.getStoredEU() - Amperes);
+ if (aBaseMetaTileEntity.getStoredEU() < 0) {
setEUVar(0);
}
}
}
}
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
index e384a8d7e2..245aa53288 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
@@ -29,12 +29,12 @@ import static gregtech.api.GregTech_API.sBlockCasings1;
/**
* Created by danie_000 on 17.12.2016.
*/
-public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable{
+public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
//region Structure
private static final String[][] shape = new String[][]{
- {" "," . "," ",},
- {" "," 0 "," ",},
- {" "," "," ",},
+ {" ", " . ", " ",},
+ {" ", " 0 ", " ",},
+ {" ", " ", " ",},
};
private static final Block[] blockType = new Block[]{sBlockCasings1};
private static final byte[] blockMeta = new byte[]{15};
@@ -43,7 +43,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT};
private static final byte[] blockMetaFallback = new byte[]{0};
private static final String[] description = new String[]{
- EnumChatFormatting.AQUA+"Hint Details:",
+ EnumChatFormatting.AQUA + "Hint Details:",
"1 - Energy IO Hatches or High Power Casing",
};
//endregion
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
mHardHammer = true;
mSolderingTool = true;
mCrowbar = true;
- eDismantleBoom=true;
+ eDismantleBoom = true;
}
public GT_MetaTileEntity_EM_transformer(String aName) {
@@ -67,14 +67,14 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
mHardHammer = true;
mSolderingTool = true;
mCrowbar = true;
- eDismantleBoom=true;
+ eDismantleBoom = true;
}
- public final static ResourceLocation activitySound=new ResourceLocation(Reference.MODID+":fx_noise");
+ public final static ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_noise");
@Override
@SideOnly(Side.CLIENT)
- protected ResourceLocation getActivitySound(){
+ protected ResourceLocation getActivitySound() {
return activitySound;
}
@@ -90,17 +90,17 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
@Override
public void construct(int stackSize, boolean hintsOnly) {
- StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity(),this,hintsOnly);
+ StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), this, hintsOnly);
}
@Override
public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity,true,false,false);
+ return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, true, false, false);
}
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png",true,false,false);
+ return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png", true, false, false);
}
@Override
@@ -156,4 +156,4 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
public boolean doRandomMaintenanceDamage() {
return true;
}
-}
+} \ No newline at end of file