diff --git a/build.gradle b/build.gradle index be3767e..3ca22ff 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '2.1.1' +version = '2.1.2' group = 'link.infra.jumploader' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'jumploader' diff --git a/gradle.properties b/gradle.properties index 0c13010..02d09f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ modGroup=link.infra.jumploader -modVersion=2.1.1 +modVersion=2.1.2 modBaseName=jumploader diff --git a/src/main/java/link/infra/jumploader/Jumploader.java b/src/main/java/link/infra/jumploader/Jumploader.java index efd15e2..16bdcbe 100644 --- a/src/main/java/link/infra/jumploader/Jumploader.java +++ b/src/main/java/link/infra/jumploader/Jumploader.java @@ -34,7 +34,7 @@ import java.util.Set; public class Jumploader implements ITransformationService { - public static final String VERSION = "2.1.1"; + public static final String VERSION = "2.1.2"; public static final String USER_AGENT = "Jumploader/" + VERSION; private final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/link/infra/jumploader/resolution/ui/Image.java b/src/main/java/link/infra/jumploader/resolution/ui/Image.java index ac94ab6..12e78c2 100644 --- a/src/main/java/link/infra/jumploader/resolution/ui/Image.java +++ b/src/main/java/link/infra/jumploader/resolution/ui/Image.java @@ -58,7 +58,7 @@ public void init() { GL11.glPushAttrib(GL11.GL_TEXTURE_BIT); GL11.glBindTexture(GL11.GL_TEXTURE_2D, textureID); GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR); - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_LINEAR); + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL12.GL_CLAMP_TO_EDGE); GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL12.GL_CLAMP_TO_EDGE); @@ -97,6 +97,7 @@ public void render() { GL11.glPushAttrib(GL11.GL_TEXTURE_BIT | GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT); GL11.glEnable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glScalef(scaleFactor, scaleFactor, 1f); diff --git a/src/main/java/link/infra/jumploader/resolution/ui/Window.java b/src/main/java/link/infra/jumploader/resolution/ui/Window.java index 5c3a103..a9377cb 100644 --- a/src/main/java/link/infra/jumploader/resolution/ui/Window.java +++ b/src/main/java/link/infra/jumploader/resolution/ui/Window.java @@ -76,7 +76,6 @@ public void init() { rootComponent.init(); - GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glClearColor(1.0f, 1.0f, 1.0f, 0.0f); } @@ -119,7 +118,6 @@ private void redraw() { @Override public void free() { - GL11.glDisable(GL11.GL_TEXTURE_2D); rootComponent.free(); GL.setCapabilities(null); diff --git a/src/main/resources/assets/jumploader/icon-128.png b/src/main/resources/assets/jumploader/icon-128.png index 1e08423..da7d832 100644 Binary files a/src/main/resources/assets/jumploader/icon-128.png and b/src/main/resources/assets/jumploader/icon-128.png differ diff --git a/src/main/resources/assets/jumploader/icon-16.png b/src/main/resources/assets/jumploader/icon-16.png index 800b98a..955adff 100644 Binary files a/src/main/resources/assets/jumploader/icon-16.png and b/src/main/resources/assets/jumploader/icon-16.png differ diff --git a/src/main/resources/assets/jumploader/icon-32.png b/src/main/resources/assets/jumploader/icon-32.png index 0f4a366..c5b4452 100644 Binary files a/src/main/resources/assets/jumploader/icon-32.png and b/src/main/resources/assets/jumploader/icon-32.png differ diff --git a/src/main/resources/assets/jumploader/icon-48.png b/src/main/resources/assets/jumploader/icon-48.png index 02f9c9d..7707625 100644 Binary files a/src/main/resources/assets/jumploader/icon-48.png and b/src/main/resources/assets/jumploader/icon-48.png differ diff --git a/src/main/resources/assets/jumploader/splashlogo.png b/src/main/resources/assets/jumploader/splashlogo.png index 0a74f4e..464346c 100644 Binary files a/src/main/resources/assets/jumploader/splashlogo.png and b/src/main/resources/assets/jumploader/splashlogo.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6ab4f58..a1881a8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "jumploader", - "version": "2.1.1", + "version": "2.1.2", "name": "Jumploader", "description": "Allows the use of Fabric mods in Twitch modpacks, by loading Fabric as if it were a Forge mod.",