Update to neoforge

build.gradle

@@ -2,8 +2,9 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.neoforged.gradle' version '[6.0.18,6.2)'
-    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
+    id 'org.spongepowered.mixin' version '0.7.+'
+
 }
 
 version = mod_version
@@ -154,7 +155,8 @@ dependencies {
     // The "userdev" classifier will be requested and setup by ForgeGradle.
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    minecraft "net.neoforged:forge:${minecraft_version}-${neo_version}"
+
 
     implementation fg.deobf("dev.zontreck:LibZontreckMod:${libzontreck}")
 
@@ -186,13 +188,13 @@ dependencies {
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
 // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
-tasks.named('processResources', ProcessResources).configure {
+tasks.withType(ProcessResources).configureEach {
     var replaceProperties = [
             minecraft_version   : minecraft_version, minecraft_version_range: minecraft_version_range,
-            forge_version: forge_version, forge_version_range: forge_version_range,
+            neo_version         : neo_version, neo_version_range: neo_version_range,
             loader_version_range: loader_version_range,
             mod_id              : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
-            mod_authors: mod_authors, mod_description: mod_description,
+            mod_authors         : mod_authors, mod_description: mod_description, pack_format_number: pack_format_number,
     ]
     inputs.properties replaceProperties
 
@@ -201,6 +203,7 @@ tasks.named('processResources', ProcessResources).configure {
     }
 }
 
+
 // Example for how to get properties into the manifest for reading at runtime.
 tasks.named('jar', Jar).configure {
     manifest {
@@ -219,25 +222,37 @@ tasks.named('jar', Jar).configure {
     finalizedBy 'reobfJar'
 }
 
+
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
 // tasks.named('publish').configure {
 //     dependsOn 'reobfJar'
 // }
 
-// Example configuration to allow publishing using the maven-publish plugin
+
+def MAVEN_PASSWORD_PROPERTY = "AriasCreationsMavenPassword"
 publishing {
     publications {
-        register('mavenJava', MavenPublication) {
+        mavenJava(MavenPublication) {
             artifact jar
+            artifact sourcesJar
+            artifact javadocJar
         }
     }
     repositories {
         maven {
-            url "file://${project.projectDir}/mcmodsrepo"
+            url = "https://maven.zontreck.com/repository/zontreck"
+            name = "ariascreations"
+            if (project.findProperty(MAVEN_PASSWORD_PROPERTY) != null) {
+                credentials {
+                    username = "admin"
+                    password = project.findProperty(MAVEN_PASSWORD_PROPERTY)
+                }
+            }
         }
     }
 }
 
+
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }

gradle.properties

@@ -3,21 +3,19 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-libzontreck=1.10.021324.2257
+libzontreck=1.10.021424.1759
 
 ## Environment Properties
 
 # The Minecraft version must agree with the Forge version to get a valid artifact
 minecraft_version=1.20.1
-# The Minecraft version range can use any release version of Minecraft as bounds.
+
-# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
+minecraft_version_range=[1.20,1.21)
-# as they do not follow standard versioning conventions.
+# The Neo version must agree with the Minecraft version to get a valid artifact
-minecraft_version_range=[1.20.1,1.21)
+neo_version=47.1.65
-# The Forge version must agree with the Minecraft version to get a valid artifact
+# The Neo version range can use any version of Neo as bounds or match the loader version range
-forge_version=47.2.0
+neo_version_range=[47.1,)
-# The Forge version range can use any version of Forge as bounds or match the loader version range
+# The loader version range can only use the major version of Neo/FML as bounds
-forge_version_range=[47,)
-# The loader version range can only use the major version of Forge/FML as bounds
 loader_version_range=[47,)
 # The mapping channel to use for mappings.
 # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
@@ -33,10 +31,11 @@ loader_version_range=[47,)
 #
 # Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
 # Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
-mapping_channel=parchment
+mapping_channel=official
 # The mapping version to query from the mapping channel.
 # This must match the format required by the mapping channel.
-mapping_version=2023.09.03-1.20.1
+mapping_version=1.20.1
+
 
 
 ## Mod Properties
@@ -58,3 +57,6 @@ mod_group_id=dev.zontreck
 mod_authors=zontreck
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
 mod_description=Thresholds
+
+# Pack version - this changes each minecraft release, in general.
+pack_format_number=15

run/ops.json

@@ -1,8 +0,0 @@
-[
-  {
-    "uuid": "380df991-f603-344c-a090-369bad2a924a",
-    "name": "Dev",
-    "level": 4,
-    "bypassesPlayerLimit": false
-  }
-]

run/options.txt

@@ -12,7 +12,7 @@ discrete_mouse_scroll:false
 invertYMouse:false
 realmsNotifications:true
 reducedDebugInfo:false
-showSubtitles:true
+showSubtitles:false
 directionalAudio:false
 touchscreen:false
 fullscreen:false
@@ -30,21 +30,21 @@ glintSpeed:0.5
 glintStrength:0.75
 damageTiltStrength:1.0
 highContrast:false
-gamma:1.0
+gamma:0.5
 renderDistance:12
 simulationDistance:12
 entityDistanceScaling:1.0
-guiScale:2
+guiScale:0
 particles:0
 maxFps:120
 graphicsMode:1
 ao:true
 prioritizeChunkUpdates:0
 biomeBlendRadius:2
-renderClouds:"false"
+renderClouds:"true"
 resourcePacks:[]
 incompatibleResourcePacks:[]
-lastServer:127.0.0.1
+lastServer:
 lang:en_us
 soundDevice:""
 chatVisibility:0
@@ -53,7 +53,7 @@ chatLineSpacing:0.0
 textBackgroundOpacity:0.5
 backgroundForChatOnly:true
 hideServerAddress:false
-advancedItemTooltips:true
+advancedItemTooltips:false
 pauseOnLostFocus:true
 overrideWidth:0
 overrideHeight:0
@@ -68,16 +68,16 @@ useNativeTransport:true
 mainHand:"right"
 attackIndicator:1
 narrator:0
-tutorialStep:none
+tutorialStep:movement
 mouseWheelSensitivity:1.0
 rawMouseInput:true
 glDebugVerbosity:1
-skipMultiplayerWarning:true
+skipMultiplayerWarning:false
 skipRealms32bitWarning:false
 hideMatchedNames:true
-joinedFirstServer:true
+joinedFirstServer:false
 hideBundleTutorial:false
-syncChunkWrites:true
+syncChunkWrites:false
 showAutosaveIndicator:true
 allowServerListing:true
 onlyShowSecureChat:false
@@ -128,9 +128,9 @@ key_key.mekanism.description:key.keyboard.n:SHIFT
 key_key.mekanism.module_tweaker:key.keyboard.backslash
 key_key.mekanism.key_boost:key.keyboard.left.control
 key_key.mekanism.key_hud:key.keyboard.h
-key_key.otemod.open_vault:key.keyboard.left.alt
+key_key.otemod.open_vault:key.keyboard.v
 soundCategory_master:1.0
-soundCategory_music:0.08862526
+soundCategory_music:1.0
 soundCategory_record:1.0
 soundCategory_weather:1.0
 soundCategory_block:1.0

run/server.properties

@@ -1,57 +0,0 @@
-#Minecraft server properties
-#Mon Feb 27 02:56:23 MST 2023
-allow-flight=false
-allow-nether=true
-broadcast-console-to-ops=true
-broadcast-rcon-to-ops=true
-difficulty=easy
-enable-command-block=false
-enable-jmx-monitoring=false
-enable-query=false
-enable-rcon=false
-enable-status=true
-enforce-secure-profile=true
-enforce-whitelist=false
-entity-broadcast-range-percentage=100
-force-gamemode=false
-function-permission-level=2
-gamemode=survival
-generate-structures=true
-generator-settings={}
-hardcore=false
-hide-online-players=false
-level-name=world
-level-seed=
-level-type=minecraft\:normal
-max-chained-neighbor-updates=1000000
-max-players=20
-max-tick-time=60000
-max-world-size=29999984
-motd=A Minecraft Server
-network-compression-threshold=256
-online-mode=false
-op-permission-level=4
-player-idle-timeout=0
-prevent-proxy-connections=false
-previews-chat=false
-pvp=true
-query.port=25565
-rate-limit=0
-rcon.password=
-rcon.port=25575
-require-resource-pack=false
-resource-pack=
-resource-pack-prompt=
-resource-pack-sha1=
-server-ip=
-server-port=25565
-simulation-distance=10
-spawn-animals=true
-spawn-monsters=true
-spawn-npcs=true
-spawn-protection=16
-sync-chunk-writes=true
-text-filtering-config=
-use-native-transport=true
-view-distance=10
-white-list=false

server_resource_pack/assets/minecraft/lang/en_us.json

@@ -1,3 +0,0 @@
-{
-    "item.minecraft.baked_potato": "Emergency Baked Potato"
-}

server_resource_pack/pack.mcmeta

@@ -1,8 +0,0 @@
-{
-    "pack": {
-        "description": {
-            "text": "OTEMod Server Resource Pack"
-        },
-        "pack_format": 15
-    }
-}

src/main/resources/META-INF/mods.toml

@@ -47,7 +47,7 @@ description='''${mod_description}'''
 # Does this dependency have to exist - if not, ordering below must be specified
 mandatory=true #mandatory
 # The version range of the dependency
-    versionRange="${forge_version_range}" #mandatory
+versionRange="${neo_version_range}" #mandatory
 # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
 # BEFORE - This mod is loaded BEFORE the dependency
 # AFTER - This mod is loaded AFTER the dependency
@@ -69,7 +69,6 @@ description='''${mod_description}'''
 versionRange="[1.10,1.11)"
 ordering="NONE"
 side="BOTH"
-
 # Features are specific properties of the game environment, that you may want to declare you require. This example declares
 # that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
 # stop your mod loading on the server for example.

src/main/resources/pack.mcmeta

@@ -3,6 +3,6 @@
     "description": {
       "text": "${mod_id} resources"
     },
-    "pack_format": 15
+    "pack_format": ${pack_format_number}
 }
 }