Fix entities 1.21.x

build.gradle

@@ -1,3 +1,5 @@
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
 import net.neoforged.moddevgradle.internal.RunGameTask
 
 buildscript {
@@ -33,11 +35,11 @@ configurations {
 }
 
 shadowJar {
+	archiveClassifier.set('universal')
 	dependsOn(tasks.named("jar"))
 	afterEvaluate {
 		from({ tasks.named("jar").get().outputs })
 	}
-	archiveClassifier.set('universal')
 	configurations = [project.configurations.shade]
 	relocate 'tamaized.beanification', "${project.mod_id}.beanification"
 }
@@ -92,6 +94,23 @@ subprojects {
 	version = project(":").version
 }
 
+sourceSets {
+	data {
+		compileClasspath += main.compileClasspath + main.output
+
+		java {
+			srcDirs = ['src/main/java', 'src/data/java']
+		}
+		resources {
+			srcDirs = ['src/main/resources']
+		}
+	}
+}
+
+configurations {
+	dataImplementation.extendsFrom implementation
+}
+
 neoForge {
 	// we need the subprojects to evaluate first so that the sourceSets are properly constructed
 	evaluationDependsOnChildren()
@@ -101,6 +120,8 @@ neoForge {
 
 	validateAccessTransformers = true
 
+	addModdingDependenciesTo sourceSets.data
+
 	mods {
 		"${mod_id}" {
 			it.sourceSet this.sourceSets.main
@@ -109,20 +130,29 @@ neoForge {
 		'tf-asm' {
 			it.sourceSet project(":tf-asm").sourceSets.main
 		}
+
+		"${mod_id}-data" {
+			it.sourceSet this.sourceSets.main
+			it.sourceSet this.sourceSets.data
+		}
 	}
 
 	def mainMod = mods."${project.mod_id}"
+	def asmMod = mods."tf-asm"
+	def dataMod = mods."${project.mod_id}-data"
 
 	unitTest {
 		enable()
-		testedMod = mainMod
+		// For whatever reason, tests break if we dont combine all source sets, which the data source set does
+		testedMod = dataMod
 	}
 
 	runs {
 		configureEach {
 			gameDirectory = project.file('run')
 			systemProperty 'forge.logging.console.level', 'debug'
 			logLevel = org.slf4j.event.Level.DEBUG
+			loadedMods = [mainMod, asmMod]
 		}
 
 		client {
@@ -137,10 +167,12 @@ neoForge {
 			programArgument '--nogui'
 		}
 
-		data {
-			data()
+		clientData {
+			clientData()
 			gameDirectory = project.file('run-data')
 			programArguments.addAll '--mod', mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+			sourceSet = this.sourceSets.data
+			loadedMods = [dataMod, asmMod]
 		}
 	}
 }
@@ -159,6 +191,13 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
 	mavenLocal()
+	maven {
+		name 'Tama\'s Maven' // Beanification
+		url 'https://maven.tamaized.com/releases/'
+		content {
+			includeGroup("tamaized")
+		}
+	}
 	maven {
 		name 'Jared\'s Maven' // JEI
 		url 'https://maven.blamejared.com/'
@@ -188,13 +227,6 @@ repositories {
             includeGroup "curse.maven"
         }
     }
-	maven {
-		name 'Tama\'s Maven' // Beanification
-		url 'https://maven.tamaized.com/releases/'
-		content {
-			includeGroup("tamaized")
-		}
-	}
 }
 
 dependencies {
@@ -207,30 +239,30 @@ dependencies {
 	testCompileOnly "${beanification}:test-sources"
 
 	//make sure to only pick one of these when testing (switch others to compileOnly)
-	implementation "mezz.jei:jei-${project.base_minecraft_version}-neoforge:${project.jei_version}"
-	compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${project.rei_version}"
-	compileOnly "dev.emi:emi-neoforge:${project.emi_version}+${project.base_minecraft_version}"
+	implementation "mezz.jei:jei-${project.minecraft_version}-neoforge:${project.jei_version}"
+//	compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${project.rei_version}"
+//	compileOnly "dev.emi:emi-neoforge:${project.emi_version}+${project.base_minecraft_version}"
 
 	// theillusivec4
-	implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+${project.base_minecraft_version}"
+//	implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+${project.base_minecraft_version}"
 
 	//curse maven
-	implementation "curse.maven:jade-324717:5529595"
-	implementation "curse.maven:cosmetic-armor-reworked-237307:5427303"
-	runtimeOnly "curse.maven:worldedit-225608:5830452"
+	implementation "curse.maven:jade-324717:6170888"
+	implementation "curse.maven:cosmetic-armor-reworked-237307:5961480"
 //	runtimeOnly "curse.maven:jeed-532286:5483315"
 //	runtimeOnly "curse.maven:museum-curator-859070:4629894"
 	if (project.enable_tips_mod == 'true') {
 		runtimeOnly "curse.maven:tips-306549:5844057"
 		runtimeOnly "curse.maven:bookshelf-228525:6098975"
 		runtimeOnly "curse.maven:prickle-1023259:5836410"
 	}
-	runtimeOnly "curse.maven:suggestion-provider-fix-469647:5598604"
+//	runtimeOnly "curse.maven:suggestion-provider-fix-469647:5598604"
 
-	compileOnly "mcjty.theoneprobe:theoneprobe:${project.top_version}"
+//	compileOnly "mcjty.theoneprobe:theoneprobe:${project.top_version}"
 
     //mods we dont have compat with but are nice to have
-	runtimeOnly "com.telepathicgrunt:CommandStructures-Neoforge:4.3.2+1.20.6"
+	runtimeOnly "com.telepathicgrunt:CommandStructures-Neoforge:4.4.3+1.21.4"
+//	runtimeOnly "curse.maven:world-edit-225608:6013137"
 
 	testImplementation group: 'net.neoforged', name: 'testframework', version: project.neo_version
 	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.10.3'
@@ -260,11 +292,20 @@ processResources {
 	def ver = project.version
 	filesMatching("META-INF/neoforge.mods.toml") {
 		expand([
-			'file'           : [
+			'file': [
 				'jarVersion': ver
 			]
 		])
 	}
+	exclude ".cache"
+	def lazyTree = providers.provider {
+		fileTree(dir: getOutputs().getFiles().getAsPath(), includes: ["**/*.json", "**/*.mcmeta"])
+	}
+	doLast {
+		lazyTree.get().each {
+			File file -> file.setText(JsonOutput.toJson(new JsonSlurper().parse(file)))
+		}
+	}
 }
 
 jar {
@@ -290,8 +331,10 @@ publishing {
 			afterEvaluate {
 				artifact this.project.shadowJar
 				artifact this.project.sourceJar
+				artifact this.project.dataJar
+				artifact this.project.dataSourceJar
 			}
-			groupId mavenUser
+			groupId 'team-twilight'
 			artifactId this.project.mod_id
 		}
 	}
@@ -312,8 +355,26 @@ tasks.register('sourceJar', Jar) {
 	archiveClassifier = 'sources'
 }
 
+tasks.register('dataClassesForPublishing', JavaCompile) {
+	dependsOn "dataClasses"
+	source = fileTree('src/data/java')
+	classpath = sourceSets.named('data').get().compileClasspath
+	destinationDirectory = layout.buildDirectory.dir("classes/java/dataForPublishing")
+}
+
+tasks.register('dataJar', Jar) {
+	dependsOn 'dataClassesForPublishing'
+	from layout.buildDirectory.dir("classes/java/dataForPublishing")
+	archiveClassifier = 'data'
+}
+
+tasks.register('dataSourceJar', Jar) {
+	from sourceSets.data.allSource
+	archiveClassifier = 'data-sources'
+}
+
 tasks.withType(JavaCompile).configureEach {
 	options.encoding = 'UTF-8'
 }
 
-build.dependsOn shadowJar
+build.dependsOn shadowJar

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.daemon=false
 org.gradle.configuration-cache=true
 
 # Versions can be found at https://parchmentmc.org/docs/getting-started
-neoForge.parchment.minecraftVersion=1.21.1
-neoForge.parchment.mappingsVersion=2024.11.17
+neoForge.parchment.minecraftVersion=1.21.4
+neoForge.parchment.mappingsVersion=2025.03.23
 
 # Mod Info
 mod_version=4.7
@@ -13,16 +13,16 @@ group_name=com.github.teamtwilight.twilightforest
 
 # Minecraft
 base_minecraft_version=1.21
-minecraft_version=1.21.1
+minecraft_version=1.21.4
 
 # NeoForge: https://projects.neoforged.net/neoforged/neoforge
-neo_version=21.1.83
+neo_version=21.4.124
 mdg_version=2.0.76
 
 # Deps
-beanification_version=1.5.93
-jei_version=19.8.2.99
-rei_version=16.0.799
+beanification_version=1.5.97
+jei_version=20.0.0.4
+rei_version=18.0.796
 emi_version=1.1.11
 curios_version=9.0.5
 top_version=1.21_neo-12.0.3-5

src/data/java/twilightforest/datagen/DataGenerators.java

@@ -0,0 +1,28 @@
+package twilightforest.datagen;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.data.event.GatherDataEvent;
+import tamaized.beanification.Autowired;
+import tamaized.beanification.Component;
+import tamaized.beanification.PostConstruct;
+import twilightforest.datagen.generator.AssetsGenerator;
+import twilightforest.datagen.generator.DataGenerator;
+
+@Component
+public class DataGenerators {
+
+	@Autowired
+	private AssetsGenerator assetsGenerator;
+
+	@Autowired
+	private DataGenerator dataGenerator;
+
+	@PostConstruct
+	private void register(IEventBus bus) {
+		bus.addListener(GatherDataEvent.Client.class, event -> {
+			this.dataGenerator.generate(event);
+			this.assetsGenerator.generate(event);
+		});
+	}
+
+}

src/main/java/twilightforest/data/AtlasGenerator.java → src/data/java/twilightforest/datagen/assets/AtlasGenerator.java

@@ -1,33 +1,32 @@
-package twilightforest.data;
+package twilightforest.datagen.assets;
 
 import net.minecraft.client.renderer.texture.atlas.sources.SingleFile;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.resources.ResourceLocation;
-import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.common.data.SpriteSourceProvider;
 import twilightforest.TwilightForestMod;
 import twilightforest.client.MagicPaintingTextureManager;
 import twilightforest.entity.MagicPaintingVariant;
+import twilightforest.init.custom.MagicPaintingVariants;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 public class AtlasGenerator extends SpriteSourceProvider {
-	public static final Map<ResourceLocation, MagicPaintingVariant> MAGIC_PAINTING_HELPER = new HashMap<>();
 
-	public AtlasGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper helper) {
-		super(output, provider, TwilightForestMod.ID, helper);
+	public AtlasGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
+		super(output, provider, TwilightForestMod.ID);
 	}
 
 	@Override
 	protected void gather() {
 		this.atlas(SHIELD_PATTERNS_ATLAS).addSource(new SingleFile(TwilightForestMod.prefix("entity/knightmetal_shield"), Optional.empty()));
 		this.atlas(MagicPaintingTextureManager.ATLAS_INFO_LOCATION).addSource(new SingleFile(MagicPaintingTextureManager.BACK_SPRITE_LOCATION, Optional.empty()));
 
-		MAGIC_PAINTING_HELPER.forEach((location, parallaxVariant) -> {
+		MagicPaintingVariants.MAGIC_PAINTING_ATLAS_HELPER.forEach((location, parallaxVariant) -> {
 			location = location.withPrefix(MagicPaintingTextureManager.MAGIC_PAINTING_PATH + "/");
 			for (MagicPaintingVariant.Layer layer : parallaxVariant.layers()) {
 				this.atlas(MagicPaintingTextureManager.ATLAS_INFO_LOCATION).addSource(new SingleFile(location.withSuffix("/" + layer.path()), Optional.empty()));

src/data/java/twilightforest/datagen/assets/EquipmentAssetsGenerator.java

@@ -0,0 +1,21 @@
+package twilightforest.datagen.assets;
+
+import net.minecraft.client.data.models.EquipmentAssetProvider;
+import net.minecraft.client.resources.model.EquipmentClientInfo;
+import net.minecraft.data.PackOutput;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.equipment.EquipmentAsset;
+import twilightforest.init.TFEquipmentAssets;
+
+import java.util.function.BiConsumer;
+
+public class EquipmentAssetsGenerator extends EquipmentAssetProvider {
+	public EquipmentAssetsGenerator(PackOutput output) {
+		super(output);
+	}
+
+	@Override
+	protected void registerModels(BiConsumer<ResourceKey<EquipmentAsset>, EquipmentClientInfo> output) {
+		TFEquipmentAssets.bootstrap(output);
+	}
+}