diff --git a/build.gradle b/build.gradle index 952a3c5..3eb19a2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1704650211 +//version: 1704751096 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -786,7 +786,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} diff --git a/dependencies.gradle b/dependencies.gradle index 9df151c..cfdf91d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,10 @@ // Add your dependencies here dependencies { - compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.5:dev") { + compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ZenScript:master-SNAPSHOT") { + compileOnly("com.github.GTNewHorizons:ZenScript:1.0.0-GTNH") { transitive = false } } diff --git a/gradle.properties b/gradle.properties index 8566c79..52540fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -62,6 +62,3 @@ usesShadowedDependencies = false # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older # projects. New projects should not use this parameter. customArchiveBaseName = WanionLib - -# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates -disableCheckstyle = true diff --git a/repositories.gradle b/repositories.gradle index 036d7c2..c227b16 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,11 +1,4 @@ // Add any additional repositories for your dependencies here repositories { - maven { - name = "GTNH Maven" - url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - } - maven { - url = "https://jitpack.io" - } } diff --git a/src/main/java/wanion/lib/WanionLib.java b/src/main/java/wanion/lib/WanionLib.java index f197fac..b6f7e1f 100644 --- a/src/main/java/wanion/lib/WanionLib.java +++ b/src/main/java/wanion/lib/WanionLib.java @@ -6,19 +6,22 @@ * http://mozilla.org/MPL/2.0/. */ -import static wanion.lib.Reference.*; +import static wanion.lib.Reference.ACCEPTED_MINECRAFT; +import static wanion.lib.Reference.MOD_ID; +import static wanion.lib.Reference.MOD_NAME; +import static wanion.lib.Reference.MOD_VERSION; import java.util.Map; import org.apache.logging.log4j.Logger; -import wanion.lib.client.ClientTickHandler; -import wanion.lib.common.Dependencies; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import wanion.lib.client.ClientTickHandler; +import wanion.lib.common.Dependencies; @Mod(modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, acceptedMinecraftVersions = ACCEPTED_MINECRAFT) public final class WanionLib { diff --git a/src/main/java/wanion/lib/client/ClientTickHandler.java b/src/main/java/wanion/lib/client/ClientTickHandler.java index cff278a..fbd65bb 100644 --- a/src/main/java/wanion/lib/client/ClientTickHandler.java +++ b/src/main/java/wanion/lib/client/ClientTickHandler.java @@ -11,13 +11,13 @@ import javax.annotation.Nonnull; -import wanion.lib.WanionLib; -import wanion.lib.client.animation.Animation; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import wanion.lib.WanionLib; +import wanion.lib.client.animation.Animation; @SideOnly(Side.CLIENT) public final class ClientTickHandler implements WanionLib.IDependency { diff --git a/src/main/java/wanion/lib/common/MineTweakerHelper.java b/src/main/java/wanion/lib/common/MineTweakerHelper.java index 30e8ac6..8718c51 100644 --- a/src/main/java/wanion/lib/common/MineTweakerHelper.java +++ b/src/main/java/wanion/lib/common/MineTweakerHelper.java @@ -6,14 +6,14 @@ * http://mozilla.org/MPL/2.0/. */ +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.oredict.IOreDictEntry; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - @SuppressWarnings("unused") public final class MineTweakerHelper { diff --git a/src/main/java/wanion/lib/module/AbstractModule.java b/src/main/java/wanion/lib/module/AbstractModule.java index 98f35e0..9a3aa10 100644 --- a/src/main/java/wanion/lib/module/AbstractModule.java +++ b/src/main/java/wanion/lib/module/AbstractModule.java @@ -6,7 +6,12 @@ * http://mozilla.org/MPL/2.0/. */ -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/wanion/lib/module/LoadStage.java b/src/main/java/wanion/lib/module/LoadStage.java index 0ffbc7e..e0305ad 100644 --- a/src/main/java/wanion/lib/module/LoadStage.java +++ b/src/main/java/wanion/lib/module/LoadStage.java @@ -8,7 +8,11 @@ import javax.annotation.Nonnull; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLStateEvent; public enum LoadStage { diff --git a/src/main/java/wanion/lib/recipe/RecipeHelper.java b/src/main/java/wanion/lib/recipe/RecipeHelper.java index fb9a07a..67d7524 100644 --- a/src/main/java/wanion/lib/recipe/RecipeHelper.java +++ b/src/main/java/wanion/lib/recipe/RecipeHelper.java @@ -12,10 +12,10 @@ import net.minecraft.item.ItemStack; -import wanion.lib.common.MetaItem; import gnu.trove.map.TObjectCharMap; import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.TObjectCharHashMap; +import wanion.lib.common.MetaItem; public final class RecipeHelper {