Crop Rework 2.0

.editorconfig

@@ -17,3 +17,6 @@ end_of_line = crlf
 
 [*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
 indent_size = 2
+
+[*.lang]
+trim_trailing_whitespace = false

.gitignore

@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
+/layout.json

addons.gradle

@@ -0,0 +1,81 @@
+compileJava {
+    options.encoding = "UTF-8"
+}
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}
+
+minecraft {
+    def vMajor, vMinor, vPatch, logLevel = LogLevel.INFO
+    try {
+        String version = project.version
+        def (five,major,minor,patch)= version.split("[.-]", 5)
+
+        vMajor = 500 + major.toInteger()
+        vMinor = minor.toInteger()
+        vPatch = patch.toInteger()
+    } catch (Exception ex) {
+        try {
+            String version = "git describe".execute().text
+            def (five,major,minor,patch)= version.split("[.-]", 5)
+            vMajor = 500 + major.toInteger()
+            vMinor = minor.toInteger()
+            vPatch = patch.toInteger()
+            logLevel = LogLevel.LIFECYCLE
+        } catch (Exception ex2) {
+            def err = "Cannot automatically determine NBT version. Using defaults hardcoded in buildscript. This could break your world!"
+            project.logger.error(err)
+            vMajor = 509
+            vMinor = 44
+            vPatch = 0
+            logLevel = LogLevel.WARN
+        }
+    }
+    injectedTags.put 'VERSION_MAJOR', vMajor
+    injectedTags.put 'VERSION_MINOR', vMinor
+    injectedTags.put 'VERSION_PATCH', vPatch
+    project.logger.log(logLevel, 'Using ({}, {}, {}) as NBT version', vMajor, vMinor, vPatch)
+}
+
+SourceSet functionalTestSet = null
+
+sourceSets {
+    functionalTestSet = create("functionalTest") {
+        java {
+            srcDir("src/functionalTest/java")
+            compileClasspath += sourceSets.patchedMc.output + sourceSets.main.output
+        }
+    }
+}
+
+configurations { configs ->
+    // Keep all dependencies from the main mod in the functional test mod
+    named(functionalTestSet.compileClasspathConfigurationName).configure {it.extendsFrom(named("compileClasspath").get())}
+    named(functionalTestSet.runtimeClasspathConfigurationName).configure {it.extendsFrom(named("runtimeClasspath").get())}
+    named(functionalTestSet.annotationProcessorConfigurationName).configure {it.extendsFrom(named("annotationProcessor").get())}
+}
+
+tasks.register(functionalTestSet.jarTaskName, Jar) {
+    from(functionalTestSet.output)
+    archiveClassifier.set("functionalTests")
+    // we don't care about the version number here, keep it stable to avoid polluting the tmp directory
+    archiveVersion.set("1.0")
+    destinationDirectory.set(new File(buildDir, "tmp"))
+}
+tasks.named("assemble").configure {
+    dependsOn(functionalTestSet.jarTaskName)
+}
+
+// Run tests in the default runServer/runClient configurations
+tasks.named("runServer", JavaExec).configure {
+    dependsOn(functionalTestSet.jarTaskName)
+    classpath(configurations.named(functionalTestSet.runtimeClasspathConfigurationName), tasks.named(functionalTestSet.jarTaskName))
+}
+
+tasks.named("runClient", JavaExec).configure {
+    dependsOn(functionalTestSet.jarTaskName)
+    classpath(configurations.named(functionalTestSet.runtimeClasspathConfigurationName), tasks.named(functionalTestSet.jarTaskName))
+}

build.gradle

