Skip to content

Commit

Permalink
Neo datagen but broken
Browse files Browse the repository at this point in the history
  • Loading branch information
dhyces committed May 27, 2024
1 parent 4972c17 commit 3cb60d5
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 63 deletions.
37 changes: 31 additions & 6 deletions neo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,56 @@ base {
archivesName = "${properties["mod_name"]}-neo-${libs.versions.minecraft.release.get()}"
}

val commonJava by configurations
val commonResources by configurations

sourceSets {
val main = sourceSets.named("main").get()
create("datagen") {
compileClasspath += main.compileClasspath + main.output
runtimeClasspath += main.runtimeClasspath + main.output
}
}

loom {
neoForge {
accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg"))
}

runs {
configureEach {
ideConfigGenerated(true)
runDir("run")
mods {
create("trimmed") {
sourceSet(sourceSets.main.get())
configuration(commonJava)
configuration(commonResources)
}
}
}
named("client") {
client()
configName = "Neo Client"
ideConfigGenerated(true)
runDir("run")
}
named("server") {
server()
configName = "Neo Server"
ideConfigGenerated(true)
runDir("run")
}
create("data") {
data()
configName = "Neo Data"
ideConfigGenerated(true)
runDir("run")

programArgs("--mod", properties["mod_id"] as String, "--all", "--output", project(":common").file("src/generated/resources/").path, "--existing", file("src/main/resources/").path)

mods {
named("trimmed") {
sourceSet(sourceSets.main.get())
sourceSet(sourceSets.named("datagen").get())
configuration(commonJava)
configuration(commonResources)
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package dhyces.trimmed;
package dev.dhyces.trimmed;

import dev.dhyces.trimmed.Trimmed;
import dhyces.trimmed.model.VanillaItemModelOverrideProvider;
import dev.dhyces.trimmed.model.VanillaItemModelOverrideProvider;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.data.event.GatherDataEvent;

// as much as I dislike EBS magic annotations, it is the only way I see of actually separating datagen from main src
@Mod.EventBusSubscriber(modid = Trimmed.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
@EventBusSubscriber(modid = Trimmed.MODID, bus = EventBusSubscriber.Bus.MOD)
public class TrimmedDatagen {

@SubscribeEvent
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package dev.dhyces.trimmed.model;

import dev.dhyces.trimmed.api.data.ItemOverrideDataProvider;
import net.minecraft.data.PackOutput;
import net.minecraft.world.item.Items;

public class VanillaItemModelOverrideProvider extends ItemOverrideDataProvider {
public VanillaItemModelOverrideProvider(PackOutput output) {
super(output, "minecraft");
}

@Override
protected void addItemOverrides() {
anyTrimBuilder(new ArmorSet(Items.LEATHER_HELMET, Items.LEATHER_CHESTPLATE, Items.LEATHER_LEGGINGS, Items.LEATHER_BOOTS))
.defaultTemplate()
.end();
anyTrimBuilder(new ArmorSet(Items.CHAINMAIL_HELMET, Items.CHAINMAIL_CHESTPLATE, Items.CHAINMAIL_LEGGINGS, Items.CHAINMAIL_BOOTS))
.defaultTemplate()
.end();
anyTrimBuilder(new ArmorSet(Items.IRON_HELMET, Items.IRON_CHESTPLATE, Items.IRON_LEGGINGS, Items.IRON_BOOTS))
.defaultTemplate()
.end();
anyTrimBuilder(new ArmorSet(Items.GOLDEN_HELMET, Items.GOLDEN_CHESTPLATE, Items.GOLDEN_LEGGINGS, Items.GOLDEN_BOOTS))
.defaultTemplate()
.end();
anyTrimBuilder(new ArmorSet(Items.DIAMOND_HELMET, Items.DIAMOND_CHESTPLATE, Items.DIAMOND_LEGGINGS, Items.DIAMOND_BOOTS))
.defaultTemplate()
.end();
anyTrimBuilder(new ArmorSet(Items.NETHERITE_HELMET, Items.NETHERITE_CHESTPLATE, Items.NETHERITE_LEGGINGS, Items.NETHERITE_BOOTS))
.defaultTemplate()
.end();
addAnyTrimOverride(Items.TURTLE_HELMET);
}
}

This file was deleted.

0 comments on commit 3cb60d5

Please sign in to comment.