diff options
50 files changed, 141 insertions, 169 deletions
diff --git a/build.gradle b/build.gradle index f82d369676..17e7501a27 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1681680742 +//version: 1682616243 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,29 +6,25 @@ */ -import com.diffplug.blowdryer.Blowdryer -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask +import com.gtnewhorizons.retrofuturagradle.util.Distribution import com.matthewprenger.cursegradle.CurseArtifact import com.matthewprenger.cursegradle.CurseRelation import com.modrinth.minotaur.dependencies.ModDependency import com.modrinth.minotaur.dependencies.VersionDependency -import cpw.mods.fml.relauncher.Side -import org.gradle.api.tasks.options.Option; import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory import org.gradle.internal.xml.XmlTransformer -import org.jetbrains.gradle.ext.* +import org.jetbrains.gradle.ext.Application +import org.jetbrains.gradle.ext.Gradle +import javax.inject.Inject import java.nio.file.Files import java.nio.file.Paths import java.util.concurrent.TimeUnit -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream -import javax.inject.Inject buildscript { repositories { @@ -66,14 +62,14 @@ plugins { id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle - id 'com.github.johnrengelman.shadow' version '7.1.2' apply false + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.palantir.git-version' version '3.0.0' apply false - id 'de.undercouch.download' version '5.3.0' + id 'de.undercouch.download' version '5.4.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle - id 'com.diffplug.spotless' version '6.7.2' apply false + id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.5' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -133,7 +129,7 @@ propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new // this is meant to be set using the user wide property file. by default we do nothing. propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea" -project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts +project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts if (!disableSpotless) { apply plugin: 'com.diffplug.spotless' apply from: Blowdryer.file('spotless.gradle') @@ -408,7 +404,7 @@ minecraft { username = developmentEnvironmentUserName.toString() - lwjgl3Version = "3.3.2-SNAPSHOT" + lwjgl3Version = "3.3.2" // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") @@ -722,13 +718,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.3.3' + def lwjgl3ifyVersion = '1.3.5' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -802,7 +798,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } @Inject - public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) { + public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) { super(side, gradle) this.lwjglVersion = 3 @@ -811,7 +807,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) this.classpath(project.java17PatchDependenciesCfg) - if (side == Side.CLIENT) { + if (side == Distribution.CLIENT) { this.classpath(project.minecraftTasks.lwjgl3Configuration) } // Use a raw provider instead of map to not create a dependency on the task @@ -823,7 +819,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { } } -def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient") +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") runClient17Task.configure { setup(project) group = "Modded Minecraft" @@ -834,7 +830,7 @@ runClient17Task.configure { userUUID = minecraft.userUUID } -def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer") +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") runServer17Task.configure { setup(project) group = "Modded Minecraft" @@ -875,11 +871,6 @@ tasks.named("jar", Jar).configure { } if (usesShadowedDependencies.toBoolean()) { - tasks.register('relocateShadowJar', ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = modGroup + ".shadow" - enabled = relocateShadowedDependencies.toBoolean() - } tasks.named("shadowJar", ShadowJar).configure { manifest { attributes(getManifestAttributes()) @@ -895,7 +886,8 @@ if (usesShadowedDependencies.toBoolean()) { ] archiveClassifier.set('dev') if (relocateShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -1228,7 +1220,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.0.2" +def buildscriptGradleVersion = "8.1.1" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion diff --git a/dependencies.gradle b/dependencies.gradle index 3b4296b0d1..29d840f3cd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.42.71:dev' - compile 'com.github.GTNewHorizons:TecTech:5.1.16:dev' - compile 'com.github.GTNewHorizons:bartworks:0.6.14:dev' + compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.43.07:dev' + compile 'com.github.GTNewHorizons:TecTech:5.2.1:dev' + compile 'com.github.GTNewHorizons:bartworks:0.7.1:dev' compile 'com.github.GTNewHorizons:StructureLib:1.2.6:dev' - compile 'com.github.GTNewHorizons:ThaumicTinkerer:2.6.13:dev' + compile 'com.github.GTNewHorizons:ThaumicTinkerer:2.7.0:dev' compile 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev' compileOnly 'org.joml:joml:1.10.2' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 943f0cbfa7..ccebba7710 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b1e..37aef8d3f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -144,7 +144,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=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java index 18def75a9e..58a30cd14d 100644 --- a/src/main/java/client/ClientProxy.java +++ b/src/main/java/client/ClientProxy.java @@ -1,14 +1,13 @@ package client; -import client.renderer.TESR_BeamTransmitter; -import client.renderer.TESR_SECapacitor; -import client.renderer.TESR_SETether; - import common.CommonProxy; import common.tileentities.TE_BeamTransmitter; import common.tileentities.TE_SpaceElevatorCapacitor; import common.tileentities.TE_SpaceElevatorTether; +import client.renderer.TESR_BeamTransmitter; +import client.renderer.TESR_SECapacitor; +import client.renderer.TESR_SETether; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; diff --git a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java index 2a673f16db..d98417f686 100644 --- a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java +++ b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java @@ -1,7 +1,5 @@ package client.gui; -import kekztech.KekzCore; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -15,6 +13,8 @@ import org.lwjgl.opengl.GL11; import common.container.Container_ItemProxyEndpoint; +import kekztech.KekzCore; + public class Gui_ItemProxyEndpoint extends GuiContainer { private final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/client/gui/Gui_ItemProxySource.java b/src/main/java/client/gui/Gui_ItemProxySource.java index 1c1b0171e6..8618ff828f 100644 --- a/src/main/java/client/gui/Gui_ItemProxySource.java +++ b/src/main/java/client/gui/Gui_ItemProxySource.java @@ -1,7 +1,5 @@ package client.gui; -import kekztech.KekzCore; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -15,6 +13,8 @@ import org.lwjgl.opengl.GL11; import common.container.Container_ItemProxySource; +import kekztech.KekzCore; + public class Gui_ItemProxySource extends GuiContainer { private final ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTech4by4.png"); diff --git a/src/main/java/client/gui/KT_UITextures.java b/src/main/java/client/gui/KT_UITextures.java index ffca0b6813..5e7cf2981a 100644 --- a/src/main/java/client/gui/KT_UITextures.java +++ b/src/main/java/client/gui/KT_UITextures.java @@ -1,9 +1,9 @@ package client.gui; -import kekztech.KekzCore; - import com.gtnewhorizons.modularui.api.drawable.UITexture; +import kekztech.KekzCore; + public class KT_UITextures { public static final UITexture OVERLAY_BUTTON_WIRELESS_ON = UITexture diff --git a/src/main/java/client/renderer/TESR_BeamTransmitter.java b/src/main/java/client/renderer/TESR_BeamTransmitter.java index 0028c53476..e6e31f80d5 100644 --- a/src/main/java/client/renderer/TESR_BeamTransmitter.java +++ b/src/main/java/client/renderer/TESR_BeamTransmitter.java @@ -1,7 +1,5 @@ package client.renderer; -import kekztech.KekzCore; - import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -13,6 +11,8 @@ import org.lwjgl.opengl.GL11; import common.tileentities.TE_BeamTransmitter; +import kekztech.KekzCore; + public class TESR_BeamTransmitter extends TileEntitySpecialRenderer { private static final ResourceLocation beamTexture = new ResourceLocation( diff --git a/src/main/java/client/renderer/TESR_SECapacitor.java b/src/main/java/client/renderer/TESR_SECapacitor.java index c4aed65e3d..0da33dee66 100644 --- a/src/main/java/client/renderer/TESR_SECapacitor.java +++ b/src/main/java/client/renderer/TESR_SECapacitor.java @@ -1,7 +1,5 @@ package client.renderer; -import kekztech.KekzCore; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -9,6 +7,8 @@ import net.minecraft.util.ResourceLocation; import common.tileentities.TE_SpaceElevatorCapacitor; +import kekztech.KekzCore; + public class TESR_SECapacitor extends TileEntitySpecialRenderer { private static final ResourceLocation capSide = new ResourceLocation( diff --git a/src/main/java/client/renderer/TESR_SETether.java b/src/main/java/client/renderer/TESR_SETether.java index 18672b21c9..5d5c0581c1 100644 --- a/src/main/java/client/renderer/TESR_SETether.java +++ b/src/main/java/client/renderer/TESR_SETether.java @@ -1,7 +1,5 @@ package client.renderer; -import kekztech.KekzCore; - import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -10,6 +8,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import kekztech.KekzCore; + public class TESR_SETether extends TileEntitySpecialRenderer { private static final ResourceLocation tetherBeamTexture = new ResourceLocation( diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index 3fccd0604c..f43482b909 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -1,7 +1,5 @@ package common; -import kekztech.KekzCore; - import net.minecraft.block.Block; import common.blocks.Block_GDCUnit; @@ -12,6 +10,8 @@ import common.blocks.Block_TFFTStorageField; import common.blocks.Block_ThaumiumReinforcedJar; import common.blocks.Block_YSZUnit; +import kekztech.KekzCore; + public class Blocks { public static Block yszUnit; diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java index f04e7052c5..3af1fd1671 100644 --- a/src/main/java/common/CommonProxy.java +++ b/src/main/java/common/CommonProxy.java @@ -1,9 +1,5 @@ package common; -import kekztech.GuiHandler; -import kekztech.Items; -import kekztech.KekzCore; - import common.items.ErrorItem; import common.items.MetaItem_CraftingComponent; import common.items.MetaItem_ReactorComponent; @@ -14,6 +10,9 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import gregtech.api.GregTech_API; +import kekztech.GuiHandler; +import kekztech.Items; +import kekztech.KekzCore; public class CommonProxy { diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 21149e1406..97a053f938 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -4,16 +4,8 @@ import static gregtech.api.enums.Mods.ThaumicTinkerer; import java.util.HashMap; -import kekztech.KekzCore; - import net.minecraft.item.ItemStack; -import thaumcraft.api.ItemApi; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.InfusionRecipe; - import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer; import common.recipeLoaders.AlloySmelter; import common.recipeLoaders.Assembler; @@ -30,6 +22,12 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +import kekztech.KekzCore; +import thaumcraft.api.ItemApi; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.InfusionRecipe; public class Recipes { diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java index 76f47bdd9d..853b9dba6b 100644 --- a/src/main/java/common/Researches.java +++ b/src/main/java/common/Researches.java @@ -1,9 +1,8 @@ package common; -import kekztech.KekzCore; - import net.minecraft.item.ItemStack; +import kekztech.KekzCore; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java index 9925e7aa27..9ad4fdb99f 100644 --- a/src/main/java/common/TileEntities.java +++ b/src/main/java/common/TileEntities.java @@ -10,6 +10,7 @@ import common.tileentities.TE_IchorJar; import common.tileentities.TE_IchorVoidJar; import common.tileentities.TE_ThaumiumReinforcedJar; import common.tileentities.TE_ThaumiumReinforcedVoidJar; + import cpw.mods.fml.common.registry.GameRegistry; public class TileEntities { diff --git a/src/main/java/common/blocks/Block_BeamTransmitter.java b/src/main/java/common/blocks/Block_BeamTransmitter.java index 9ed0233322..48bedd3b7f 100644 --- a/src/main/java/common/blocks/Block_BeamTransmitter.java +++ b/src/main/java/common/blocks/Block_BeamTransmitter.java @@ -1,7 +1,5 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -9,7 +7,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import common.tileentities.TE_BeamTransmitter; + import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; public class Block_BeamTransmitter extends Block { diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java index 3cbd544d50..7c86c9910f 100644 --- a/src/main/java/common/blocks/Block_ControlRod.java +++ b/src/main/java/common/blocks/Block_ControlRod.java @@ -1,12 +1,11 @@ package common.blocks; -import kekztech.KekzCore; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; |