diff --git a/dependencies.gradle b/dependencies.gradle index b989133f..13ea0421 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -9,5 +9,5 @@ dependencies { devOnlyNonPublishable 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev' devOnlyNonPublishable ("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.409:dev") devOnlyNonPublishable ("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - devOnlyNonPublishable ("curse.maven:computercraft-67504:2269339") + devOnlyNonPublishable (rfg.deobf("curse.maven:computercraft-67504:2269339")) } diff --git a/gradle.properties b/gradle.properties index 1bbe9104..19470403 100644 --- a/gradle.properties +++ b/gradle.properties @@ -233,3 +233,6 @@ customArchiveBaseName = OpenModularTurrets # This is meant to be set in $HOME/.gradle/gradle.properties. # ideaCheckSpotlessOnBuild = true +# Non-GTNH properties +org.gradle.configuration-cache = true +org.gradle.parallel = true diff --git a/src/main/java/openmodularturrets/client/gui/TurretBaseTierFiveGui.java b/src/main/java/openmodularturrets/client/gui/TurretBaseTierFiveGui.java index e7c63ac3..07deddba 100644 --- a/src/main/java/openmodularturrets/client/gui/TurretBaseTierFiveGui.java +++ b/src/main/java/openmodularturrets/client/gui/TurretBaseTierFiveGui.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -27,11 +28,11 @@ public TurretBaseTierFiveGui(InventoryPlayer inventoryPlayer, TurretBaseTierFive protected void drawGuiContainerForegroundLayer(int param1, int param2) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - fontRenderer.drawString("Addons:", 71, 6, 0); - fontRenderer.drawString("Ammo", 8, 6, 0); - fontRenderer.drawString("Inventory", 8, ySize - 97 + 4, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.addons") + ":", 71, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.ammo"), 8, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 97 + 4, 0); fontRenderer.drawStringWithShadow("" + base.getyAxisDetect(), 127, 39, 40000); - fontRenderer.drawString("-Y", 123, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.y_string"), 123, 6, 0); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; diff --git a/src/main/java/openmodularturrets/client/gui/TurretBaseTierFourGui.java b/src/main/java/openmodularturrets/client/gui/TurretBaseTierFourGui.java index 88b551fc..e2033131 100644 --- a/src/main/java/openmodularturrets/client/gui/TurretBaseTierFourGui.java +++ b/src/main/java/openmodularturrets/client/gui/TurretBaseTierFourGui.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -27,11 +28,11 @@ public TurretBaseTierFourGui(InventoryPlayer inventoryPlayer, TurretBaseTierFour protected void drawGuiContainerForegroundLayer(int param1, int param2) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - fontRenderer.drawString("Addons:", 71, 6, 0); - fontRenderer.drawString("Ammo", 8, 6, 0); - fontRenderer.drawString("Inventory", 8, ySize - 97 + 4, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.addons") + ":", 71, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.ammo"), 8, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 97 + 4, 0); fontRenderer.drawStringWithShadow("" + base.getyAxisDetect(), 127, 39, 40000); - fontRenderer.drawString("-Y", 123, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.y_string"), 123, 6, 0); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; diff --git a/src/main/java/openmodularturrets/client/gui/TurretBaseTierOneGui.java b/src/main/java/openmodularturrets/client/gui/TurretBaseTierOneGui.java index 45bbae3e..796f10fa 100644 --- a/src/main/java/openmodularturrets/client/gui/TurretBaseTierOneGui.java +++ b/src/main/java/openmodularturrets/client/gui/TurretBaseTierOneGui.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -27,10 +28,10 @@ public TurretBaseTierOneGui(InventoryPlayer inventoryPlayer, TurretBaseTierOneTi protected void drawGuiContainerForegroundLayer(int param1, int param2) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - fontRenderer.drawString("Ammo", 8, 6, 0); - fontRenderer.drawString("Inventory", 8, ySize - 97 + 4, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.ammo"), 8, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 97 + 4, 0); fontRenderer.drawStringWithShadow("" + base.getyAxisDetect(), 127, 39, 40000); - fontRenderer.drawString("-Y", 123, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.y_string"), 123, 6, 0); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; diff --git a/src/main/java/openmodularturrets/client/gui/TurretBaseTierThreeGui.java b/src/main/java/openmodularturrets/client/gui/TurretBaseTierThreeGui.java index 3448410f..04432eb8 100644 --- a/src/main/java/openmodularturrets/client/gui/TurretBaseTierThreeGui.java +++ b/src/main/java/openmodularturrets/client/gui/TurretBaseTierThreeGui.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -27,11 +28,11 @@ public TurretBaseTierThreeGui(InventoryPlayer inventoryPlayer, TurretBaseTierThr protected void drawGuiContainerForegroundLayer(int param1, int param2) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - fontRenderer.drawString("Addons:", 71, 6, 0); - fontRenderer.drawString("Ammo", 8, 6, 0); - fontRenderer.drawString("Inventory", 8, ySize - 97 + 4, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.addons") + ":", 71, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.ammo"), 8, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 97 + 4, 0); fontRenderer.drawStringWithShadow("" + base.getyAxisDetect(), 127, 39, 40000); - fontRenderer.drawString("-Y", 123, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.y_string"), 123, 6, 0); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; diff --git a/src/main/java/openmodularturrets/client/gui/TurretBaseTierTwoGui.java b/src/main/java/openmodularturrets/client/gui/TurretBaseTierTwoGui.java index d70357df..956dce4c 100644 --- a/src/main/java/openmodularturrets/client/gui/TurretBaseTierTwoGui.java +++ b/src/main/java/openmodularturrets/client/gui/TurretBaseTierTwoGui.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -27,11 +28,11 @@ public TurretBaseTierTwoGui(InventoryPlayer inventoryPlayer, TurretBaseTierTwoTi protected void drawGuiContainerForegroundLayer(int param1, int param2) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - fontRenderer.drawString("Addons:", 71, 6, 0); - fontRenderer.drawString("Ammo", 8, 6, 0); - fontRenderer.drawString("Inventory", 8, ySize - 97 + 4, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.addons") + ":", 71, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.ammo"), 8, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 97 + 4, 0); fontRenderer.drawStringWithShadow("" + base.getyAxisDetect(), 127, 39, 40000); - fontRenderer.drawString("-Y", 123, 6, 0); + fontRenderer.drawString(StatCollector.translateToLocal("gui.openmodularturrets.y_string"), 123, 6, 0); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; diff --git a/src/main/resources/assets/openmodularturrets/lang/en_US.lang b/src/main/resources/assets/openmodularturrets/lang/en_US.lang index 4d747fe6..a0e35ed0 100644 --- a/src/main/resources/assets/openmodularturrets/lang/en_US.lang +++ b/src/main/resources/assets/openmodularturrets/lang/en_US.lang @@ -213,6 +213,10 @@ status.ownership=You do not own this turret, or you don't have permission to do status.missingBase=There's no turret base there. status.warning=You are entering a turret-protected area. Continue at your own risk. +gui.openmodularturrets.ammo=Ammo +gui.openmodularturrets.addons=Addons +gui.openmodularturrets.y_string=-Y + gui.openmodularturrets:owner=Owner gui.openmodularturrets:invert=Inverted gui.openmodularturrets:active=Active