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 e147b59..67dbf60 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,6 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:Avaritia:1.37:dev' - compileOnly 'com.github.GTNewHorizons:NotEnoughItems:2.3.43-GTNH:dev' + api 'com.github.GTNewHorizons:Avaritia:1.48:dev' + compileOnly 'com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev' } diff --git a/gradle.properties b/gradle.properties index 183b8ac..7fad74e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -65,6 +65,3 @@ customArchiveBaseName = Universal-Singularities # Optional parameter to prevent the source code from being published # noPublishedSources = - -# 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 aff7a1d..c227b16 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,16 +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 { - name = "ChickenBones Maven" - url = "https://chickenbones.net/maven/" - } - maven { - name = "jitpack" - url = "https://jitpack.io" - } } diff --git a/src/main/java/wealthyturtle/uiesingularities/UniversalSingularityMod.java b/src/main/java/wealthyturtle/uiesingularities/UniversalSingularityMod.java index 9a392bc..38b7c97 100644 --- a/src/main/java/wealthyturtle/uiesingularities/UniversalSingularityMod.java +++ b/src/main/java/wealthyturtle/uiesingularities/UniversalSingularityMod.java @@ -1,13 +1,18 @@ package wealthyturtle.uiesingularities; -import static wealthyturtle.uiesingularities.Reference.*; +import static wealthyturtle.uiesingularities.Reference.CLIENT_PROXY; +import static wealthyturtle.uiesingularities.Reference.COMMON_PROXY; +import static wealthyturtle.uiesingularities.Reference.MC_VERSION; +import static wealthyturtle.uiesingularities.Reference.MOD_ID; +import static wealthyturtle.uiesingularities.Reference.MOD_NAME; +import static wealthyturtle.uiesingularities.Reference.MOD_VERSION; -import wealthyturtle.uiesingularities.proxy.CommonProxy; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import wealthyturtle.uiesingularities.proxy.CommonProxy; @SuppressWarnings("unused") @Mod( diff --git a/src/main/java/wealthyturtle/uiesingularities/proxy/CommonProxy.java b/src/main/java/wealthyturtle/uiesingularities/proxy/CommonProxy.java index ae53968..416f156 100644 --- a/src/main/java/wealthyturtle/uiesingularities/proxy/CommonProxy.java +++ b/src/main/java/wealthyturtle/uiesingularities/proxy/CommonProxy.java @@ -4,7 +4,14 @@ import static fox.spiteful.avaritia.Config.craftingOnly; import static java.io.File.separatorChar; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import javax.annotation.Nonnull; @@ -13,15 +20,15 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.oredict.OreDictionary; -import wealthyturtle.uiesingularities.NEI; -import wealthyturtle.uiesingularities.UniversalSingularity; -import wealthyturtle.uiesingularities.UniversalSingularityItem; -import wealthyturtle.uiesingularities.UniversalSingularityWrapper; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.crafting.CompressorManager; import fox.spiteful.avaritia.crafting.Grinder; +import wealthyturtle.uiesingularities.NEI; +import wealthyturtle.uiesingularities.UniversalSingularity; +import wealthyturtle.uiesingularities.UniversalSingularityItem; +import wealthyturtle.uiesingularities.UniversalSingularityWrapper; public class CommonProxy {