@@ -1,4 +1,3 @@
-//version: 1707058017
 
 plugins {
     id 'com.gtnewhorizons.gtnhconvention'

dependencies.gradle

@@ -1,26 +1,64 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev")
-    api("com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev")
-    api("com.github.GTNewHorizons:ForgeMultipart:1.4.7:dev")
-    api("com.github.GTNewHorizons:waila:1.6.5:dev")
-    compileOnlyApi("com.github.GTNewHorizons:Botania:1.10.4-GTNH:dev")
-    compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.8.2:dev")
-    compileOnlyApi("com.github.GTNewHorizons:OpenComputers:1.10.6-GTNH:dev")
-    compileOnlyApi("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:BloodMagic:1.5.0:dev")
-    compileOnlyApi('curse.maven:minefactory-reloaded-66672:2366150') { transitive = false }
-    compileOnlyApi('curse.maven:computercraft-67504:2269339')
-    compileOnlyApi('curse.maven:HydCraft-223036:2279482')
-    compileOnlyApi('curse.maven:Ancient-Warfare-224602:2285132')
-    compileOnlyApi('curse.maven:ResourcefulCrops-232365:2268518')
-
-    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.0:dev") {
+    devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.170:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:TinkersConstruct:1.14.17-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:twilightforest:2.7.13:dev") {
+        transitive = false
+    }
+    devOnlyNonPublishable("com.github.GTNewHorizons:Natura:2.8.9:dev") {
+        transitive = false
+    }
+    devOnlyNonPublishable(rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612"))
+    devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.44-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:waila:1.9.15:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:Botania:1.13.6-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.11.4:dev")
+    devOnlyNonPublishable("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
+    compileOnly("com.github.GTNewHorizons:Galacticraft:3.4.14-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:AppleCore:3.3.0:dev") {
+    compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.1.0:dev") {
+        transitive = false
+    }
+    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.123-GTNH:dev") {
+        transitive = false
+    }
+    devOnlyNonPublishable("ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.2.21-GTNH-daily") {
         transitive = false
     }
 
+    // for testing purposes
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:twilightforest:2.7.13:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:ThaumicBases:1.9.6:dev")
+    runtimeOnlyNonPublishable(deobfCurse('witchery-69673:2234410'))
+    runtimeOnlyNonPublishable(rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612"))
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Natura:2.8.9:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Galacticraft:3.4.14-GTNH:dev")
+    // gtnh core mod let me load sheaniganery
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NewHorizonsCoreMod:2.8.74:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:WitcheryExtras:1.4.7:dev")
+    // for comparing to ic2 stuff only
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:ServerUtilities:2.2.9:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Crops-plus-plus:1.9.4:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:BeeBetterAtBees-GTNH:0.4.3-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:neiaddons:1.17.0:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:StructureLib:1.4.25:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:BlockRenderer6343:1.4.4:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:worldedit-gtnh:v0.0.8:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Random-Things:2.7.1:dev")
+    runtimeOnlyNonPublishable("ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.2.21-GTNH-daily")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.7.27:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Angelica:1.0.0-beta68a:dev")
 }
+
+project.getConfigurations()
+    .all(c -> {
+        final DependencySubstitutions ds = c.getResolutionStrategy()
+            .getDependencySubstitution();
+        ds.substitute(ds.module("com.github.GTNewHorizons:Baubles"))
+            .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH"))
+            .withClassifier("dev")
+            .because("Baubles-Expanded replaces Baubles");
+    });

gradle.properties

@@ -14,7 +14,7 @@ modId = cropsnh
 modGroup = com.gtnewhorizon.cropsnh
 
 # 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.
@@ -33,19 +33,19 @@ channel = stable
 mappingsVersion = 12
 
 # Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
 # Select a default username for testing your mod. You can always override this per-run by running
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
 # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
 # See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = false
+enableModernJavaSyntax = true
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-enableGenericInjection = false
+enableGenericInjection = true
 
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.
@@ -55,11 +55,8 @@ generateGradleTokenClass =
 # Name of the token containing the project's current version to generate/replace.
 gradleTokenVersion = GRADLETOKEN_VERSION
 
-# [DEPRECATED] Mod ID replacement token.
-gradleTokenModId = GRADLETOKEN_MODID
-
-# [DEPRECATED] Mod name replacement token.
-gradleTokenModName = GRADLETOKEN_MODNAME
+# [DEPRECATED] Mod Group replacement token.
+gradleTokenGroupName = GRADLETOKEN_GROUPNAME
 
 # [DEPRECATED]
 # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
@@ -82,13 +79,20 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# 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 = 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.<modid>.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!
@@ -114,16 +118,22 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
 usesMavenPublishing = true
 
 # Maven repository to publish the mod to.
-# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
 
 # Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
 #
@@ -137,7 +147,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -158,6 +168,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# 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.
@@ -170,7 +186,7 @@ curseForgeRelations =
 # Uncomment this to disable Spotless checks.
 # This should only be uncommented to keep it easier to sync with upstream/other forks.
 # That is, if there is no other active fork/upstream, NEVER change this.
-disableSpotless = true
+# disableSpotless = true
 
 # Uncomment this to disable Checkstyle checks (currently wildcard import check).
 # disableCheckstyle = true
@@ -187,5 +203,3 @@ disableSpotless = true
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
-# Non-GTNH properties
-gradleTokenGroupName = GRADLETOKEN_GROUPNAME

gradle/wrapper/gradle-wrapper.properties

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