Update deps and bump min neo version to 21.0.28-beta. Also made the following fixes while making things compile against breaking changes:

- Fixed the grav module not providing flight
- Fixed atomic disassembler and meka tool not providing any damage in newer Neo versions
- Rerun datagen to make the AE2 recipe integration function again
- Register more dummy classes to CraftTweaker so that it is able to properly resolve all the recipe managers we expose

Author: pupnewfster

README.md

@@ -29,7 +29,7 @@ of things that we haven't finished porting yet.
 ## Known Bugs/Things that aren't done being ported yet ##
 - Options in the Module Tweaker that have side effects don't currently have those side effects displayed
 - When breaking and placing blocks that have fluid item input slots, they do not persist whether the item was actively being drained or whether it was being filled
-- The Gravitational Modulation Unit does not currently provide flight
+- Fixed (Upcoming 10.6.2): The Gravitational Modulation Unit does not currently provide flight
 - Fixed (Upcoming 10.6.2): Resistive Heaters do not keep their set Energy Usage when breaking and placing again
 - Fixed (Upcoming 10.6.2): Bins forget if they are locked and what they are locked too if broken and placed
 - Fixed (Upcoming 10.6.2): The QIO Dashboard does not persist items stored in crafting windows when broken

annotation-processor/src/main/java/mekanism/builder/ComputerHandlerBuilder.java

@@ -16,6 +16,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -256,7 +257,7 @@ private void handleAtWrappingComputerMethod(Element annotatedElement, String ann
                       .orElse(null);
                 if (unformattedDescription != null) {
                     //format it
-                    methodDescription = String.format(unformattedDescription, docPlaceholder);
+                    methodDescription = String.format(Locale.ROOT, unformattedDescription, docPlaceholder);
                 }
             }
 

build.gradle

@@ -328,7 +328,7 @@ repositories { RepositoryHandler handler ->
         filter.includeGroup('org.openzen.zencode')
     })
     exclusiveRepo(handler, 'https://maven.terraformersmc.com/', 'dev.emi')
-    exclusiveRepo(handler, 'https://maven.theillusivec4.top/', 'top.theillusivec4.curios')
+    exclusiveRepo(handler, 'https://maven.octo-studios.com/releases/', 'top.theillusivec4.curios')
     exclusiveRepo(handler, 'https://maven.tterrag.com/', 'team.chisel.ctm')
     exclusiveRepo(handler, 'https://squiddev.cc/maven/', 'cc.tweaked', 'org.squiddev')
     exclusiveRepo(handler, 'https://dogforce-games.com/maven/', 'dev.gigaherz.jsonthings')
@@ -360,45 +360,35 @@ dependencies {
     //We use https://github.com/jqwik-team/jqwik to allow for implementing property based testing
     testImplementation("net.jqwik:jqwik:${jqwik_version}")
 
-    compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-common-api:${jei_version}")
-    compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge-api:${jei_version}")
+    compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
+    compileOnly("mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}")
     if (recipe_viewer == 'jei' || recipe_viewer == 'hybrid') {
-        //TODO: Re-enable when JEI updates
-        //localRuntime("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge:${jei_version}")
+        localRuntime("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}")
     }
 
-    compileOnly("dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}:api")
-    def emi = "dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}"
+    compileOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api")
+    def emi = "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
     //TODO: Re-evaluate (https://github.com/emilyploszaj/emi/issues/537) might allow us to not have to do this
     //Compile against full emi in datagen
     datagenMainCompileOnly(emi)
-    //TODO: Re-enable when EMI updates
-    /*if (recipe_viewer == 'emi' || recipe_viewer == 'hybrid') {
+    if (recipe_viewer == 'emi' || recipe_viewer == 'hybrid') {
         localRuntime(emi)
     } else {
         //We still need it to load in datagen regardless of if we are using emi or a different viewer so that we can access EMI related objects
         datagenMainRuntimeOnly(emi)
-    }*/
+    }
 
-    //TODO: Re-enable once an update is released for the current MC version
-    //localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
+    localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
 
-    //TODO: Remove having to specify these as non transitive once https://github.com/McJtyMods/TheOneProbe/issues/548 is fixed
-    compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}:api") {
-        transitive = false
-    }
-    //TODO: Re-enable once it doesn't cause connection issues on servers
-    /*localRuntime("mcjty.theoneprobe:theoneprobe:${top_version}") {
-        transitive = false
-    }*/
+    compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}:api")
+    localRuntime("mcjty.theoneprobe:theoneprobe:${top_version}")
     compileOnly("curse.maven:jade-api-324717:${jade_api_id}")
     localRuntime("curse.maven:jade-324717:${jade_id}")
     compileOnly("mcp.mobius.waila:wthit-api:neo-${wthit_version}")
 
-    def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${previous_minor_minecraft_version}:${crafttweaker_version}"
+    def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${minecraft_version}:${crafttweaker_version}"
     compileOnly(crt)
