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 be044bf..a13b744 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,12 @@ // Add your dependencies here dependencies { - compile("com.github.GTNewHorizons:ForbiddenMagic:master-SNAPSHOT:dev") - compile("com.github.GTNewHorizons:Tainted-Magic:master-SNAPSHOT:dev") - compile("com.github.GTNewHorizons:BloodMagic:master-SNAPSHOT:dev") + api("com.github.GTNewHorizons:ForbiddenMagic:0.6.7-GTNH:dev") + api("com.github.GTNewHorizons:Tainted-Magic:8.1.1.1-GTNH:dev") + api("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") - compile("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") + api("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") + api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - runtimeOnly("com.github.GTNewHorizons:Baubles:master-SNAPSHOT:dev") + runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.3:dev") } diff --git a/repositories.gradle b/repositories.gradle index ac9b07c..c227b16 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,15 +1,4 @@ // Add any additional repositories for your dependencies here repositories { - maven { - name = "ic2" - url = "http://maven.ic2.player.to/" - metadataSources { - mavenPom() - artifact() - } - } - maven { - url = "https://jitpack.io" - } } diff --git a/src/main/java/shukaro/nodalmechanics/NodalMechanics.java b/src/main/java/shukaro/nodalmechanics/NodalMechanics.java index eb42174..bf32233 100644 --- a/src/main/java/shukaro/nodalmechanics/NodalMechanics.java +++ b/src/main/java/shukaro/nodalmechanics/NodalMechanics.java @@ -5,16 +5,16 @@ import net.minecraft.util.StatCollector; import org.apache.logging.log4j.Logger; -import shukaro.nodalmechanics.gui.NodalTab; -import shukaro.nodalmechanics.items.NodalItems; -import shukaro.nodalmechanics.net.CommonProxy; -import shukaro.nodalmechanics.recipe.NodalRecipes; -import shukaro.nodalmechanics.research.NodalResearch; 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 shukaro.nodalmechanics.gui.NodalTab; +import shukaro.nodalmechanics.items.NodalItems; +import shukaro.nodalmechanics.net.CommonProxy; +import shukaro.nodalmechanics.recipe.NodalRecipes; +import shukaro.nodalmechanics.research.NodalResearch; @Mod( modid = NodalMechanics.modID, diff --git a/src/main/java/shukaro/nodalmechanics/items/ItemMatrix.java b/src/main/java/shukaro/nodalmechanics/items/ItemMatrix.java index 5d90cb0..81b8d29 100644 --- a/src/main/java/shukaro/nodalmechanics/items/ItemMatrix.java +++ b/src/main/java/shukaro/nodalmechanics/items/ItemMatrix.java @@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector; import org.apache.commons.lang3.text.WordUtils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shukaro.nodalmechanics.NodalMechanics; import shukaro.nodalmechanics.util.FormatCodes; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemMatrix extends Item { diff --git a/src/main/java/shukaro/nodalmechanics/recipe/NodalRecipes.java b/src/main/java/shukaro/nodalmechanics/recipe/NodalRecipes.java index 1fa16d3..76ae67c 100644 --- a/src/main/java/shukaro/nodalmechanics/recipe/NodalRecipes.java +++ b/src/main/java/shukaro/nodalmechanics/recipe/NodalRecipes.java @@ -6,6 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; +import fox.spiteful.forbidden.DarkAspects; +import fox.spiteful.forbidden.items.ForbiddenItems; +import ic2.core.Ic2Items; import shukaro.nodalmechanics.items.NodalItems; import thaumcraft.api.ItemApi; import thaumcraft.api.ThaumcraftApi; @@ -13,9 +16,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.crafting.ShapedArcaneRecipe; -import fox.spiteful.forbidden.DarkAspects; -import fox.spiteful.forbidden.items.ForbiddenItems; -import ic2.core.Ic2Items; public class NodalRecipes {