diff --git a/dependencies.gradle b/dependencies.gradle index d84e5999b..7c8d65c6a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,17 +1,17 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles:1.0.4:dev') - api('com.github.GTNewHorizons:GTNHLib:0.6.11:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') + api('com.github.GTNewHorizons:GTNHLib:0.6.24:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false} compileOnly('com.github.GTNewHorizons:ModularUI2:2.2.4-1.7.10:dev') // runtimeOnlyNonPublishable('com.github.GTNewHorizons:ModularUI2:2.2.4-1.7.10:dev') compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev') - compileOnly('com.github.GTNewHorizons:Railcraft:9.16.3:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Railcraft:9.16.28:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.2-GTNH:api') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') diff --git a/gradle.properties b/gradle.properties index bdf4abc32..63cabb222 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ modId = Botania modGroup = vazkii.botania # Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +# When false, com.github.GTNewHorizons is used. useModGroupForPublishing = false # Updates your build.gradle and settings.gradle automatically whenever an update is available. diff --git a/settings.gradle b/settings.gradle index 42601a0f9..ff436f2c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.36' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' } diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 9e6055b7a..f1cf7a14d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -35,7 +35,7 @@ public final class DebugHandler { @SubscribeEvent public void onDrawDebugText(RenderGameOverlayEvent.Text event) { World world = Minecraft.getMinecraft().theWorld; - if(Minecraft.getMinecraft().gameSettings.showDebugInfo) { + if(Minecraft.getMinecraft().gameSettings.showDebugInfo && ConfigHandler.showF3Debug) { event.left.add(null); String version = LibMisc.VERSION; if(version.contains("GRADLE")) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 7276e58e0..b6e80ff45 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -48,6 +48,8 @@ public final class ConfigHandler { public static boolean enableDefaultRecipes = true; + public static boolean showF3Debug = true; + public static boolean useShaders = true; public static boolean lexiconRotatingItems = true; public static boolean lexiconJustifiedText = false; @@ -210,6 +212,9 @@ public final class ConfigHandler { desc = "The ID of the dimension to use"; fancySkyboxDimensions = loadPropIntSet("fancySkybox.customDimID", desc, fancySkyboxDimensions); + desc = "Turn on or off the debug info in the F3 screen ingame"; + showF3Debug = loadPropBool("showF3Debug", desc, showF3Debug); + desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight);