Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow datagen to use vanilla armor trim textures #146

Merged
merged 9 commits into from
Nov 4, 2023
Merged

Allow datagen to use vanilla armor trim textures #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29a1b1c
add uncheckedTexture to the ModelBuilder
GizmoTheMoonPig Sep 25, 2023
cb484ca
add vanilla trims to the ExistingFileHelper instead
GizmoTheMoonPig Sep 25, 2023
de88501
use ModelProvider.TEXTURE
GizmoTheMoonPig Sep 25, 2023
e5709a3
goof
GizmoTheMoonPig Sep 25, 2023
cc30f47
directory actually uses items/, update test mod as well
GizmoTheMoonPig Sep 25, 2023
0ab2fd3
import fix
GizmoTheMoonPig Nov 3, 2023
c738655
ugh
GizmoTheMoonPig Nov 3, 2023
dc49c95
remove unused file
GizmoTheMoonPig Nov 4, 2023
4accb47
Merge branch '1.20.x' into 1.20-unchecked-texture-builder
GizmoTheMoonPig Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/java/net/neoforged/neoforge/client/model/generators/ItemModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.armortrim.TrimMaterial;
import net.minecraft.world.item.armortrim.TrimMaterials;
import net.neoforged.neoforge.common.data.ExistingFileHelper;

/**
Expand All @@ -21,10 +24,18 @@
*/
public class ItemModelBuilder extends ModelBuilder<ItemModelBuilder> {

private static final List<ResourceKey<TrimMaterial>> VANILLA_TRIM_MATERIALS = List.of(TrimMaterials.QUARTZ, TrimMaterials.IRON, TrimMaterials.NETHERITE, TrimMaterials.REDSTONE, TrimMaterials.COPPER, TrimMaterials.GOLD, TrimMaterials.EMERALD, TrimMaterials.DIAMOND, TrimMaterials.LAPIS, TrimMaterials.AMETHYST);
protected List<OverrideBuilder> overrides = new ArrayList<>();

public ItemModelBuilder(ResourceLocation outputLocation, ExistingFileHelper existingFileHelper) {
super(outputLocation, existingFileHelper);
//add vanilla armor trims to the existing file helper
for (ResourceKey<TrimMaterial> trim : VANILLA_TRIM_MATERIALS) {
this.existingFileHelper.trackGenerated(new ResourceLocation("trims/items/boots_trim_" + trim.location().getPath()), ModelProvider.TEXTURE);
this.existingFileHelper.trackGenerated(new ResourceLocation("trims/items/chestplate_trim_" + trim.location().getPath()), ModelProvider.TEXTURE);
this.existingFileHelper.trackGenerated(new ResourceLocation("trims/items/helmet_trim_" + trim.location().getPath()), ModelProvider.TEXTURE);
this.existingFileHelper.trackGenerated(new ResourceLocation("trims/items/leggings_trim_" + trim.location().getPath()), ModelProvider.TEXTURE);
}
}

public OverrideBuilder override() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/neoforged/neoforge/client/model/generators/ModelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements DataPr
public static final String BLOCK_FOLDER = "block";
public static final String ITEM_FOLDER = "item";

protected static final ResourceType TEXTURE = new ResourceType(PackType.CLIENT_RESOURCES, ".png", "textures");
public static final ResourceType TEXTURE = new ResourceType(PackType.CLIENT_RESOURCES, ".png", "textures");
protected static final ResourceType MODEL = new ResourceType(PackType.CLIENT_RESOURCES, ".json", "models");
protected static final ResourceType MODEL_WITH_EXTENSION = new ResourceType(PackType.CLIENT_RESOURCES, "", "models");

Expand Down
7 changes: 7 additions & 0 deletions .../src/generated/resources/assets/data_gen_test/models/item/test_runtime_texture_model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/netherite_boots",
"layer1": "minecraft:trims/items/boots_trim_amethyst"
}
}
7 changes: 6 additions & 1 deletion tests/src/main/java/net/neoforged/neoforge/debug/DataGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,11 @@ protected void registerModels() {
.parent(new UncheckedModelFile("item/generated"))
.texture("layer0", mcLoc("block/stone"));

getBuilder("test_runtime_texture_model")
.parent(new UncheckedModelFile("item/generated"))
.texture("layer0", mcLoc("item/netherite_boots"))
.texture("layer1", mcLoc("trims/items/boots_trim_amethyst"));

getBuilder("test_block_model")
.parent(getExistingFile(mcLoc("block/block")))
.texture("all", mcLoc("block/dirt"))
Expand Down Expand Up @@ -549,7 +554,7 @@ protected void registerModels() {
.texture("layer0", mcLoc("item/fishing_rod_cast"));
}

private static final Set<String> IGNORED_MODELS = ImmutableSet.of("test_generated_model", "test_block_model",
private static final Set<String> IGNORED_MODELS = ImmutableSet.of("test_generated_model", "test_runtime_texture_model", "test_block_model",
"fishing_rod", "fishing_rod_cast" // Vanilla doesn't generate these yet, so they don't match due to having the minecraft domain
);

Expand Down
Loading