From 63d615f7c1713c43bb8b10ffbafd7b56d59fb938 Mon Sep 17 00:00:00 2001 From: Tec Date: Thu, 18 Jul 2019 09:22:33 +0200 Subject: Delete old GT5U on getGreg for convience --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 0d563706a2..3d94e53be7 100644 --- a/build.gradle +++ b/build.gradle @@ -86,6 +86,9 @@ task getGregTech(type: Download) { !file("libs/gregtech-${config.gregtech.version}-dev.jar").exists() } src "http://jenkins.usrv.eu:8080/job/Gregtech-5-Unofficial/${config.gregtech.jenkinsbuild}/artifact/build/libs/gregtech-${config.gregtech.version}-dev.jar" + delete fileTree("$projectDir/libs/") { + include 'gregtech-*-dev.jar' + } dest file("libs/gregtech-${config.gregtech.version}-dev.jar") mustRunAfter "deobfBinJar" mustRunAfter "repackMinecraft" -- cgit From 4e75a620b9a75c4d0ab2f4349262435ed026310c Mon Sep 17 00:00:00 2001 From: Tec Date: Thu, 18 Jul 2019 09:47:29 +0200 Subject: Cleanup get gregtech --- build.gradle | 7 ++++--- gregtech-5.09.32.06-dev-.jar | Bin 10284188 -> 0 bytes gregtech-5.09.32pre3-1428.jar | Bin 10004905 -> 0 bytes 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 gregtech-5.09.32.06-dev-.jar delete mode 100644 gregtech-5.09.32pre3-1428.jar diff --git a/build.gradle b/build.gradle index 3d94e53be7..ed05a63381 100644 --- a/build.gradle +++ b/build.gradle @@ -86,12 +86,13 @@ task getGregTech(type: Download) { !file("libs/gregtech-${config.gregtech.version}-dev.jar").exists() } src "http://jenkins.usrv.eu:8080/job/Gregtech-5-Unofficial/${config.gregtech.jenkinsbuild}/artifact/build/libs/gregtech-${config.gregtech.version}-dev.jar" - delete fileTree("$projectDir/libs/") { - include 'gregtech-*-dev.jar' - } dest file("libs/gregtech-${config.gregtech.version}-dev.jar") mustRunAfter "deobfBinJar" mustRunAfter "repackMinecraft" + delete fileTree("$projectDir/libs/") { + include 'gregtech-*-dev.jar' + exclude "gregtech-${config.gregtech.version}-dev.jar" + } } tasks.setupCIWorkspace.dependsOn getGregTech diff --git a/gregtech-5.09.32.06-dev-.jar b/gregtech-5.09.32.06-dev-.jar deleted file mode 100644 index e771833469..0000000000 Binary files a/gregtech-5.09.32.06-dev-.jar and /dev/null differ diff --git a/gregtech-5.09.32pre3-1428.jar b/gregtech-5.09.32pre3-1428.jar deleted file mode 100644 index c436de0cd1..0000000000 Binary files a/gregtech-5.09.32pre3-1428.jar and /dev/null differ -- cgit From ac28fb230016aebbe6c303f28d211a40f94f86c4 Mon Sep 17 00:00:00 2001 From: Tec Date: Thu, 18 Jul 2019 09:47:47 +0200 Subject: Cleanup font render --- .../technus/tectech/font/TecTechFontRender.java | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java index f20bc28402..a7130bab90 100644 --- a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java +++ b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java @@ -21,34 +21,36 @@ public class TecTechFontRender extends FontRenderer { private static float DISTANCE_M = 0.06F; private static float DISTANCE_M2 = DISTANCE_M *2F; - private static float DISTANCE_S = 0.06F; - private static float DISTANCE_S2 = DISTANCE_S *2F; - private static float DISTANCE_A = 0.06F; private static float DISTANCE_A2 = DISTANCE_A *2F; - private Method reset; - private Method render; + private static final Method reset; + private static final Method render; private final GameSettings gameSettings; - private TecTechFontRender() { - super(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false); - gameSettings = Minecraft.getMinecraft().gameSettings; - + static { + Method resetMethod,renderMethod; try { - reset =FontRenderer.class.getDeclaredMethod("resetStyles"); - render=FontRenderer.class.getDeclaredMethod("renderString", String.class, int.class, int.class, int.class, boolean.class); + resetMethod =FontRenderer.class.getDeclaredMethod("resetStyles"); + renderMethod=FontRenderer.class.getDeclaredMethod("renderString", String.class, int.class, int.class, int.class, boolean.class); } catch (NoSuchMethodException e) { try { - reset =FontRenderer.class.getDeclaredMethod("func_78265_b"); - render=FontRenderer.class.getDeclaredMethod("func_78258_a", String.class, int.class, int.class, int.class, boolean.class); + resetMethod =FontRenderer.class.getDeclaredMethod("func_78265_b"); + renderMethod=FontRenderer.class.getDeclaredMethod("func_78258_a", String.class, int.class, int.class, int.class, boolean.class); } catch (NoSuchMethodException ex) { throw new RuntimeException("Cannot get methods!",ex); } } - reset.setAccessible(true); - render.setAccessible(true); + resetMethod.setAccessible(true); + renderMethod.setAccessible(true); + reset=resetMethod; + render=renderMethod; + } + + private TecTechFontRender() { + super(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false); + gameSettings = Minecraft.getMinecraft().gameSettings; } private void resetStyles2(){ -- cgit