diff --git a/build.gradle b/build.gradle index a254745..2591aec 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import groovy.json.JsonOutput def mainVersion = "1.8" -def buildNumber = "37" +def buildNumber = "38" // For those who want the bleeding edge buildscript { diff --git a/changelog.json b/changelog.json index 5965efa..ebf3232 100644 --- a/changelog.json +++ b/changelog.json @@ -5,8 +5,8 @@ "1.10.2-recommended": "1.4-18", "1.11.2-latest": "1.5-19", "1.11.2-recommended": "1.5-19", - "1.12.2-latest": "1.7-36", - "1.12.2-recommended": "1.7-36" + "1.12.2-latest": "1.7-35", + "1.12.2-recommended": "1.7-35" }, "1.10.2": { "1.1-3": " - fixed incompatibility with IE build 48\n - reduced the amount of calls to core IE classes to make such incompatibilities less likely\n - fixed localization of the creative tab", diff --git a/changelog.md b/changelog.md index 03a96a5..5559879 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ ###Minecraft 1.12.2 +####Version 1.7-35 + - Fixed a crash with rendering _something_ in JEI in specific circumstances. Dunno what, but it sure did happen + ####Version 1.7-36 - Added an RGB indicator light, controlled by 3 (independent) RS signals - Fixed a bug allowing for unfinished control panels to be duplicated diff --git a/src/main/java/malte0811/industrialwires/client/ClientProxy.java b/src/main/java/malte0811/industrialwires/client/ClientProxy.java index 2a2e8d6..eeb873b 100644 --- a/src/main/java/malte0811/industrialwires/client/ClientProxy.java +++ b/src/main/java/malte0811/industrialwires/client/ClientProxy.java @@ -481,14 +481,16 @@ public boolean isValidTextureSource(ItemStack stack) { null, null); TextureAtlasSprite sprite = texModel.getParticleTexture(); //noinspection ConstantConditions - if (sprite == null || sprite.hasAnimationMetadata()) { + if (sprite == null || sprite.hasAnimationMetadata() || sprite.getFrameTextureData(0) == null) { return false; } int[][] data = sprite.getFrameTextureData(0); - for (int x = 0; x < data.length; x++) { - for (int y = 0; y < data[x].length; y++) { - if ((data[x][y] >>> 24) != 255) { - return false; + for (int[] datum : data) { + if (datum != null ) { + for (int i : datum) { + if ((i >>> 24) != 255) { + return false; + } } } }