Clean up buildscript (#120)

embeddedt · Jun 6, 2024 · 3004d75 · 3004d75
1 parent b87bfdc
commit 3004d75
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 57 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,9 +1,6 @@
 // Add your dependencies here
 
 dependencies {
-    // Provides deobf support like in FG2
-    implementation('com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev')
-    implementation('com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev')
     compileOnly("curse.maven:chickenchunks-229316:2233250")
     compileOnly("mrtjp:MrTJPCore:1.7.10-1.1.0.33:dev") {
         transitive = false
@@ -13,7 +10,7 @@ dependencies {
         transitive = false
     }
     compileOnly "curse.maven:chunkpregen-267193:3756388"
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.3.46-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.1-GTNH:dev')
     compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.15.01:dev") {
         transitive = false
     }
@@ -22,7 +19,7 @@ dependencies {
     compileOnly("curse.maven:thermalexpansion-69163:2388759")
     compileOnly("curse.maven:matteroverdrive-229694:2331162")
     compileOnly("curse.maven:projecte-226410:2340786")
-    compileOnly('com.github.GTNewHorizons:Botania:1.9.19-GTNH:dev') {
+    compileOnly('com.github.GTNewHorizons:Botania:1.11.3-GTNH:dev') {
         transitive = false
     }
     compileOnly("org.projectlombok:lombok:1.18.22") {
@@ -45,4 +42,8 @@ dependencies {
 
     compileOnly files("deps/Food Plus Mod 1.7.10-deobf.jar")
     compileOnly(deobfMaven(curseMaven, "curse.maven:dragonapi-235591:3574508"))
+
+    // Provides deobf support like in FG2
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenLib:1.2.1:dev')
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.2.1:dev')
 }
diff --git a/gradle.properties b/gradle.properties
@@ -45,7 +45,7 @@ enableModernJavaSyntax = false
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-enableGenericInjection = false
+enableGenericInjection = true
 
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.
@@ -56,13 +56,13 @@ generateGradleTokenClass = org.embeddedt.archaicfix.Tags
 gradleTokenVersion = VERSION
 
 # [DEPRECATED] Mod ID replacement token.
-gradleTokenModId = MODID
+gradleTokenModId =
 
 # [DEPRECATED] Mod name replacement token.
-gradleTokenModName = MODNAME
+gradleTokenModName =
 
 # [DEPRECATED] Mod Group replacement token.
-gradleTokenGroupName = GROUPNAME
+gradleTokenGroupName =
 
 # [DEPRECATED]
 # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java

diff --git a/repositories.gradle b/repositories.gradle
@@ -7,17 +7,6 @@ repositories {
         name = "sonatype"
         url = "https://oss.sonatype.org/content/repositories/snapshots/"
     }
-    maven {
-        name = "GTNH Maven"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-        allowInsecureProtocol
-    }
-    maven {
-        url "https://cursemaven.com"
-        content {
-            includeGroup "curse.maven"
-        }
-    }
     maven {
         name "mvnmrtjp"
         url "http://files.projectredwiki.com/maven"

diff --git a/src/main/java/org/embeddedt/archaicfix/ArchaicFix.java b/src/main/java/org/embeddedt/archaicfix/ArchaicFix.java
@@ -11,7 +11,6 @@
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
@@ -28,7 +27,8 @@
 @Mod(modid = ArchaicFix.MODID, version = ArchaicFix.VERSION, dependencies = "required-after:gtnhmixins@[2.0.0,);", guiFactory = "org.embeddedt.archaicfix.config.ArchaicGuiConfigFactory")
 public class ArchaicFix
 {
-    public static final String MODID = Tags.MODID;
+    public static final String MODID = "archaicfix";
+    public static final String MODNAME = "ArchaicFix";
     public static final String VERSION = Tags.VERSION;
 
     private FixHelper helper;
@@ -48,9 +48,7 @@ public void onConstruct(FMLConstructionEvent event) {
             ArchaicLogger.LOGGER.fatal("A version of GG Util that includes threaded lighting was detected. ArchaicFix has prevented launching to avoid issues. Please download a fixed version of GG Util: https://www.curseforge.com/minecraft/mc-mods/gilded-game-utils-fix.");
             ArchaicLogger.LOGGER.fatal("===============================================");
             throw new UnsupportedOperationException("Please download a fixed version of GG Util: https://www.curseforge.com/minecraft/mc-mods/gilded-game-utils-fix");
-        } catch(ClassNotFoundException e) {
-
-        }
+        } catch (ClassNotFoundException ignored) {}
     }
 
     @EventHandler
@@ -90,19 +88,20 @@ public void serverStarted(FMLServerStartedEvent event) {
     }
 
     private void printRecipeDebug() {
-        if(!ArchaicConfig.cacheRecipes)
+        if (!ArchaicConfig.cacheRecipes)
             return;
+
         HashMap<Class<? extends IRecipe>, Integer> recipeTypeMap = new HashMap<>();
-        for(Object o : CraftingManager.getInstance().getRecipeList()) {
-            recipeTypeMap.compute(((IRecipe)o).getClass(), (key, oldValue) -> {
-                if(oldValue == null)
+        for (IRecipe o : CraftingManager.getInstance().getRecipeList()) {
+            recipeTypeMap.compute(o.getClass(), (key, oldValue) -> {
+                if (oldValue == null)
                     return 1;
                 else
                     return oldValue + 1;
             });
         }
         recipeTypeMap.entrySet().stream()
-                .sorted(Comparator.comparingInt(pair -> pair.getValue()))
+                .sorted(Comparator.comparingInt(Map.Entry::getValue))
                 .forEach(pair -> {
                     String acceleratedSuffix = IAcceleratedRecipe.class.isAssignableFrom(pair.getKey()) ? " (accelerated)" : "";
                     ArchaicLogger.LOGGER.info("There are " + pair.getValue() + " recipes of type " + pair.getKey().getName() + acceleratedSuffix);
@@ -113,15 +112,14 @@ private void printRecipeDebug() {
     }
 
     private void removeThaumcraftLeak() {
-        if(!Loader.isModLoaded("Thaumcraft")) {
+        if (!Loader.isModLoaded("Thaumcraft")) {
             boolean thaumcraftGhostApiPresent = false;
             try {
                 Class.forName("thaumcraft.api.ThaumcraftApi");
                 thaumcraftGhostApiPresent = true;
-            } catch(Exception e) {
+            } catch (Exception ignored) {}
 
-            }
-            if(thaumcraftGhostApiPresent) {
+            if (thaumcraftGhostApiPresent) {
                 try {
                     ArchaicLogger.LOGGER.info("Cleared " + ThaumcraftApi.objectTags.size() + " unused Thaumcraft aspects");
                     ThaumcraftApi.objectTags.clear();
@@ -138,8 +136,6 @@ private void removeThaumcraftLeak() {
         }
     }
 
-
-
     @EventHandler
     public void loadComplete(FMLLoadCompleteEvent event) {
         proxy.loadcomplete();
@@ -150,8 +146,8 @@ public void loadComplete(FMLLoadCompleteEvent event) {
     @NetworkCheckHandler
     public boolean doVersionCheck(Map<String, String> mods, Side side) {
         /*
-        if(mods.containsKey(Tags.MODID)) {
-            String otherVersion = mods.get(Tags.MODID);
+        if (mods.containsKey(MODID)) {
+            String otherVersion = mods.get(MODID);
             if(!otherVersion.equals(Tags.VERSION)) {
                 ArchaicLogger.LOGGER.error("Remote side " + side + " has different version " + otherVersion);
                 return false;

diff --git a/src/main/java/org/embeddedt/archaicfix/config/ArchaicConfig.java b/src/main/java/org/embeddedt/archaicfix/config/ArchaicConfig.java
@@ -1,8 +1,8 @@
 package org.embeddedt.archaicfix.config;
 
-import org.embeddedt.archaicfix.Tags;
+import static org.embeddedt.archaicfix.ArchaicFix.MODID;
 
-@Config(modid = Tags.MODID)
+@Config(modid = MODID)
 public class ArchaicConfig {
     @Config.DefaultBoolean(true)
     public static boolean hideDownloadingTerrainScreen;

diff --git a/src/main/java/org/embeddedt/archaicfix/config/ArchaicGuiConfig.java b/src/main/java/org/embeddedt/archaicfix/config/ArchaicGuiConfig.java
@@ -3,8 +3,11 @@
 import net.minecraft.client.gui.GuiScreen;
 import org.embeddedt.archaicfix.Tags;
 
+import static org.embeddedt.archaicfix.ArchaicFix.MODID;
+import static org.embeddedt.archaicfix.ArchaicFix.MODNAME;
+
 public class ArchaicGuiConfig extends SimpleGuiConfig {
     public ArchaicGuiConfig(GuiScreen parent) throws ConfigException {
-        super(parent, ArchaicConfig.class, Tags.MODID, Tags.MODNAME);
+        super(parent, ArchaicConfig.class, MODID, MODNAME);
     }
 }
diff --git a/src/main/java/org/embeddedt/archaicfix/proxy/ClientProxy.java b/src/main/java/org/embeddedt/archaicfix/proxy/ClientProxy.java
@@ -1,39 +1,23 @@
 package org.embeddedt.archaicfix.proxy;
 
-import com.google.common.base.Objects;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.Direction;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.client.event.EntityViewRenderEvent;
 import net.minecraftforge.client.event.GuiOpenEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.sound.SoundLoadEvent;
-import net.minecraftforge.client.event.sound.SoundSetupEvent;
 import net.minecraftforge.common.MinecraftForge;
-import org.embeddedt.archaicfix.ArchaicFix;
 import org.embeddedt.archaicfix.ArchaicLogger;
 import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.embeddedt.archaicfix.helpers.BuiltInResourcePack;
 import org.embeddedt.archaicfix.helpers.SoundDeviceThread;
 import zone.rong.loliasm.api.LoliStringPool;
 
 import java.lang.management.ManagementFactory;
-import java.util.Locale;
 
 public class ClientProxy extends CommonProxy {
     SoundDeviceThread soundThread = null;