update bs+gitignore

Depends on https://github.com/GTNewHorizons/CodeChickenLib/pull/14

.gitignore

@@ -26,3 +26,4 @@ whitelist.json
 *.ipr
 *.iws
 src/main/resources/mixins.*.json
+*.bat

dependencies.gradle

@@ -1,5 +1,5 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:CodeChickenLib:1.1.6:dev')
+    api('com.github.GTNewHorizons:CodeChickenLib:1.2.0:dev')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

repositories.gradle

@@ -1,12 +1,4 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
-    maven {
-        name 'GTNH Maven'
-        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-        allowInsecureProtocol
-    }
-    maven {
-        url 'https://jitpack.io'
-    }
 }

settings.gradle

@@ -4,10 +4,9 @@ pluginManagement {
         maven {
             // RetroFuturaGradle
             name "GTNH Maven"
-            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-            allowInsecureProtocol = true
+            url "https://nexus.gtnewhorizons.com/repository/public/"
             mavenContent {
-                includeGroup("com.gtnewhorizons.retrofuturagradle")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
             }
         }
         gradlePluginPortal()
@@ -17,8 +16,8 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.diffplug.blowdryerSetup' version '1.6.0'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
+    id 'com.diffplug.blowdryerSetup' version '1.7.1'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' // Provides java toolchains
 }
 
 blowdryerSetup {

src/main/java/codechicken/core/CCUpdateChecker.java

@@ -14,10 +14,9 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.StatCollector;
 
-import codechicken.core.launch.CodeChickenCorePlugin;
-
 import com.google.common.base.Function;
 
+import codechicken.core.launch.CodeChickenCorePlugin;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.versioning.ComparableVersion;
 import cpw.mods.fml.relauncher.FMLInjectionData;

src/main/java/codechicken/core/ClassDiscoverer.java

@@ -13,11 +13,10 @@ import net.minecraft.launchwrapper.Launch;
 
 import org.objectweb.asm.tree.ClassNode;
 
-import codechicken.core.launch.CodeChickenCorePlugin;
-import codechicken.lib.asm.ASMHelper;
-
 import com.google.common.collect.ImmutableList;
 
+import codechicken.core.launch.CodeChickenCorePlugin;
+import codechicken.lib.asm.ASMHelper;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModClassLoader;

src/main/java/codechicken/core/GuiModListScroll.java

@@ -1,9 +1,24 @@
 package codechicken.core;
 
-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_ALWAYS;
+import static org.lwjgl.opengl.GL11.GL_EQUAL;
+import static org.lwjgl.opengl.GL11.GL_KEEP;
+import static org.lwjgl.opengl.GL11.GL_PACK_ALIGNMENT;
+import static org.lwjgl.opengl.GL11.GL_REPLACE;
+import static org.lwjgl.opengl.GL11.GL_STENCIL_INDEX;
+import static org.lwjgl.opengl.GL11.GL_STENCIL_TEST;
+import static org.lwjgl.opengl.GL11.GL_UNPACK_ALIGNMENT;
+import static org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE;
+import static org.lwjgl.opengl.GL11.GL_ZERO;
+import static org.lwjgl.opengl.GL11.glColorMask;
+import static org.lwjgl.opengl.GL11.glDisable;
+import static org.lwjgl.opengl.GL11.glEnable;
+import static org.lwjgl.opengl.GL11.glPixelStorei;
 import static org.lwjgl.opengl.GL11.glReadPixels;
+import static org.lwjgl.opengl.GL11.glStencilFunc;
+import static org.lwjgl.opengl.GL11.glStencilOp;
 
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;

src/main/java/codechicken/core/ServerUtils.java

@@ -13,10 +13,10 @@ import net.minecraft.inventory.Container;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.IChatComponent;
 
-import codechicken.lib.asm.ObfMapping;
-
 import com.mojang.authlib.GameProfile;
 
+import codechicken.lib.asm.ObfMapping;
+
 public class ServerUtils extends CommonUtils {
 
     public static MinecraftServer mc() {

src/main/java/codechicken/core/asm/CodeChickenAccessTransformer.java

@@ -3,10 +3,9 @@ package codechicken.core.asm;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import codechicken.lib.asm.ObfMapping;
-
 import com.google.common.collect.ImmutableBiMap;
 
+import codechicken.lib.asm.ObfMapping;
 import cpw.mods.fml.common.asm.transformers.AccessTransformer;
 import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
 

src/main/java/codechicken/core/asm/CodeChickenCoreModContainer.java

@@ -6,17 +6,19 @@ import java.util.List;
 
 import net.minecraftforge.common.MinecraftForge;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import codechicken.core.CCUpdateChecker;
 import codechicken.core.ClientUtils;
 import codechicken.core.featurehack.LiquidTextures;
 import codechicken.core.internal.CCCEventHandler;
 import codechicken.core.launch.CodeChickenCorePlugin;
 import codechicken.lib.config.ConfigFile;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
-import cpw.mods.fml.common.*;
+import cpw.mods.fml.common.DummyModContainer;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.LoadController;
+import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.versioning.ArtifactVersion;

src/main/java/codechicken/core/asm/MCPDeobfuscationTransformer.java

@@ -2,7 +2,11 @@ package codechicken.core.asm;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import net.minecraft.launchwrapper.IClassTransformer;
@@ -16,6 +20,9 @@ import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
 import codechicken.lib.asm.ASMHelper;
 import codechicken.lib.asm.ASMInit;
 import codechicken.lib.asm.CC_ClassWriter;
@@ -23,10 +30,6 @@ import codechicken.lib.asm.ObfMapping;
 import codechicken.obfuscator.IHeirachyEvaluator;
 import codechicken.obfuscator.ObfuscationMap.ObfuscationEntry;
 import codechicken.obfuscator.ObfuscationRun;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 import cpw.mods.fml.common.asm.transformers.AccessTransformer;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 

src/main/java/codechicken/core/asm/MethodASMifier.java

@@ -1,6 +1,6 @@
 package codechicken.core.asm;
 
-import static org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.ASM4;
 
 import java.io.File;
 import java.io.PrintWriter;

src/main/java/codechicken/core/asm/TweakTransformer.java

@@ -1,6 +1,6 @@
 package codechicken.core.asm;
 
-import static codechicken.lib.asm.InsnComparator.*;
+import static codechicken.lib.asm.InsnComparator.findOnce;
 
 import java.util.Map;
 
@@ -11,10 +11,14 @@ import org.objectweb.asm.tree.JumpInsnNode;
 import org.objectweb.asm.tree.LabelNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import codechicken.lib.asm.*;
+import codechicken.lib.asm.ASMBlock;
+import codechicken.lib.asm.ASMInit;
+import codechicken.lib.asm.ASMReader;
+import codechicken.lib.asm.ModularASMTransformer;
 import codechicken.lib.asm.ModularASMTransformer.MethodReplacer;
 import codechicken.lib.asm.ModularASMTransformer.MethodTransformer;
 import codechicken.lib.asm.ModularASMTransformer.MethodWriter;
+import codechicken.lib.asm.ObfMapping;
 import codechicken.lib.config.ConfigTag;
 
 public class TweakTransformer implements IClassTransformer, Opcodes {

src/main/java/codechicken/core/gui/GuiScrollPane.java

@@ -1,6 +1,7 @@
 package codechicken.core.gui;
 
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Rectangle;
 
 import codechicken.lib.math.MathHelper;
 import codechicken.lib.vec.Rectangle4i;

src/main/java/codechicken/core/gui/GuiScrollSlot.java

@@ -1,6 +1,6 @@
 package codechicken.core.gui;
 
-import java.awt.*;
+import java.awt.Rectangle;
 
 import org.lwjgl.input.Keyboard;
 

src/main/java/codechicken/core/launch/CodeChickenCorePlugin.java

@@ -1,6 +1,7 @@
 package codechicken.core.launch;
 
-import java.awt.*;
+import java.awt.Desktop;
+import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -20,7 +21,11 @@ import javax.swing.event.HyperlinkListener;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import codechicken.core.asm.*;
+import codechicken.core.asm.CodeChickenCoreModContainer;
+import codechicken.core.asm.DelegatedTransformer;
+import codechicken.core.asm.MCPDeobfuscationTransformer;
+import codechicken.core.asm.Tags;
+import codechicken.core.asm.TweakTransformer;
 import codechicken.lib.config.ConfigTag;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
@@ -187,7 +192,8 @@ public class CodeChickenCorePlugin implements IFMLLoadingPlugin, IFMLCallHook {
     public String[] getASMTransformerClass() {
         versionCheck(mcVersion, "CodeChickenCore");
         return new String[] { "codechicken.lib.asm.ClassHeirachyManager", "codechicken.core.asm.TweakTransformer",
-                "codechicken.core.asm.DelegatedTransformer", "codechicken.core.asm.DefaultImplementationTransformer" };
+                "codechicken.core.asm.DelegatedTransformer", "codechicken.core.asm.DefaultImplementationTransformer",
+                "codechicken.lib.asm.RedirectorTransformer" };
     }
 
     @Override

src/main/java/codechicken/core/launch/DepLoader.java

@@ -1,35 +1,51 @@
 package codechicken.core.launch;
 
-import java.awt.*;
+import java.awt.Desktop;
 import java.awt.Dialog.ModalityType;
+import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.io.*;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JProgressBar;
+import javax.swing.WindowConstants;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 
 import net.minecraft.launchwrapper.LaunchClassLoader;
 
-import sun.misc.URLClassPath;
-import sun.net.util.URLUtil;
-
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -40,6 +56,8 @@ import cpw.mods.fml.relauncher.FMLLaunchHandler;
 import cpw.mods.fml.relauncher.IFMLCallHook;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
+import sun.misc.URLClassPath;
+import sun.net.util.URLUtil;
 
 /**
  * For autodownloading stuff. This is really unoriginal, mostly ripped off FML, credits to cpw.

src/main/java/codechicken/obfuscator/ConstantObfuscator.java

@@ -1,6 +1,7 @@
 package codechicken.obfuscator;
 
-import static org.objectweb.asm.tree.AbstractInsnNode.*;
+import static org.objectweb.asm.tree.AbstractInsnNode.LDC_INSN;
+import static org.objectweb.asm.tree.AbstractInsnNode.METHOD_INSN;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/codechicken/obfuscator/ObfuscationMap.java

@@ -7,11 +7,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import codechicken.lib.asm.ObfMapping;
-
 import com.google.common.base.Function;
 import com.google.common.collect.ArrayListMultimap;
 
+import codechicken.lib.asm.ObfMapping;
+
 public class ObfuscationMap {
 
     public class ObfuscationEntry {

src/main/resources/mcmod.info

@@ -7,6 +7,6 @@
     "version": "${modVersion}",
     "mcversion": "${minecraftVersion}",
     "url": "http://www.minecraftforum.net/topic/909223",
-    "authorList": ["ChickenBones"]
+    "authorList": ["ChickenBones", "GTNH Team"]
   }]
 }