Me when I the

Author: Ultrasquid9

.vscode/launch.json

@@ -46,7 +46,7 @@
         "jdk.naming.dns/com.sun.jndi.dns\u003djava.naming",
         "-Dforge.logging.markers\u003dREGISTRIES",
         "-Dforge.logging.console.level\u003ddebug",
-        "-Dforge.enabledGameTestNamespaces\u003drubinated_nether",
+        "-Dneoforge.enabledGameTestNamespaces\u003drubinated_nether",
         "-Dneoforge.enableGameTest\u003dtrue",
         "-DlegacyClassPath.file\u003d/var/home/ultrasquid/Documents/Github/RubinatedNether/.gradle/configuration/neoForm/neoFormJoined1.21.1-20240808.144430/steps/writeMinecraftClasspathClient/classpath.txt",
         "-DignoreList\u003dsecurejarhandler-3.0.8.jar,asm-9.7.jar,asm-commons-9.7.jar,asm-tree-9.7.jar,asm-util-9.7.jar,asm-analysis-9.7.jar,bootstraplauncher-2.0.2.jar,JarJarFileSystems-0.4.1.jar,mixinextras-neoforge-0.4.1.jar,client-extra,neoforge-",

build.gradle

@@ -1,17 +1,11 @@
 plugins {
-	id 'java-library'
-	id 'eclipse'
-	id 'idea'
-	id 'maven-publish'
-	id 'net.neoforged.gradle.userdev' version '7.0.170'
+    id 'java-library'
+    id 'maven-publish'
+	id 'io.github.0ffz.github-packages' version '[1,2)'
+    id 'net.neoforged.moddev' version '1.0.23'
 }
 
 tasks.named('wrapper', Wrapper).configure {
-	// Define wrapper values here so as to not have to always do so when updating gradlew.properties.
-	// Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with
-	// documentation attached on cursor hover of gradle classes and methods. However, this comes with increased
-	// file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards.
-	// (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`)
 	distributionType = Wrapper.DistributionType.BIN
 }
 
@@ -25,73 +19,61 @@ repositories {
 		url = "https://api.modrinth.com/maven"
 	}
 	maven {
-	    url = "https://modmaven.dev"
-  	}
+		url = "https://modmaven.dev"
+	}
 }
 
 base {
 	archivesName = mod_id
 }
 
-// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21.
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
-//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager
-
-// Default run configurations.
-// These can be tweaked, removed, or duplicated as needed.
-runs {
-	// applies to all the run configs below
-	configureEach {
-		// Recommended logging data for a userdev environment
-		// The markers can be added/remove as needed separated by commas.
-		// "SCAN": For mods scan.
-		// "REGISTRIES": For firing of registry events.
-		// "REGISTRYDUMP": For getting the contents of all registries.
-		systemProperty 'forge.logging.markers', 'REGISTRIES'
-
-		// Recommended logging level for the console
-		// You can set various levels here.
-		// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-		systemProperty 'forge.logging.console.level', 'debug'
-
-		modSource project.sourceSets.main
-	}
+neoForge {
+	version = project.neo_version
 
-	client {
-		// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-		systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+	parchment {
+		mappingsVersion = project.parchment_mappings_version
+		minecraftVersion = project.parchment_minecraft_version
 	}
 
-	server {
-		systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
-		programArgument '--nogui'
-	}
+	runs {
+		client {
+			client()
+			systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+		}
 
-	// This run config launches GameTestServer and runs all registered gametests, then exits.
-	// By default, the server will crash when no gametests are provided.
-	// The gametest system is also enabled by default for other run configs under the /test command.
-	gameTestServer {
-		systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
-	}
+		server {
+			server()
+			programArgument '--nogui'
+			systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+		}
 
-	data {
-		// example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
-		// workingDirectory project.file('run-data')
+		gameTestServer {
+			type = "gameTestServer"
+			systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+		}
 
-		// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-		programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+		data {
+			data()
+			programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+		}
+
+		configureEach {
+			systemProperty 'forge.logging.markers', 'REGISTRIES'
+			logLevel = org.slf4j.event.Level.DEBUG
+		}
+	}
+
+	mods {
+		"${mod_id}" {
+			sourceSet(sourceSets.main)
+		}
 	}
 }
 
-// Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-// Sets up a dependency configuration called 'localRuntime'.
-// This configuration should be used instead of 'runtimeOnly' to declare
-// a dependency that will be present for runtime testing but that is
-// "optional", meaning it will not be pulled by dependents of this mod.
 configurations {
 	runtimeClasspath.extendsFrom localRuntime
 }
@@ -111,31 +93,28 @@ dependencies {
 	jarJar ("maven.modrinth:midnightlib:${project.midnightlib_version}")  
 }
 
-// This block of code expands all declared replace properties in the specified resource targets.
-// 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.withType(ProcessResources).configureEach {
+var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {
 	var replaceProperties = [
-			minecraft_version : minecraft_version,
-			minecraft_version_range : minecraft_version_range,
-			neo_version : neo_version,
-			neo_version_range : neo_version_range,
-			loader_version_range : loader_version_range,
-			midnightlib_version : midnightlib_version,
-			mod_id : mod_id,
-			mod_name : mod_name,
-			mod_license : mod_license,
-			mod_version : mod_version,
-			mod_authors : mod_authors,
-			mod_description : mod_description
+		minecraft_version : minecraft_version,
+		minecraft_version_range : minecraft_version_range,
+		neo_version : neo_version,
+		neo_version_range : neo_version_range,
+		loader_version_range : loader_version_range,
+		midnightlib_version : midnightlib_version,
+		mod_id : mod_id,
+		mod_name : mod_name,
+		mod_license : mod_license,
+		mod_version : mod_version,
+		mod_authors : mod_authors,
+		mod_description : mod_description
 	]
 	inputs.properties replaceProperties
-
-	filesMatching(['META-INF/neoforge.mods.toml']) {
-		expand replaceProperties
-	}
+	expand replaceProperties
+	from "src/main/templates"
+	into "build/generated/sources/modMetadata"
 }
+sourceSets.main.resources.srcDir generateModMetadata
+neoForge.ideSyncTask generateModMetadata
 
 // Example configuration to allow publishing using the maven-publish plugin
 publishing {
@@ -152,10 +131,9 @@ publishing {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+    options.encoding = 'UTF-8'
 }
 
-// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
 idea {
 	module {
 		downloadSources = true

gradle.properties

@@ -1,19 +1,18 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 org.gradle.jvmargs=-Xmx1G
-org.gradle.daemon=false
-org.gradle.debug=false
-
-#read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings
-# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-neogradle.subsystems.parchment.minecraftVersion=1.21.1
-neogradle.subsystems.parchment.mappingsVersion=2024.11.17
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
 
+parchment_minecraft_version=1.21.1
+parchment_mappings_version=2024.11.17
 minecraft_version=1.21.1
-minecraft_version_range=[1.21.1,1.22)
-neo_version=21.1.83
+minecraft_version_range=[1.21.1, 1.22)
+neo_version=21.1.85
 neo_version_range=[21.1.0,)
 loader_version_range=[4,)
 
+
 midnightlib_version = 1.6.3-neoforge
 jei_version=19.21.0.247
 

src/main/java/corundum/rubinated_nether/content/blocks/RunestoneBlock.java

@@ -35,10 +35,6 @@ public class RunestoneBlock extends Block {
 
 	public static final EnumProperty<DoubleBlockHalf> HALF = BlockStateProperties.DOUBLE_BLOCK_HALF;
 
-//	protected static final VoxelShape SHAPE_BOTTOM = Block.box(0.0, 0.0, 0.0, 16.0, 10.0, 16.0);
-//	protected static final VoxelShape SHAPE_MIDDLE = Block.box(1.0, 10.0, 1.0, 15.0, 16.0, 15.0);
-//	protected static final VoxelShape SHAPE_TOP = Block.box(0.0, 24.0, 0.0, 16.0, 32.0, 16.0);
-
 	protected static final VoxelShape SHAPE_TOP = Shapes.or(Block.box(1.0, 0.0, 1.0, 15.0, 8.0, 15.0), Block.box(0.0, 8.0, 0.0, 16.0, 16.0, 16.0));
 	protected static final VoxelShape SHAPE_BOTTOM = Shapes.or(Block.box(0.0, 0.0, 0.0, 16.0, 10.0, 16.0), Block.box(1.0, 10.0, 1.0, 15.0, 16.0, 15.0));
 
@@ -89,13 +85,8 @@ protected BlockState updateShape(BlockState state, Direction facing, BlockState
 
 	@Override
 	public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) {
-		if (!level.isClientSide && (player.isCreative() || !player.hasCorrectToolForDrops(state, level, pos))) {
-				DoublePlantBlockAccessor.invokePreventDropFromBottomPart(level, pos, state, player);
-//			}
-//			else {
-//				dropResources(state, level, pos, null, player, player.getMainHandItem());
-//			}
-		}
+		if (!level.isClientSide && (player.isCreative() || !player.hasCorrectToolForDrops(state, level, pos)))
+			DoublePlantBlockAccessor.invokePreventDropFromBottomPart(level, pos, state, player);
 
 		return super.playerWillDestroy(level, pos, state, player);
 	}

src/main/resources/META-INF/accesstransformer.cfg

@@ -1,2 +0,0 @@
-public net.minecraft.world.level.block.DoublePlantBlock preventDropFromBottomPart(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/player/Player;)V # preventDropFromBottomPart
-public net.minecraft.world.level.Level getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;

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

@@ -0,0 +1,36 @@
+modLoader="javafml"
+loaderVersion="${loader_version_range}"
+license="${mod_license}"
+
+[[mods]]
+
+modId="${mod_id}" 
+version="${mod_version}"
+displayName="${mod_name}"
+logoFile="icon.png"
+authors="${mod_authors}"
+description='''${mod_description}'''
+
+# Complex things
+enumExtensions = "META-INF/enumextensions.json"
+
+[[mixins]]
+	config="${mod_id}.mixins.json"
+
+[[accessTransformers]]
+	file="META-INF/accesstransformer.cfg"
+
+# Dependencies
+[[dependencies.rubinated_nether]]
+	modId="neoforge"
+	type="required"
+	versionRange="${neo_version_range}"
+	ordering="NONE"
+	side="BOTH"
+
+[[dependencies.rubinated_nether]]
+	modId="minecraft"
+	type="required"
+	versionRange="${minecraft_version_range}"
+	ordering="NONE"
+	side="BOTH"