Merge branch 'master' into stats

dependencies.gradle

@@ -16,17 +16,17 @@ dependencies {
 
     compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.2") { transitive = false }
 
-    transformedMod("com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev") // force a more up-to-date NEI version
-    transformedModCompileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-415-GTNH")
+    transformedMod("com.github.GTNewHorizons:NotEnoughItems:2.6.19-GTNH:dev") // force a more up-to-date NEI version
+    transformedModCompileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-423-GTNH")
     transformedModCompileOnly("com.github.GTNewHorizons:Baubles:1.0.4:dev")
     // Transitive updates to make runClient17 work
     transformedModCompileOnly("com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev")
-    transformedModCompileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.107:dev")
+    transformedModCompileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.123:dev")
     transformedModCompileOnly("com.github.GTNewHorizons:harvestcraft:1.2.1-GTNH:dev")
     transformedModCompileOnly("com.github.GTNewHorizons:HungerOverhaul:1.1.0-GTNH:dev")
     transformedModCompileOnly("com.github.GTNewHorizons:MrTJPCore:1.2.1:dev") // Do not update, fixed afterwards
     transformedModCompileOnly("com.github.GTNewHorizons:Railcraft:9.15.11:dev") { exclude group: "thaumcraft", module: "Thaumcraft" }
-    transformedModCompileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.5-GTNH:dev")
+    transformedModCompileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.6-GTNH:dev")
     transformedModCompileOnly(rfg.deobf("curse.maven:bibliocraft-228027:2423369"))
     transformedModCompileOnly("curse.maven:biomes-o-plenty-220318:2499612")
     transformedModCompileOnly("curse.maven:cofh-core-69162:2388751")
@@ -44,7 +44,7 @@ dependencies {
     transformedModCompileOnly(rfg.deobf("curse.maven:glibys-voice-chat-225110:2301492"))
 
     transformedModCompileOnly(rfg.deobf("curse.maven:automagy-222153:2285272"))
-    transformedModCompileOnly("com.github.GTNewHorizons:Galacticraft:3.2.0-GTNH:dev")
+    transformedModCompileOnly("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev")
     transformedModCompileOnly("curse.maven:minechem-368422:2905830")
     transformedModCompileOnly("curse.maven:thermal-dynamics-227443:2388756")
     transformedModCompileOnly("curse.maven:thermal-expansion-69163:2388759")
@@ -57,6 +57,7 @@ dependencies {
     transformedModCompileOnly(deobfNotch("https://mediafiles.forgecdn.net/files/2462/146/mod_voxelMap_1.7.0b_for_1.7.10.litemod"))
     transformedModCompileOnly(rfg.deobf("curse.maven:xaeros-world-map-317780:4716737"))
     transformedModCompileOnly(deobf("https://forum.industrial-craft.net/core/attachment/4316-advancedsolarpanel-1-7-10-3-5-1-jar/"))
+    transformedModCompileOnly(rfg.deobf("curse.maven:candycraft-251118:2330488"))
 
     runtimeOnly(deobf("https://github.com/makamys/CoreTweaks/releases/download/0.3.3.2/CoreTweaks-1.7.10-0.3.3.2+nomixin.jar"))
 }

gradle.properties

@@ -82,6 +82,11 @@ accessTransformersFile = hodgepodge_at.cfg
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = true
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = true
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.24'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.25'
 }
 
 

src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java

@@ -395,6 +395,13 @@ public class FixesConfig {
     @Config.RequiresMcRestart
     public static boolean removeBOPWarning;
 
+    // Candycraft
+
+    @Config.Comment("Fix NPE when interacting with sugar block")
+    @Config.DefaultBoolean(true)
+    @Config.RequiresMcRestart
+    public static boolean fixCandycraftBlockSugarNPE;
+
     // Extra TiC
 
     @Config.Comment("Disable ExtraTic's Integration with Metallurgy 3 Precious Materials Module: (Brass, Silver, Electrum & Platinum)")

src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java

@@ -840,7 +840,12 @@ public enum Mixins {
     DISABLE_MODDED_CHUNK_POPULATION(new Builder("Disable all other mod chunk population (e.g. Natura clouds")
             .setPhase(Phase.EARLY).addMixinClasses("minecraft.MixinChunkProviderServer_DisableModGeneration")
             .addTargetedMod(TargetedMod.VANILLA).setSide(Side.BOTH)
-            .setApplyIf(() -> TweaksConfig.disableModdedChunkPopulation));
+            .setApplyIf(() -> TweaksConfig.disableModdedChunkPopulation)),
+
+    // Candycraft
+    FIX_SUGARBLOCK_NPE(new Builder("Fix NPE when interacting with sugar block")
+            .addMixinClasses("candycraft.MixinBlockSugar").setPhase(Phase.LATE).setSide(Side.BOTH)
+            .setApplyIf(() -> FixesConfig.fixCandycraftBlockSugarNPE).addTargetedMod(TargetedMod.CANDYCRAFT));
 
     private final List<String> mixinClasses;
     private final List<TargetedMod> targetedMods;

src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java

@@ -15,6 +15,7 @@ public enum TargetedMod {
     BOP("BiomesOPlenty", null, "BiomesOPlenty"),
     BUGTORCH("BugTorch", "jss.bugtorch.mixinplugin.BugTorchEarlyMixins", "bugtorch"),
     BUKKIT("Bukkit/Thermos", "Bukkit", null),
+    CANDYCRAFT("candycraftmod", null, "candycraftmod"),
     COFH_CORE("CoFHCore", "cofh.asm.LoadingPlugin", "CoFHCore"),
     DAMAGE_INDICATORS("Damage Indicators", null, "DamageIndicatorsMod"),
     EXTRATIC("ExtraTiC", null, "ExtraTiC"),

src/main/java/com/mitchej123/hodgepodge/mixins/late/candycraft/MixinBlockSugar.java

@@ -0,0 +1,24 @@
+package com.mitchej123.hodgepodge.mixins.late.candycraft;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.valentin4311.candycraftmod.BlockSugar;
+
+@Mixin(BlockSugar.class)
+public class MixinBlockSugar {
+
+    @Inject(at = @At("HEAD"), cancellable = true, method = "onBlockActivated")
+    private void hodgepodge$fixNPE(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer,
+            int par6, float par7, float par8, float par9, CallbackInfoReturnable<Boolean> cir) {
+        if (par5EntityPlayer.getCurrentEquippedItem() == null) {
+            cir.setReturnValue(false);
+        }
+    }
+
+}