-    //TODO: Re-enable when CrT updates
-    //localRuntime(crt)
+    localRuntime(crt)
     def jeiTweaker = "com.blamejared.jeitweaker:JeiTweaker-forge-1.20.1:${jeitweaker_version}"
     compileOnly(jeiTweaker)
     //TODO: Re-enable when it updates
@@ -418,13 +408,12 @@ dependencies {
     compileOnly("curse.maven:female-gender-forge-481655:${wildfire_gender_mod_id}")
 
     //Dependencies for data generators for mod compat reference
-    //TODO: Switch back to datagenMainImplementation when it updated
-    datagenMainCompileOnly("appeng:appliedenergistics2-neoforge:${ae2_version}")
+    datagenMainImplementation("appeng:appliedenergistics2-neoforge:${ae2_version}")
     datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${minecraft_version}-${glitchcore_version}")
     datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}")
     datagenMainImplementation("com.github.glitchfiend:BiomesOPlenty-neoforge:${minecraft_version}-${biomesoplenty_version}")
-    //TODO - 1.20.2: Switch back to datagenMainImplementation
-    datagenMainCompileOnly("curse.maven:farmers-delight-398521:${farmers_delight_id}")
+    //TODO: Re-enable and implement after it is updated
+    //datagenMainImplementation("curse.maven:farmers-delight-398521:${farmers_delight_id}")
     //TODO - 1.20.2: Re-enable after projecte is updated
     //datagenMainRuntimeOnly("curse.maven:projecte-226410:${projecte_id}")
 

buildSrc/src/main/groovy/mekanism/OptimizePng.groovy

@@ -40,7 +40,7 @@ class OptimizePng extends DefaultTask {
             }
             long newSize = file.length()
             if (newSize < size) {
-                System.out.format('Reduced File size of %s from %d bytes to %d bytes (reduced by %.2f%%)\n',
+                System.out.format(Locale.ROOT, 'Reduced File size of %s from %d bytes to %d bytes (reduced by %.2f%%)\n',
                         file, size, newSize, ((double) (size - newSize)) / ((double) size) * 100.0)
             }
         }

gradle.properties

@@ -9,11 +9,11 @@ minecraft_version=1.21
 previous_minecraft_version=1.20.4
 previous_minor_minecraft_version=1.20.6
 loader_version_range=[4,)
-forge_version=21.0.8-beta
+forge_version=21.0.29-beta
 mod_version=10.6.1
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
-forge_version_range=[21.0.8-beta,)
+forge_version_range=[21.0.28-beta,)
 minecraft_version_range=[1.21]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release
@@ -25,7 +25,7 @@ jqwik_version=1.8.5
 
 #NeoGradle Settings
 neogradle.subsystems.parchment.minecraftVersion=1.20.6
-neogradle.subsystems.parchment.mappingsVersion=2024.06.02
+neogradle.subsystems.parchment.mappingsVersion=2024.06.16
 neogradle.subsystems.conventions.sourcesets.enabled=false
 
 #misc settings
@@ -36,10 +36,15 @@ recipe_viewer=emi
 yamlops_version=1.2.0
 
 #Mod dependencies
+crafttweaker_version=20.0.6
+ctm_version=1.2.0+1
+curios_version=9.0.2+1.21
+emi_version=1.1.7
 jade_api_id=5427895
-jade_id=5427817
+jade_id=5444008
+jei_version=19.0.0.9
 top_version=1.21_neo-12.0.0-1
-wthit_version=12.1.2
+wthit_version=12.2.1
 
 #Mod dependency min version ranges
 
@@ -48,18 +53,14 @@ wthit_version=12.1.2
 
 
 #Mod dependencies for recipes (only used by our data generators)
-biomesoplenty_version=21.0.0.4
+ae2_version=19.0.4-alpha
+biomesoplenty_version=21.0.0.7
 glitchcore_version=2.0.0.1
 terrablender_version=4.0.0.1
 
 #Outdated mod dependencies
 cc_tweaked_version=1.111.0
-crafttweaker_version=19.0.10
-curios_version=8.0.0+1.20.6
-ctm_version=1.1.7+11
-emi_version=1.1.6
 flux_networks_id=5234697
-jei_version=18.0.0.62
 jeitweaker_version=8.0.5
 json_things_version=0.10.0
 oc2_id=3896581
@@ -68,6 +69,5 @@ recipe_stages_version=8.0.0.2
 wildfire_gender_mod_id=5357649
 
 #Outdated mod dependencies for recipes
-ae2_version=18.1.3-alpha
 farmers_delight_id=5051242
 projecte_id=4860859

src/api/java/mekanism/api/math/FloatingLong.java

@@ -880,7 +880,7 @@ public FloatingLong divide(double toDivide) {
      */
     public double divideToLevel(FloatingLong toDivide) {
         //TODO: Optimize out creating another object
-        return toDivide.isZero() || greaterThan(toDivide) ? 1 : divide(toDivide).doubleValue();
+        return toDivide.isZero() || greaterOrEqual(toDivide) ? 1 : divide(toDivide).doubleValue();
     }
 
     /**