Skip to content

Commit 16be4cd

Browse files
authored
Localization of title and gui elemets (+gradle update) (#16)
1 parent ae8a9aa commit 16be4cd

File tree

17 files changed

+290
-28
lines changed

17 files changed

+290
-28
lines changed

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Add your dependencies here
22

33
dependencies {
4-
compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.4-GTNH:api") {
4+
compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.12-GTNH:api") {
55
transitive = false
66
}
77
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
8-
api("com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev")
8+
api("com.github.GTNewHorizons:NotEnoughItems:2.8.48-GTNH:dev")
99
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
20+
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49'
2121
}
2222

2323

src/main/java/lumien/randomthings/Client/GUI/GuiDropFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public GuiDropFilter(EntityPlayer player, IInventory inventoryPlayer, IInventory
2525
@Override
2626
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
2727
if (this.itemDropFilter.getItemDamage() == 0) {
28-
fontRendererObj.drawString(I18n.format("item.dropFilter.name"), 8, 6, 4210752);
28+
fontRendererObj.drawString(I18n.format("gui.item.dropFilter.name.title"), 8, 6, 4210752);
2929
} else {
30-
fontRendererObj.drawString(I18n.format("item.dropFilterVoiding.name"), 8, 6, 4210752);
30+
fontRendererObj.drawString(I18n.format("gui.item.dropFilterVoiding.name.title"), 8, 6, 4210752);
3131
}
3232
}
3333

src/main/java/lumien/randomthings/Client/GUI/GuiDyeingMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void updateScreen() {
7373

7474
@Override
7575
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
76-
fontRendererObj.drawString(I18n.format("tile.dyeingMachine.name"), 8, 6, 4210752);
76+
fontRendererObj.drawString(I18n.format("gui.tile.dyeingMachine.name.title"), 8, 6, 4210752);
7777
}
7878

7979
@Override

src/main/java/lumien/randomthings/Client/GUI/GuiEnderEnergyDistributor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouse
6262

6363
@Override
6464
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
65-
fontRendererObj.drawString(I18n.format("tile.enderEnergyDistributor.name"), 14, 6, 4210752);
65+
fontRendererObj.drawString(I18n.format("gui.tile.enderEnergyDistributor.name.title"), 14, 6, 4210752);
6666

6767
int distributed = ((ContainerEnderEnergyDistributor) this.inventorySlots).energyDistributedLastTick;
6868
fontRendererObj.drawString(
69-
"Edlt: " + distributed + "/" + Settings.ENDER_ENERGY_DISTRIBUTOR_PERTICK + " RF",
69+
I18n.format("text.miscellaneous.edlt", distributed, Settings.ENDER_ENERGY_DISTRIBUTOR_PERTICK),
7070
16,
7171
34,
7272
4210752);
7373

7474
int machinesConnected = ((ContainerEnderEnergyDistributor) this.inventorySlots).machinesConnected;
7575
fontRendererObj.drawString(
76-
"MC: " + machinesConnected + "/" + Settings.ENDER_ENERGY_DISTRIBUTOR_MAXMACHINES,
76+
I18n.format("text.miscellaneous.mc", machinesConnected, Settings.ENDER_ENERGY_DISTRIBUTOR_MAXMACHINES),
7777
103,
7878
34,
7979
4210752);

src/main/java/lumien/randomthings/Client/GUI/GuiEnergyDistributor.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,18 @@ protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouse
6161

6262
@Override
6363
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
64-
fontRendererObj.drawString(I18n.format("tile.energyDistributor.name"), 8, 6, 4210752);
64+
fontRendererObj.drawString(I18n.format("gui.tile.energyDistributor.name.title"), 8, 6, 4210752);
6565

