mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
Add generated resource tracking to ExistingFileHelper
This commit is contained in:
1 parent
a57a240c13
commit
2d9a1bc6f9
5 files changed
+154
-80
No files matched your search
@@ -19,7 +19,11 @@
|
||||
|
||||
package net.minecraftforge.client.model.generators;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.BiFunction;
|
||||
@@ -33,20 +37,19 @@ import com.google.gson.Gson;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraft.client.renderer.model.BlockFaceUV;
|
||||
import net.minecraft.client.renderer.model.BlockModel.GuiLight;
|
||||
import net.minecraft.client.renderer.model.BlockPart;
|
||||
import net.minecraft.client.renderer.model.BlockPartFace;
|
||||
import net.minecraft.client.renderer.model.BlockPartRotation;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
|
||||
import net.minecraft.client.renderer.model.ItemTransformVec3f;
|
||||
import net.minecraft.client.renderer.model.BlockModel.GuiLight;
|
||||
import net.minecraft.client.renderer.texture.MissingTextureSprite;
|
||||
import net.minecraft.resources.ResourcePackType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
/**
|
||||
* General purpose model builder, contains all the commonalities between item
|
||||
@@ -146,7 +149,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
public T texture(String key, ResourceLocation texture) {
|
||||
Preconditions.checkNotNull(key, "Key must not be null");
|
||||
Preconditions.checkNotNull(texture, "Texture must not be null");
|
||||
Preconditions.checkArgument(existingFileHelper.exists(texture, ResourcePackType.CLIENT_RESOURCES, ".png", "textures"),
|
||||
Preconditions.checkArgument(existingFileHelper.exists(texture, ModelProvider.TEXTURE),
|
||||
"Texture %s does not exist in any known resource pack", texture);
|
||||
this.textures.put(key, texture.toString());
|
||||
return self();
|
||||
|
||||
@@ -21,7 +21,6 @@ package net.minecraftforge.client.model.generators;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import net.minecraft.resources.ResourcePackType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
@@ -78,9 +77,9 @@ public abstract class ModelFile {
|
||||
@Override
|
||||
protected boolean exists() {
|
||||
if (getUncheckedLocation().getPath().contains("."))
|
||||
return existingHelper.exists(getUncheckedLocation(), ResourcePackType.CLIENT_RESOURCES, "", "models");
|
||||
return existingHelper.exists(getUncheckedLocation(), ModelProvider.MODEL_WITH_EXTENSION);
|
||||
else
|
||||
return existingHelper.exists(getUncheckedLocation(), ResourcePackType.CLIENT_RESOURCES, ".json", "models");
|
||||
return existingHelper.exists(getUncheckedLocation(), ModelProvider.MODEL);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,6 @@ package net.minecraftforge.client.model.generators;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.BiFunction;
|
||||
@@ -35,61 +34,20 @@ import com.google.gson.GsonBuilder;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.data.DirectoryCache;
|
||||
import net.minecraft.data.IDataProvider;
|
||||
import net.minecraft.resources.IResource;
|
||||
import net.minecraft.resources.ResourcePackType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper.ResourceType;
|
||||
|
||||
public abstract class ModelProvider<T extends ModelBuilder<T>> implements IDataProvider {
|
||||
|
||||
private class ExistingFileHelperIncludingGenerated extends ExistingFileHelper {
|
||||
|
||||
private final ExistingFileHelper delegate;
|
||||
|
||||
public ExistingFileHelperIncludingGenerated(ExistingFileHelper delegate) {
|
||||
super(Collections.emptyList(), Collections.emptySet(), true);
|
||||
this.delegate = delegate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean exists(ResourceLocation loc, ResourcePackType type, String pathSuffix, String pathPrefix)
|
||||
{
|
||||
if (pathPrefix.equals("models") && pathSuffix.equals(".json"))
|
||||
{
|
||||
if (generatedModels.containsKey(loc))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return delegate.exists(loc, type, pathSuffix, pathPrefix);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean exists(ResourceLocation loc, ResourcePackType type) {
|
||||
if (loc.getPath().startsWith("models/") && loc.getPath().endsWith(".json"))
|
||||
{
|
||||
ResourceLocation modelLoc = new ResourceLocation(
|
||||
loc.getNamespace(),
|
||||
loc.getPath().substring("models/".length(), loc.getPath().length() - ".json".length())
|
||||
);
|
||||
if (generatedModels.containsKey(modelLoc))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return delegate.exists(loc, type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IResource getResource(ResourceLocation loc, ResourcePackType type) throws IOException
|
||||
{
|
||||
return delegate.getResource(loc, type);
|
||||
}
|
||||
}
|
||||
|
||||
public static final String BLOCK_FOLDER = "block";
|
||||
public static final String ITEM_FOLDER = "item";
|
||||
|
||||
protected static final ResourceType TEXTURE = new ResourceType(ResourcePackType.CLIENT_RESOURCES, ".png", "textures");
|
||||
protected static final ResourceType MODEL = new ResourceType(ResourcePackType.CLIENT_RESOURCES, ".json", "models");
|
||||
protected static final ResourceType MODEL_WITH_EXTENSION = new ResourceType(ResourcePackType.CLIENT_RESOURCES, "", "models");
|
||||
|
||||
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
|
||||
protected final DataGenerator generator;
|
||||
protected final String modid;
|
||||
@@ -112,7 +70,7 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements IDataP
|
||||
Preconditions.checkNotNull(factory);
|
||||
this.factory = factory;
|
||||
Preconditions.checkNotNull(existingFileHelper);
|
||||
this.existingFileHelper = new ExistingFileHelperIncludingGenerated(existingFileHelper);
|
||||
this.existingFileHelper = existingFileHelper;
|
||||
}
|
||||
|
||||
public ModelProvider(DataGenerator generator, String modid, String folder, BiFunction<ResourceLocation, ExistingFileHelper, T> builderFromModId, ExistingFileHelper existingFileHelper) {
|
||||
@@ -122,6 +80,7 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements IDataP
|
||||
public T getBuilder(String path) {
|
||||
Preconditions.checkNotNull(path, "Path must not be null");
|
||||
ResourceLocation outputLoc = extendWithFolder(path.contains(":") ? new ResourceLocation(path) : new ResourceLocation(modid, path));
|
||||
this.existingFileHelper.trackGenerated(outputLoc, MODEL);
|
||||
return generatedModels.computeIfAbsent(outputLoc, factory);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user