diff --git a/dependencies.gradle b/dependencies.gradle index 7db4e798..77a59451 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,14 +4,14 @@ dependencies { api("com.github.GTNewHorizons:BrandonsCore:1.2.0-GTNH:dev") api("curse.maven:cofh-lib-220333:2388748") - compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.17:api") {transitive = false} - compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.0-GTNH:api") {transitive = false} - compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.9-GTNH:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.2:api") {transitive = false} + compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.4-GTNH:api") {transitive = false} + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.39-GTNH:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.8:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:dev") {transitive = false} - compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.0-GTNH:dev') {transitive = false} - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.31:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:GTNHLib:0.7.0:dev") {transitive = false} + compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev') {transitive = false} + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.117:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.9:dev") {transitive = false} compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false} compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false} diff --git a/gradle.properties b/gradle.properties index cb681a6e..82ebb64c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -96,7 +96,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -172,6 +174,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. customArchiveBaseName = Draconic-Evolution +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..d4081da4 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.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 9f80246c..e883289b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48' } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java index 0468fff0..1ef634aa 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java @@ -383,11 +383,12 @@ public class ConfigHandler { "Use this to adjust how quickly the reactor uses fuel", 0, 1000000).getDouble(1); - linearReactorFuelUsage = config.get( - "Draconic Reactor", - "linearReactorFuelUsage", - linearReactorFuelUsage, - "Sets whether the reactor should use linear (true) fuel usage formula or exponential (false)") + linearReactorFuelUsage = config + .get( + "Draconic Reactor", + "linearReactorFuelUsage", + linearReactorFuelUsage, + "Sets whether the reactor should use linear (true) fuel usage formula or ^0.3 (false)") .getBoolean(true); reactorFuelStorage = config.get( "Draconic Reactor", diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/DragonChunkLoader.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/DragonChunkLoader.java index 852d6536..c49af295 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/DragonChunkLoader.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/DragonChunkLoader.java @@ -11,7 +11,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.LoadingCallback; import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.MinecraftForge; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.entity.EntityChaosGuardian; @@ -22,12 +21,11 @@ import com.brandon3055.draconicevolution.common.entity.EntityChaosGuardian; public class DragonChunkLoader implements LoadingCallback { public static DragonChunkLoader instance; - public static Map ticketList = new HashMap(); + public static Map ticketList = new HashMap<>(); public static boolean hasReportedIssue = false; public static void init() { instance = new DragonChunkLoader(); - MinecraftForge.EVENT_BUS.register(instance); ForgeChunkManager.setForcedChunkLoadingCallback(DraconicEvolution.instance, instance); } @@ -64,7 +62,7 @@ public class DragonChunkLoader implements LoadingCallback { if (ticket == null || guardian.ticksExisted % 4 != 0) return; - Set dragonChunks = new HashSet(); + Set dragonChunks = new HashSet<>(); for (int xx = guardian.chunkCoordX - 1; xx <= guardian.chunkCoordX + 1; xx++) { for (int zz = guardian.chunkCoordZ - 1; zz <= guardian.chunkCoordZ + 1; zz++) { @@ -72,8 +70,8 @@ public class DragonChunkLoader implements LoadingCallback { } } - Set toLoad = new HashSet(); - Set toUnload = new HashSet(); + Set toLoad = new HashSet<>(); + Set toUnload = new HashSet<>(); for (ChunkCoordIntPair pair : ticket.getChunkList()) { if (!contains(dragonChunks, pair)) toUnload.add(pair); diff --git a/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java b/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java index 49a062d5..8f26a296 100644 --- a/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java @@ -112,6 +112,7 @@ public class ModHelper { case GAS -> "HazmatGas"; case HEAT -> "HazmatHeat"; case RADIOLOGICAL -> "HazmatRadiological"; + case SPACE -> "HazmatSpace"; }; } }