6666
int distributed = ((ContainerEnergyDistributor) this.inventorySlots).energyDistributedLastTick;
67-
fontRendererObj
68-
.drawString("Edlt: " + distributed + "/" + Settings.ENERGY_DISTRIBUTOR_PERTICK + " RF", 8, 35, 4210752);
67+
fontRendererObj.drawString(
68+
I18n.format("text.miscellaneous.edlt", distributed, Settings.ENERGY_DISTRIBUTOR_PERTICK),
69+
8,
70+
35,
71+
4210752);
6972

7073
int machinesConnected = ((ContainerEnergyDistributor) this.inventorySlots).machinesConnected;
7174
fontRendererObj.drawString(
72-
"MC: " + machinesConnected + "/" + Settings.ENERGY_DISTRIBUTOR_MAXMACHINES,
75+
I18n.format("text.miscellaneous.mc", machinesConnected, Settings.ENERGY_DISTRIBUTOR_MAXMACHINES),
7376
103,
7477
35,
7578
4210752);

src/main/java/lumien/randomthings/Client/GUI/GuiImbuingStation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
6363

6464
@Override
6565
protected void drawGuiContainerForegroundLayer(int param1, int param2) {
66-
fontRendererObj.drawString(I18n.format("tile.imbuingStation.name"), 3, 6, 4210752);
66+
fontRendererObj.drawString(I18n.format("gui.tile.imbuingStation.name.title"), 3, 6, 4210752);
6767
}
6868

6969
@Override

src/main/java/lumien/randomthings/Client/GUI/GuiItemCollector.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,16 @@ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
101101

102102
@Override
103103
protected void drawGuiContainerForegroundLayer(int param1, int param2) {
104-
fontRendererObj.drawString(I18n.format("tile.advancedItemCollector.name"), 8, 6, 4210752);
104+
fontRendererObj.drawString(I18n.format("gui.tile.advancedItemCollector.name.title"), 8, 6, 4210752);
105105

106-
String radiusX = "Radius X: " + te.rangeX;
107-
String radiusY = "Radius Y: " + te.rangeY;
108-
String radiusZ = "Radius Z: " + te.rangeZ;
106+
String radiusX = I18n.format("text.miscellaneous.radiusX", te.rangeX);
107+
String radiusY = I18n.format("text.miscellaneous.radiusY", te.rangeY);
108+
String radiusZ = I18n.format("text.miscellaneous.radiusZ", te.rangeZ);
109109

110110
fontRendererObj.drawString(radiusX, xSize / 2 - fontRendererObj.getStringWidth(radiusX) / 2, 25, 4210752);
111111
fontRendererObj.drawString(radiusY, xSize / 2 - fontRendererObj.getStringWidth(radiusY) / 2, 50, 4210752);
112112
fontRendererObj.drawString(radiusZ, xSize / 2 - fontRendererObj.getStringWidth(radiusZ) / 2, 75, 4210752);
113113

114-
fontRendererObj.drawString("Filter: ", 48, 103, 0x000000);
114+
fontRendererObj.drawString(I18n.format("item.filter.name"), 48, 103, 0x000000);
115115
}
116116
}

src/main/java/lumien/randomthings/Client/GUI/GuiItemFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
103103

104104
@Override
105105
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
106-
fontRendererObj.drawString(I18n.format("item.filterItem.name"), 8, 6, 4210752);
106+
fontRendererObj.drawString(I18n.format("gui.item.filterItem.name.title"), 8, 6, 4210752);
107107
}
108108
}

src/main/java/lumien/randomthings/Client/GUI/GuiOnlineDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
9494

9595
@Override
9696
protected void drawGuiContainerForegroundLayer(int param1, int param2) {
97-
fontRendererObj.drawString(I18n.format("tile.onlineDetector.name"), 8, 6, 4210752);
97+
fontRendererObj.drawString(I18n.format("gui.tile.onlineDetector.name.title"), 8, 6, 4210752);
9898
String teUsername = te.getPlayerName();
9999
String toDraw;
100100
if (teUsername.equals("")) {

0 commit comments

Comments
 (0)