aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-08-26 17:28:50 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-08-26 17:28:50 +1000
commitd2821105000b58b49d7f575b08cb759b40860f3e (patch)
tree6e51d65ecb92eb1c6164beebc8fa1dd216ee510b /src/Java/gtPlusPlus/xmod
parentd8068556c49aee29368be0955228e4b937f761de (diff)
downloadGT5-Unofficial-d2821105000b58b49d7f575b08cb759b40860f3e.tar.gz
GT5-Unofficial-d2821105000b58b49d7f575b08cb759b40860f3e.tar.bz2
GT5-Unofficial-d2821105000b58b49d7f575b08cb759b40860f3e.zip
+ Added Russian .lang file, translated by Wolfpup and Indeed.
% Further tweaks to GUI handling.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_ThreadedSuperBuffer.java12
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java5
7 files changed, 15 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_ThreadedSuperBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_ThreadedSuperBuffer.java
index 51ad334a01..265742e5ad 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_ThreadedSuperBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_ThreadedSuperBuffer.java
@@ -44,9 +44,9 @@ public class CONTAINER_ThreadedSuperBuffer extends GT_ContainerMetaTile_Machine
.getMetaTileEntity()).bOutput = !((GT_MetaTileEntity_ThreadedChestBuffer) this.mTileEntity
.getMetaTileEntity()).bOutput;
if (((GT_MetaTileEntity_ThreadedChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput) {
- GT_Utility.sendChatToPlayer(aPlayer, this.trans("116", "Emit Energy to Outputside"));
+ GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
} else {
- GT_Utility.sendChatToPlayer(aPlayer, this.trans("117", "Don't emit Energy"));
+ GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
}
return null;
}
@@ -55,9 +55,9 @@ public class CONTAINER_ThreadedSuperBuffer extends GT_ContainerMetaTile_Machine
.getMetaTileEntity()).bRedstoneIfFull = !((GT_MetaTileEntity_ThreadedChestBuffer) this.mTileEntity
.getMetaTileEntity()).bRedstoneIfFull;
if (((GT_MetaTileEntity_ThreadedChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {
- GT_Utility.sendChatToPlayer(aPlayer, this.trans("118", "Emit Redstone if no Slot is free"));
+ GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");
} else {
- GT_Utility.sendChatToPlayer(aPlayer, this.trans("119", "Don't emit Redstone"));
+ GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");
}
return null;
}
@@ -66,9 +66,9 @@ public class CONTAINER_ThreadedSuperBuffer extends GT_ContainerMetaTile_Machine
.getMetaTileEntity()).bInvert = !((GT_MetaTileEntity_ThreadedChestBuffer) this.mTileEntity
.getMetaTileEntity()).bInvert;
if (((GT_MetaTileEntity_ThreadedChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert) {
- GT_Utility.sendChatToPlayer(aPlayer, this.trans("120", "Invert Redstone"));
+ GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");
} else {
- GT_Utility.sendChatToPlayer(aPlayer, this.trans("121", "Don't invert Redstone"));
+ GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");
}
return null;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
index 733bdab683..87bb492146 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
@@ -54,7 +54,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase {
@Override
public String getCustomGUIResourceName() {
- return "VacuumFreezer";
+ return "Generic3By3";
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
index f9ea1d112e..46350394ea 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -12,11 +12,9 @@ import gregtech.api.util.*;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
import net.minecraft.block.Block;
-import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
index 8d675ba874..a91c085704 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -97,7 +97,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public String getCustomGUIResourceName() {
- return "VacuumFreezer";
+ return "Generic3By3";
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
index 5a907f363a..64b64981e7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
@@ -557,7 +557,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase {
@Override
public String getCustomGUIResourceName() {
- return "VacuumFreezer";
+ return "Generic3By3";
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
index 7dbde87ce7..df775bb64c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
@@ -276,7 +276,7 @@ extends GregtechMeta_MultiBlockBase
@Override
public String getCustomGUIResourceName() {
- return "VacuumFreezer";
+ return "Generic3By3";
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
index 21703fdc34..d0d4f22045 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
@@ -89,6 +89,11 @@ extends GregtechMeta_MultiBlockBase {
@Override
public boolean hasSlotInGUI() {
return true;
+ }
+
+ @Override
+ public boolean requiresVanillaGtGUI() {
+ return true;
}
@Override