Forge 1.19.3

Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab
Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry
Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider
Provided access to lookupProvider for datagen
Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18
Added a test mod for the new CreativeModeTabEvent
Throws better error message for Forge registries in tag datagen
Deleted ForgeRegistryTagsProvider
Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes
Added patches for both sign related methods in ModelLayers
Changed RegisterShadersEvent to use ResourceProvider
Migrated old Mojang math types to JOML

Co-authored-by: Marc Hermans <[email protected]>
Co-authored-by: LexManos <[email protected]>
Co-authored-by: sciwhiz12 <[email protected]>
Co-authored-by: coehlrich <[email protected]>
This commit is contained in:
committed 2022-12-08 01:45:22 -06:00
1 parent 617ecb7ad3
commit 8255d7aed3
726 files changed
+7615 -6653

No files matched your search

@@ -11,7 +11,15 @@ import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.mojang.datafixers.util.Pair;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockModel;
@@ -20,9 +28,8 @@ import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
@@ -43,17 +50,6 @@ import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
/**
* A model composed of several named children.
* <p>
@@ -81,7 +77,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
}
@Override
public BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
{
if (logWarning)
LOGGER.warn("Model \"" + modelLocation + "\" is using the deprecated \"parts\" field in its composite model instead of \"children\". This field will be removed in 1.20.");
@@ -100,7 +96,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
if (!context.isComponentVisible(name, true))
continue;
var model = entry.getValue();
bakedPartsBuilder.put(name, model.bake(bakery, model, spriteGetter, modelState, modelLocation, true));
bakedPartsBuilder.put(name, model.bake(baker, model, spriteGetter, modelState, modelLocation, true));
}
var bakedParts = bakedPartsBuilder.build();
@@ -116,17 +112,6 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
return new Baked(context.isGui3d(), context.useBlockLight(), context.useAmbientOcclusion(), particle, context.getTransforms(), overrides, bakedParts, itemPassesBuilder.build());
}
@Override
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<Material> textures = new HashSet<>();
if (context.hasMaterial("particle"))
textures.add(context.getMaterial("particle"));
for (BlockModel part : children.values())
textures.addAll(part.getMaterials(modelGetter, missingTextureErrors));
return textures;
}
@Override
public Set<String> getConfigurableComponentNames()
{
@@ -11,9 +11,7 @@ import com.google.common.collect.Sets;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import net.minecraft.client.color.item.ItemColor;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.renderer.RenderType;
@@ -22,7 +20,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.BlockModelRotation;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation;
@@ -46,6 +44,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import java.util.Collection;
import java.util.Map;
@@ -67,8 +67,8 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
private static final Logger LOGGER = LogManager.getLogger();
// Depth offsets to prevent Z-fighting
private static final Transformation FLUID_TRANSFORM = new Transformation(Vector3f.ZERO, Quaternion.ONE, new Vector3f(1, 1, 1.002f), Quaternion.ONE);
private static final Transformation COVER_TRANSFORM = new Transformation(Vector3f.ZERO, Quaternion.ONE, new Vector3f(1, 1, 1.004f), Quaternion.ONE);
private static final Transformation FLUID_TRANSFORM = new Transformation(new Vector3f(), new Quaternionf(), new Vector3f(1, 1, 1.002f), new Quaternionf());
private static final Transformation COVER_TRANSFORM = new Transformation(new Vector3f(), new Quaternionf(), new Vector3f(1, 1, 1.004f), new Quaternionf());
private final Fluid fluid;
private final boolean flipGas;
@@ -107,7 +107,7 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
}
@Override
public BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
{
if (deprecatedLoader)
LOGGER.warn("Model \"" + modelLocation + "\" is using the deprecated loader \"forge:bucket\" instead of \"forge:fluid_container\". This loader will be removed in 1.20.");
@@ -134,19 +134,19 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
{
modelState = new SimpleModelState(
modelState.getRotation().compose(
new Transformation(null, new Quaternion(0, 0, 1, 0), null, null)));
new Transformation(null, new Quaternionf(0, 0, 1, 0), null, null)));
}
// We need to disable GUI 3D and block lighting for this to render properly
var itemContext = StandaloneGeometryBakingContext.builder(context).withGui3d(false).withUseBlockLight(false).build(modelLocation);
var modelBuilder = CompositeModel.Baked.builder(itemContext, particleSprite, new ContainedFluidOverrideHandler(overrides, bakery, itemContext, this), context.getTransforms());
var modelBuilder = CompositeModel.Baked.builder(itemContext, particleSprite, new ContainedFluidOverrideHandler(overrides, baker, itemContext, this), context.getTransforms());
var normalRenderTypes = getLayerRenderTypes(false);
if (baseLocation != null && baseSprite != null)
{
// Base texture
var unbaked = UnbakedGeometryHelper.createUnbakedItemElements(0, baseSprite);
var unbaked = UnbakedGeometryHelper.createUnbakedItemElements(0, baseSprite.contents());
var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> baseSprite, modelState, modelLocation);
modelBuilder.addQuads(normalRenderTypes, quads);
}
@@ -158,7 +158,7 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
{
// Fluid layer
var transformedState = new SimpleModelState(modelState.getRotation().compose(FLUID_TRANSFORM), modelState.isUvLocked());
var unbaked = UnbakedGeometryHelper.createUnbakedItemMaskElements(1, templateSprite); // Use template as mask
var unbaked = UnbakedGeometryHelper.createUnbakedItemMaskElements(1, templateSprite.contents()); // Use template as mask
var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> fluidSprite, transformedState, modelLocation); // Bake with fluid texture
var emissive = applyFluidLuminosity && fluid.getFluidType().getLightLevel() > 0;
@@ -176,7 +176,7 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
{
// Cover/overlay
var transformedState = new SimpleModelState(modelState.getRotation().compose(COVER_TRANSFORM), modelState.isUvLocked());
var unbaked = UnbakedGeometryHelper.createUnbakedItemMaskElements(2, coverSprite); // Use cover as mask
var unbaked = UnbakedGeometryHelper.createUnbakedItemMaskElements(2, coverSprite.contents()); // Use cover as mask
var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> sprite, transformedState, modelLocation); // Bake with selected texture
modelBuilder.addQuads(normalRenderTypes, quads);
}
@@ -187,17 +187,6 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
return modelBuilder.build();
}
@Override
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<Material> textures = Sets.newHashSet();
if (context.hasMaterial("particle")) textures.add(context.getMaterial("particle"));
if (context.hasMaterial("base")) textures.add(context.getMaterial("base"));
if (context.hasMaterial("fluid")) textures.add(context.getMaterial("fluid"));
if (context.hasMaterial("cover")) textures.add(context.getMaterial("cover"));
return textures;
}
public static final class Loader implements IGeometryLoader<DynamicFluidContainerModel>
{
public static final Loader INSTANCE = new Loader(false);
@@ -252,14 +241,14 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
{
private final Map<String, BakedModel> cache = Maps.newHashMap(); // contains all the baked models since they'll never change
private final ItemOverrides nested;
private final ModelBakery bakery;
private final ModelBaker baker;
private final IGeometryBakingContext owner;
private final DynamicFluidContainerModel parent;
private ContainedFluidOverrideHandler(ItemOverrides nested, ModelBakery bakery, IGeometryBakingContext owner, DynamicFluidContainerModel parent)
private ContainedFluidOverrideHandler(ItemOverrides nested, ModelBaker baker, IGeometryBakingContext owner, DynamicFluidContainerModel parent)
{
this.nested = nested;
this.bakery = bakery;
this.baker = baker;
this.owner = owner;
this.parent = parent;
}
@@ -277,7 +266,7 @@ public class DynamicFluidContainerModel implements IUnbakedGeometry<DynamicFluid
if (!cache.containsKey(name))
{
DynamicFluidContainerModel unbaked = this.parent.withFluid(fluid);
BakedModel bakedModel = unbaked.bake(owner, bakery, Material::sprite, BlockModelRotation.X0_Y0, this, new ResourceLocation("forge:bucket_override"));
BakedModel bakedModel = unbaked.bake(owner, baker, Material::sprite, BlockModelRotation.X0_Y0, this, new ResourceLocation("forge:bucket_override"));
cache.put(name, bakedModel);
return bakedModel;
}
@@ -11,13 +11,18 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.mojang.datafixers.util.Pair;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.core.Direction;
@@ -29,12 +34,6 @@ import net.minecraftforge.client.model.geometry.SimpleUnbakedGeometry;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
/**
* A model composed of vanilla {@linkplain BlockElement block elements}.
*/
@@ -57,7 +56,7 @@ public class ElementsModel extends SimpleUnbakedGeometry<ElementsModel>
}
@Override
protected void addQuads(IGeometryBakingContext context, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ResourceLocation modelLocation)
protected void addQuads(IGeometryBakingContext context, IModelBuilder<?> modelBuilder, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ResourceLocation modelLocation)
{
if (deprecatedLoader)
LOGGER.warn("Model \"" + modelLocation + "\" is using the deprecated loader \"minecraft:elements\" instead of \"forge:elements\". This loader will be removed in 1.20.");
@@ -85,26 +84,6 @@ public class ElementsModel extends SimpleUnbakedGeometry<ElementsModel>
}
}
@Override
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<Material> textures = Sets.newHashSet();
if (context.hasMaterial("particle"))
textures.add(context.getMaterial("particle"));
for (BlockElement part : elements)
{
for (BlockElementFace face : part.faces.values())
{
Material texture = context.getMaterial(face.texture);
if (texture.texture().equals(MissingTextureAtlasSprite.getLocation()))
missingTextureErrors.add(Pair.of(face.texture, context.getModelName()));
textures.add(texture);
}
}
return textures;
}
public static final class Loader implements IGeometryLoader<ElementsModel>
{
public static final Loader INSTANCE = new Loader(false);
@@ -6,6 +6,11 @@
package net.minecraftforge.client.model;
import com.mojang.datafixers.util.Pair;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
@@ -13,7 +18,7 @@ import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.SimpleBakedModel;
import net.minecraft.client.resources.model.UnbakedModel;
@@ -25,12 +30,6 @@ import net.minecraftforge.client.model.geometry.IUnbakedGeometry;
import net.minecraftforge.client.model.geometry.SimpleUnbakedGeometry;
import net.minecraftforge.client.textures.UnitTextureAtlasSprite;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
/**
* A completely empty model with no quads or texture dependencies.
* <p>
@@ -47,23 +46,17 @@ public class EmptyModel extends SimpleUnbakedGeometry<EmptyModel>
}
@Override
protected void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
protected void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
// NO-OP
}
@Override
public BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
{
return BAKED;
}
@Override
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
return List.of(); // NO-OP
}
private static class Baked extends SimpleBakedModel
{
private static final Material MISSING_TEXTURE = new Material(TextureAtlas.LOCATION_BLOCKS, MissingTextureAtlasSprite.getLocation());
@@ -21,7 +21,7 @@ import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation;
@@ -71,10 +71,18 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
}
@Override
public BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
{
if (textures == null)
throw new IllegalStateException("Textures have not been initialized. Either pass them in through the constructor or call getMaterials(...) first.");
if (textures == null) {
ImmutableList.Builder<Material> builder = ImmutableList.builder();
if (context.hasMaterial("particle"))
builder.add(context.getMaterial("particle"));
for (int i = 0; context.hasMaterial("layer" + i); i++)
{
builder.add(context.getMaterial("layer" + i));
}
textures = builder.build();
}
if (deprecatedLoader)
LOGGER.warn("Model \"" + modelLocation + "\" is using the deprecated loader \"forge:item-layers\" instead of \"forge:item_layers\". This loader will be removed in 1.20.");
@@ -93,7 +101,7 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
for (int i = 0; i < textures.size(); i++)
{
TextureAtlasSprite sprite = spriteGetter.apply(textures.get(i));
var unbaked = UnbakedGeometryHelper.createUnbakedItemElements(i, sprite);
var unbaked = UnbakedGeometryHelper.createUnbakedItemElements(i, sprite.contents());
var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> sprite, modelState, modelLocation);
if (emissiveLayers.contains(i)) QuadTransformers.settingMaxEmissivity().processInPlace(quads);
var renderTypeName = renderTypeNames.get(i);
@@ -104,22 +112,6 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
return builder.build();
}
@Override
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
if (textures != null)
return textures;
ImmutableList.Builder<Material> builder = ImmutableList.builder();
if (context.hasMaterial("particle"))
builder.add(context.getMaterial("particle"));
for (int i = 0; context.hasMaterial("layer" + i); i++)
{
builder.add(context.getMaterial("layer" + i));
}
return textures = builder.build();
}
public static final class Loader implements IGeometryLoader<ItemLayerModel>
{
public static final Loader INSTANCE = new Loader(false);
@@ -7,11 +7,11 @@ package net.minecraftforge.client.model;
import com.google.common.base.Preconditions;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
import net.minecraft.Util;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.block.model.BakedQuad;
import org.joml.Vector3f;
import org.joml.Vector4f;
import java.util.Arrays;
@@ -53,7 +53,7 @@ public final class QuadTransformers {
Vector4f pos = new Vector4f(x, y, z, 1);
transform.transformPosition(pos);
pos.perspectiveDivide();
pos.div(pos.w);
vertices[offset] = Float.floatToRawIntBits(pos.x());
vertices[offset + 1] = Float.floatToRawIntBits(pos.y());
@@ -7,11 +7,13 @@ package net.minecraftforge.client.model;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.datafixers.util.Pair;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockModel;
@@ -20,9 +22,8 @@ import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.GsonHelper;
@@ -38,13 +39,6 @@ import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
/**
* A model composed of multiple sub-models which are picked based on the {@link ItemTransforms.TransformType} being used.
*/
@@ -69,7 +63,7 @@ public class SeparateTransformsModel implements IUnbakedGeometry<SeparateTransfo
}
@Override
public BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
{
if (deprecatedLoader)
LOGGER.warn("Model \"" + modelLocation + "\" is using the deprecated loader \"forge:separate-perspective\" instead of \"forge:separate_transforms\". This loader will be removed in 1.20.");
@@ -77,25 +71,13 @@ public class SeparateTransformsModel implements IUnbakedGeometry<SeparateTransfo
return new Baked(
context.useAmbientOcclusion(), context.isGui3d(), context.useBlockLight(),
spriteGetter.apply(context.getMaterial("particle")), overrides,
baseModel.bake(bakery, baseModel, spriteGetter, modelState, modelLocation, context.useBlockLight()),
baseModel.bake(baker, baseModel, spriteGetter, modelState, modelLocation, context.useBlockLight()),
ImmutableMap.copyOf(Maps.transformValues(perspectives, value -> {
return value.bake(bakery, value, spriteGetter, modelState, modelLocation, context.useBlockLight());
return value.bake(baker, value, spriteGetter, modelState, modelLocation, context.useBlockLight());
}))
);
}
@Override
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<Material> textures = Sets.newHashSet();
if (context.hasMaterial("particle"))
textures.add(context.getMaterial("particle"));
textures.addAll(baseModel.getMaterials(modelGetter, missingTextureErrors));
for (BlockModel model : perspectives.values())
textures.addAll(model.getMaterials(modelGetter, missingTextureErrors));
return textures;
}
public static class Baked implements IDynamicBakedModel
{
private final boolean isAmbientOcclusion;
@@ -8,20 +8,21 @@ package net.minecraftforge.client.model.generators;
import com.google.common.base.Preconditions;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.StringRepresentable;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.common.util.TransformationHelper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.joml.Quaternionf;
import org.joml.Vector3f;
/**
* Builder for block models, does not currently provide any additional
* functionality over {@link ModelBuilder}, purely a stub class with a concrete
* generic.
*
*
* @see ModelProvider
* @see ModelBuilder
*/
@@ -58,9 +59,9 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
{
private static final Vector3f ONE = new Vector3f(1, 1, 1);
private Vector3f translation = Vector3f.ZERO;
private Quaternion leftRotation = Quaternion.ONE.copy();
private Quaternion rightRotation = Quaternion.ONE.copy();
private Vector3f translation = new Vector3f();
private Quaternionf leftRotation = new Quaternionf();
private Quaternionf rightRotation = new Quaternionf();
private Vector3f scale = ONE;
private @Nullable TransformOrigin origin;
@@ -103,7 +104,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
* @return this builder
* @throws NullPointerException if {@code rotation} is {@code null}
*/
public RootTransformBuilder rotation(Quaternion rotation)
public RootTransformBuilder rotation(Quaternionf rotation)
{
this.leftRotation = Preconditions.checkNotNull(rotation, "Rotation must not be null");
return this;
@@ -120,7 +121,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
*/
public RootTransformBuilder rotation(float x, float y, float z, boolean isDegrees)
{
return rotation(new Quaternion(x, y, z, isDegrees));
return rotation(TransformationHelper.quatFromXYZ(x, y, z, isDegrees));
}
/**
@@ -130,7 +131,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
* @return this builder
* @throws NullPointerException if {@code leftRotation} is {@code null}
*/
public RootTransformBuilder leftRotation(Quaternion leftRotation)
public RootTransformBuilder leftRotation(Quaternionf leftRotation)
{
return rotation(leftRotation);
}
@@ -146,7 +147,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
*/
public RootTransformBuilder leftRotation(float x, float y, float z, boolean isDegrees)
{
return leftRotation(new Quaternion(x, y, z, isDegrees));
return leftRotation(TransformationHelper.quatFromXYZ(x, y, z, isDegrees));
}
/**
@@ -156,7 +157,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
* @return this builder
* @throws NullPointerException if {@code rightRotation} is {@code null}
*/
public RootTransformBuilder rightRotation(Quaternion rightRotation)
public RootTransformBuilder rightRotation(Quaternionf rightRotation)
{
this.rightRotation = Preconditions.checkNotNull(rightRotation, "Rotation must not be null");
return this;
@@ -173,7 +174,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
*/
public RootTransformBuilder rightRotation(float x, float y, float z, boolean isDegrees)
{
return rightRotation(new Quaternion(x, y, z, isDegrees));
return rightRotation(TransformationHelper.quatFromXYZ(x, y, z, isDegrees));
}
/**
@@ -183,7 +184,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
* @return this builder
* @throws NullPointerException if {@code rightRotation} is {@code null}
*/
public RootTransformBuilder postRotation(Quaternion postRotation)
public RootTransformBuilder postRotation(Quaternionf postRotation)
{
return rightRotation(postRotation);
}
@@ -199,7 +200,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
*/
public RootTransformBuilder postRotation(float x, float y, float z, boolean isDegrees)
{
return postRotation(new Quaternion(x, y, z, isDegrees));
return postRotation(TransformationHelper.quatFromXYZ(x, y, z, isDegrees));
}
/**
@@ -299,7 +300,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
// Write the transform to an object
JsonObject transform = new JsonObject();
if (!translation.equals(Vector3f.ZERO))
if (!translation.equals(0, 0, 0))
{
transform.add("translation", writeVec3(translation));
}
@@ -309,12 +310,12 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
transform.add("scale", writeVec3(scale));
}
if (!leftRotation.equals(Quaternion.ONE))
if (!leftRotation.equals(0, 0, 0, 1))
{
transform.add("rotation", writeQuaternion(leftRotation));
}
if (!rightRotation.equals(Quaternion.ONE))
if (!rightRotation.equals(0, 0, 0, 1))
{
transform.add("post_rotation", writeQuaternion(rightRotation));
}
@@ -323,7 +324,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
{
transform.addProperty("origin", origin.getSerializedName());
}
else if (originVec != null && !originVec.equals(Vector3f.ZERO))
else if (originVec != null && !originVec.equals(0, 0, 0))
{
transform.add("origin", writeVec3(originVec));
}
@@ -334,7 +335,7 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
public enum TransformOrigin implements StringRepresentable
{
CENTER(new Vector3f(.5f, .5f, .5f), "center"),
CORNER(Vector3f.ZERO, "corner"),
CORNER(new Vector3f(), "corner"),
OPPOSING_CORNER(ONE, "opposing-corner");
private final Vector3f vec;
@@ -385,13 +386,13 @@ public class BlockModelBuilder extends ModelBuilder<BlockModelBuilder>
return array;
}
private JsonArray writeQuaternion(Quaternion quaternion)
private JsonArray writeQuaternion(Quaternionf quaternion)
{
JsonArray array = new JsonArray();
array.add(quaternion.i());
array.add(quaternion.j());
array.add(quaternion.k());
array.add(quaternion.r());
array.add(quaternion.x());
array.add(quaternion.y());
array.add(quaternion.z());
array.add(quaternion.w());
return array;
}
}
@@ -5,23 +5,6 @@
package net.minecraftforge.client.model.generators;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import net.minecraft.data.CachedOutput;
import net.minecraft.world.level.block.ButtonBlock;
import net.minecraft.world.level.block.PressurePlateBlock;
import net.minecraft.world.level.block.StandingSignBlock;
import net.minecraft.world.level.block.WallSignBlock;
import net.minecraftforge.registries.ForgeRegistries;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
@@ -31,35 +14,51 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.DataProvider;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.ButtonBlock;
import net.minecraft.world.level.block.CrossCollisionBlock;
import net.minecraft.world.level.block.DoorBlock;
import net.minecraft.world.level.block.FenceBlock;
import net.minecraft.world.level.block.FenceGateBlock;
import net.minecraft.world.level.block.CrossCollisionBlock;
import net.minecraft.world.level.block.IronBarsBlock;
import net.minecraft.world.level.block.RotatedPillarBlock;
import net.minecraft.world.level.block.PipeBlock;
import net.minecraft.world.level.block.PressurePlateBlock;
import net.minecraft.world.level.block.RotatedPillarBlock;
import net.minecraft.world.level.block.SlabBlock;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.StandingSignBlock;
import net.minecraft.world.level.block.TrapDoorBlock;
import net.minecraft.world.level.block.WallBlock;
import net.minecraft.world.level.block.state.properties.WallSide;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.DataProvider;
import net.minecraft.world.level.block.state.properties.Property;
import net.minecraft.world.level.block.WallSignBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.AttachFace;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.DoorHingeSide;
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
import net.minecraft.world.level.block.state.properties.Half;
import net.minecraft.world.level.block.state.properties.Property;
import net.minecraft.world.level.block.state.properties.SlabType;
import net.minecraft.world.level.block.state.properties.StairsShape;
import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis;
import net.minecraft.world.level.block.state.properties.WallSide;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistries;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
/**
@@ -83,28 +82,31 @@ public abstract class BlockStateProvider implements DataProvider {
this.generator = gen;
this.modid = modid;
this.blockModels = new BlockModelProvider(gen, modid, exFileHelper) {
@Override public void run(CachedOutput p_236071_) throws IOException {}
@Override public CompletableFuture<?> run(CachedOutput cache) { return CompletableFuture.allOf(); }
@Override protected void registerModels() {}
};
this.itemModels = new ItemModelProvider(gen, modid, this.blockModels.existingFileHelper) {
@Override protected void registerModels() {}
@Override public void run(CachedOutput p_236071_) throws IOException {}
@Override public CompletableFuture<?> run(CachedOutput cache) { return CompletableFuture.allOf(); }
};
}
@Override
public void run(CachedOutput cache) throws IOException {
public CompletableFuture<?> run(CachedOutput cache) {
models().clear();
itemModels().clear();
registeredBlocks.clear();
registerStatesAndModels();
models().generateAll(cache);
itemModels().generateAll(cache);
CompletableFuture<?>[] futures = new CompletableFuture<?>[this.registeredBlocks.size()];
int i = 0;
for (Map.Entry<Block, IGeneratedBlockState> entry : registeredBlocks.entrySet()) {
saveBlockState(cache, entry.getValue().toJson(), entry.getKey());
futures[i++] = saveBlockState(cache, entry.getValue().toJson(), entry.getKey());
}
return CompletableFuture.allOf(futures);
}
protected abstract void registerStatesAndModels();
@@ -853,16 +855,11 @@ public abstract class BlockStateProvider implements DataProvider {
}, TrapDoorBlock.POWERED, TrapDoorBlock.WATERLOGGED);
}
private void saveBlockState(CachedOutput cache, JsonObject stateJson, Block owner) {
private CompletableFuture<?> saveBlockState(CachedOutput cache, JsonObject stateJson, Block owner) {
ResourceLocation blockName = Preconditions.checkNotNull(key(owner));
Path mainOutput = generator.getOutputFolder();
String pathSuffix = "assets/" + blockName.getNamespace() + "/blockstates/" + blockName.getPath() + ".json";
Path outputPath = mainOutput.resolve(pathSuffix);
try {
DataProvider.saveStable(cache, stateJson, outputPath);
} catch (IOException e) {
LOGGER.error("Couldn't save blockstate to {}", outputPath, e);
}
Path outputPath = this.generator.getPackOutput().getOutputFolder(PackOutput.Target.RESOURCE_PACK)
.resolve(blockName.getNamespace()).resolve("blockstates").resolve(blockName.getPath() + ".json");
return DataProvider.saveStable(cache, stateJson, outputPath);
}
@NotNull
@@ -32,9 +32,9 @@ import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import com.mojang.math.Vector3f;
import net.minecraftforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.Nullable;
import org.joml.Vector3f;
/**
* General purpose model builder, contains all the commonalities between item
@@ -285,11 +285,11 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
if (part.rotation != null) {
JsonObject rotation = new JsonObject();
rotation.add("origin", serializeVector3f(part.rotation.origin));
rotation.addProperty("axis", part.rotation.axis.getSerializedName());
rotation.addProperty("angle", part.rotation.angle);
if (part.rotation.rescale) {
rotation.addProperty("rescale", part.rotation.rescale);
rotation.add("origin", serializeVector3f(part.rotation.origin()));
rotation.addProperty("axis", part.rotation.axis().getSerializedName());
rotation.addProperty("angle", part.rotation.angle());
if (part.rotation.rescale()) {
rotation.addProperty("rescale", part.rotation.rescale());
}
partObj.add("rotation", rotation);
}
@@ -695,10 +695,10 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
public class TransformVecBuilder {
private Vector3f rotation = ItemTransform.Deserializer.DEFAULT_ROTATION.copy();
private Vector3f translation = ItemTransform.Deserializer.DEFAULT_TRANSLATION.copy();
private Vector3f scale = ItemTransform.Deserializer.DEFAULT_SCALE.copy();
private Vector3f rightRotation = ItemTransform.Deserializer.DEFAULT_ROTATION.copy();
private Vector3f rotation = new Vector3f(ItemTransform.Deserializer.DEFAULT_ROTATION);
private Vector3f translation = new Vector3f(ItemTransform.Deserializer.DEFAULT_TRANSLATION);
private Vector3f scale = new Vector3f(ItemTransform.Deserializer.DEFAULT_SCALE);
private Vector3f rightRotation = new Vector3f(ItemTransform.Deserializer.DEFAULT_ROTATION);
TransformVecBuilder(TransformType type) {
// param unused for functional match
@@ -5,24 +5,22 @@
package net.minecraftforge.client.model.generators;
import java.io.IOException;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.function.Function;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction;
import java.util.function.Function;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.HashCache;
import net.minecraft.data.DataProvider;
import net.minecraft.server.packs.PackType;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.PackType;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.common.data.ExistingFileHelper.ResourceType;
@@ -262,7 +260,7 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements DataPr
public T wallSide(String name, ResourceLocation wall) {
return singleTexture(name, BLOCK_FOLDER + "/template_wall_side", "wall", wall);
}
public T wallSideTall(String name, ResourceLocation wall) {
return singleTexture(name, BLOCK_FOLDER + "/template_wall_side_tall", "wall", wall);
}
@@ -384,31 +382,32 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements DataPr
ret.assertExistence();
return ret;
}
protected void clear() {
generatedModels.clear();
}
@Override
public void run(CachedOutput cache) throws IOException {
public CompletableFuture<?> run(CachedOutput cache) {
clear();
registerModels();
generateAll(cache);
return generateAll(cache);
}
protected void generateAll(CachedOutput cache) {
for (T model : generatedModels.values()) {
protected CompletableFuture<?> generateAll(CachedOutput cache) {
CompletableFuture<?>[] futures = new CompletableFuture<?>[this.generatedModels.size()];
int i = 0;
for (T model : this.generatedModels.values()) {
Path target = getPath(model);
try {
DataProvider.saveStable(cache, model.toJson(), target);
} catch (IOException e) {
throw new RuntimeException(e);
}
futures[i++] = DataProvider.saveStable(cache, model.toJson(), target);
}
return CompletableFuture.allOf(futures);
}
private Path getPath(T model) {
protected Path getPath(T model) {
ResourceLocation loc = model.getLocation();
return generator.getOutputFolder().resolve("assets/" + loc.getNamespace() + "/models/" + loc.getPath() + ".json");
return this.generator.getPackOutput().getOutputFolder(PackOutput.Target.RESOURCE_PACK).resolve(loc.getNamespace()).resolve("models").resolve(loc.getPath() + ".json");
}
}
@@ -7,25 +7,24 @@ package net.minecraftforge.client.model.geometry;
import com.mojang.datafixers.util.Pair;
import com.mojang.math.Transformation;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
/**
* A {@linkplain IGeometryBakingContext geometry baking context} that is bound to a {@link BlockModel}.
@@ -150,19 +149,12 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext
this.renderTypeHint = other.renderTypeHint;
}
public Collection<Material> getTextureDependencies(Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
IUnbakedGeometry<?> geometry = getCustomGeometry();
return geometry == null ? Collections.emptySet() :
geometry.getMaterials(this, modelGetter, missingTextureErrors);
}
public BakedModel bake(ModelBakery bakery, Function<Material, TextureAtlasSprite> bakedTextureGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
public BakedModel bake(ModelBaker baker, Function<Material, TextureAtlasSprite> bakedTextureGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
IUnbakedGeometry<?> geometry = getCustomGeometry();
if (geometry == null)
throw new IllegalStateException("Can not use custom baking without custom geometry");
return geometry.bake(this, bakery, bakedTextureGetter, modelTransform, overrides, modelLocation);
return geometry.bake(this, baker, bakedTextureGetter, modelTransform, overrides, modelLocation);
}
public static class VisibilityData
@@ -5,20 +5,17 @@
package net.minecraftforge.client.model.geometry;
import com.mojang.datafixers.util.Pair;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
/**
* General interface for any model that can be baked, superset of vanilla {@link UnbakedModel}.
* <p>
@@ -29,9 +26,7 @@ import java.util.function.Function;
*/
public interface IUnbakedGeometry<T extends IUnbakedGeometry<T>>
{
BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation);
Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation);
/**
* {@return a set of all the components whose visibility may be configured via {@link IGeometryBakingContext}}
@@ -5,23 +5,18 @@
package net.minecraftforge.client.model.geometry;
import com.mojang.datafixers.util.Pair;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.RenderTypeGroup;
import net.minecraftforge.client.model.IModelBuilder;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
/**
* Base class for implementations of {@link IUnbakedGeometry} which do not wish to handle model creation themselves,
* instead supplying {@linkplain BakedQuad baked quads} through a builder.
@@ -29,7 +24,7 @@ import java.util.function.Function;
public abstract class SimpleUnbakedGeometry<T extends SimpleUnbakedGeometry<T>> implements IUnbakedGeometry<T>
{
@Override
public BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
{
TextureAtlasSprite particle = spriteGetter.apply(context.getMaterial("particle"));
@@ -38,13 +33,10 @@ public abstract class SimpleUnbakedGeometry<T extends SimpleUnbakedGeometry<T>>
IModelBuilder<?> builder = IModelBuilder.of(context.useAmbientOcclusion(), context.useBlockLight(), context.isGui3d(),
context.getTransforms(), overrides, particle, renderTypes);
addQuads(context, builder, bakery, spriteGetter, modelState, modelLocation);
addQuads(context, builder, baker, spriteGetter, modelState, modelLocation);
return builder.build();
}
protected abstract void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation);
@Override
public abstract Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
protected abstract void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation);
}
@@ -6,7 +6,6 @@
package net.minecraftforge.client.model.geometry;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import net.minecraft.Util;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockElement;
@@ -16,11 +15,13 @@ import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.block.model.FaceBakery;
import net.minecraft.client.renderer.block.model.ItemModelGenerator;
import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
import net.minecraft.client.renderer.texture.SpriteContents;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.BuiltInModel;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.core.Direction;
@@ -30,6 +31,7 @@ import net.minecraftforge.client.model.IModelBuilder;
import net.minecraftforge.client.model.SimpleModelState;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
import org.joml.Vector3f;
import java.util.ArrayList;
import java.util.BitSet;
@@ -93,17 +95,17 @@ public class UnbakedGeometryHelper
* Helper for baking {@link BlockModel} instances. Handles baking custom geometries and deferring item model baking.
*/
@ApiStatus.Internal
public static BakedModel bake(BlockModel blockModel, ModelBakery modelBakery, BlockModel owner, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ResourceLocation modelLocation, boolean guiLight3d)
public static BakedModel bake(BlockModel blockModel, ModelBaker modelBaker, BlockModel owner, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ResourceLocation modelLocation, boolean guiLight3d)
{
IUnbakedGeometry<?> customModel = blockModel.customData.getCustomGeometry();
if (customModel != null)
return customModel.bake(blockModel.customData, modelBakery, spriteGetter, modelState, blockModel.getOverrides(modelBakery, owner, spriteGetter), modelLocation);
return customModel.bake(blockModel.customData, modelBaker, spriteGetter, modelState, blockModel.getOverrides(modelBaker, owner, spriteGetter), modelLocation);
// Handle vanilla item models here, since vanilla has a shortcut for them
if (blockModel.getRootModel() == ModelBakery.GENERATION_MARKER)
return ITEM_MODEL_GENERATOR.generateBlockModel(spriteGetter, blockModel).bake(modelBakery, blockModel, spriteGetter, modelState, modelLocation, guiLight3d);
return ITEM_MODEL_GENERATOR.generateBlockModel(spriteGetter, blockModel).bake(modelBaker, blockModel, spriteGetter, modelState, modelLocation, guiLight3d);
return bakeVanilla(blockModel, modelBakery, owner, spriteGetter, modelState, modelLocation);
return bakeVanilla(blockModel, modelBaker, owner, spriteGetter, modelState, modelLocation);
}
/**
@@ -113,48 +115,48 @@ public class UnbakedGeometryHelper
*/
@ApiStatus.Internal
@Deprecated(forRemoval = true, since = "1.19.2")
public static BakedModel bakeVanilla(BlockModel blockModel, ModelBakery modelBakery, BlockModel owner, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ResourceLocation modelLocation)
public static BakedModel bakeVanilla(BlockModel blockModel, ModelBaker modelBaker, BlockModel owner, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ResourceLocation modelLocation)
{
if (blockModel.getRootModel() == ModelBakery.BLOCK_ENTITY_MARKER)
{
var particleSprite = spriteGetter.apply(blockModel.getMaterial("particle"));
return new BuiltInModel(blockModel.getTransforms(), blockModel.getOverrides(modelBakery, owner, spriteGetter), particleSprite, blockModel.getGuiLight().lightLikeBlock());
return new BuiltInModel(blockModel.getTransforms(), blockModel.getOverrides(modelBaker, owner, spriteGetter), particleSprite, blockModel.getGuiLight().lightLikeBlock());
}
var elementsModel = new ElementsModel(blockModel.getElements());
return elementsModel.bake(blockModel.customData, modelBakery, spriteGetter, modelState, blockModel.getOverrides(modelBakery, owner, spriteGetter), modelLocation);
return elementsModel.bake(blockModel.customData, modelBaker, spriteGetter, modelState, blockModel.getOverrides(modelBaker, owner, spriteGetter), modelLocation);
}
/**
* Creates a list of {@linkplain BlockElement block elements} in the shape of the specified sprite.
* Creates a list of {@linkplain BlockElement block elements} in the shape of the specified sprite contents.
* These can later be baked using the same, or another texture.
* <p>
* The {@link Direction#NORTH} and {@link Direction#SOUTH} faces take up the whole surface.
*/
public static List<BlockElement> createUnbakedItemElements(int layerIndex, TextureAtlasSprite sprite)
public static List<BlockElement> createUnbakedItemElements(int layerIndex, SpriteContents spriteContents)
{
return ITEM_MODEL_GENERATOR.processFrames(layerIndex, "layer" + layerIndex, sprite);
return ITEM_MODEL_GENERATOR.processFrames(layerIndex, "layer" + layerIndex, spriteContents);
}
/**
* Creates a list of {@linkplain BlockElement block elements} in the shape of the specified sprite.
* Creates a list of {@linkplain BlockElement block elements} in the shape of the specified sprite contents.
* These can later be baked using the same, or another texture.
* <p>
* The {@link Direction#NORTH} and {@link Direction#SOUTH} faces take up only the pixels the texture uses.
*/
public static List<BlockElement> createUnbakedItemMaskElements(int layerIndex, TextureAtlasSprite sprite)
public static List<BlockElement> createUnbakedItemMaskElements(int layerIndex, SpriteContents spriteContents)
{
var elements = createUnbakedItemElements(layerIndex, sprite);
var elements = createUnbakedItemElements(layerIndex, spriteContents);
elements.remove(0); // Remove north and south faces
int width = sprite.getWidth(), height = sprite.getHeight();
int width = spriteContents.width(), height = spriteContents.height();
var bits = new BitSet(width * height);
// For every frame in the texture, mark all the opaque pixels (this is what vanilla does too)
sprite.getUniqueFrames().forEach(frame -> {
spriteContents.getUniqueFrames().forEach(frame -> {
for (int x = 0; x < width; x++)
for (int y = 0; y < height; y++)
if (!sprite.isTransparent(frame, x, y))
if (!spriteContents.isTransparent(frame, x, y))
bits.set(x + y * width);
});
@@ -244,4 +246,4 @@ public class UnbakedGeometryHelper
{
return FACE_BAKERY.bakeQuad(element.from, element.to, face, sprite, direction, state, element.rotation, element.shade, modelLocation);
}
}
}
@@ -7,12 +7,12 @@ package net.minecraftforge.client.model.lighting;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Vector3f;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.block.state.BlockState;
import org.joml.Vector3f;
import java.util.Objects;
@@ -6,8 +6,8 @@
package net.minecraftforge.client.model.obj;
import com.google.common.collect.Maps;
import com.mojang.math.Vector4f;
import joptsimple.internal.Strings;
import org.joml.Vector4f;
import java.io.IOException;
import java.util.Arrays;
@@ -100,11 +100,11 @@ public class ObjMaterialLibrary
public static class Material
{
public final String name;
public Vector4f ambientColor = new Vector4f(0, 0, 0, 1);
public Vector4f ambientColor = new Vector4f();
public String ambientColorMap;
public Vector4f diffuseColor = new Vector4f(1, 1, 1, 1);
public String diffuseColorMap;
public Vector4f specularColor = new Vector4f(0, 0, 0, 1);
public Vector4f specularColor = new Vector4f();
public float specularHighlight = 0;
public String specularColorMap;
@@ -9,14 +9,12 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
import joptsimple.internal.Strings;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.core.Direction;
@@ -35,6 +33,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.joml.Vector3f;
import org.joml.Vector4f;
import java.io.IOException;
import java.util.ArrayList;
@@ -326,7 +326,7 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
{
return switch (line.length)
{
case 1 -> new Vector3f(0, 0, 0);
case 1 -> new Vector3f();
case 2 -> new Vector3f(Float.parseFloat(line[1]), 0, 0);
case 3 -> new Vector3f(Float.parseFloat(line[1]), Float.parseFloat(line[2]), 0);
default -> new Vector3f(Float.parseFloat(line[1]), Float.parseFloat(line[2]), Float.parseFloat(line[3]));
@@ -337,7 +337,7 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
{
return switch (line.length)
{
case 1 -> new Vector4f(0, 0, 0, 1);
case 1 -> new Vector4f();
case 2 -> new Vector4f(Float.parseFloat(line[1]), 0, 0, 1);
case 3 -> new Vector4f(Float.parseFloat(line[1]), Float.parseFloat(line[2]), 0, 1);
case 4 -> new Vector4f(Float.parseFloat(line[1]), Float.parseFloat(line[2]), Float.parseFloat(line[3]), 1);
@@ -346,22 +346,13 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
}
@Override
protected void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
protected void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
for (var entry : deprecationWarnings.entrySet())
LOGGER.warn("Model \"" + modelLocation + "\" is using the deprecated \"" + entry.getKey() + "\" field in its OBJ model instead of \"" + entry.getValue() + "\". This field will be removed in 1.20.");
parts.values().stream().filter(part -> owner.isComponentVisible(part.name(), true))
.forEach(part -> part.addQuads(owner, modelBuilder, bakery, spriteGetter, modelTransform, modelLocation));
}
@Override
public Collection<Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
{
Set<Material> combined = Sets.newHashSet();
for (ModelGroup part : parts.values())
combined.addAll(part.getTextures(context, modelGetter, missingTextureErrors));
return combined;
.forEach(part -> part.addQuads(owner, modelBuilder, baker, spriteGetter, modelTransform, modelLocation));
}
public Set<String> getRootComponentNames()
@@ -387,15 +378,15 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
{
needsNormalRecalculation |= ints.length < 3;
}
Vector3f faceNormal = new Vector3f(0, 0, 0);
Vector3f faceNormal = new Vector3f();
if (needsNormalRecalculation)
{
Vector3f a = positions.get(indices[0][0]);
Vector3f ab = positions.get(indices[1][0]);
Vector3f ac = positions.get(indices[2][0]);
Vector3f abs = ab.copy();
Vector3f abs = new Vector3f(ab);
abs.sub(a);
Vector3f acs = ac.copy();
Vector3f acs = new Vector3f(ac);
acs.sub(a);
abs.cross(acs);
abs.normalize();
@@ -429,14 +420,14 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
for (int i = 0; i < 4; i++)
{
int[] index = indices[Math.min(i, indices.length - 1)];
Vector4f position = new Vector4f(positions.get(index[0]));
Vector4f position = new Vector4f(positions.get(index[0]), 1);
Vec2 texCoord = index.length >= 2 && texCoords.size() > 0 ? texCoords.get(index[1]) : DEFAULT_COORDS[i];
Vector3f norm0 = !needsNormalRecalculation && index.length >= 3 && normals.size() > 0 ? normals.get(index[2]) : faceNormal;
Vector3f normal = norm0;
Vector4f color = index.length >= 4 && colors.size() > 0 ? colors.get(index[3]) : COLOR_WHITE;
if (hasTransform)
{
normal = norm0.copy();
normal = new Vector3f(norm0);
transformation.transformPosition(position);
transformation.transformNormal(normal);
}
@@ -548,7 +539,7 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
return name;
}
public void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
public void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
for (ModelMesh mesh : meshes)
{
@@ -589,12 +580,12 @@ public class ObjModel extends SimpleUnbakedGeometry<ObjModel>
}
@Override
public void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
public void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
super.addQuads(owner, modelBuilder, bakery, spriteGetter, modelTransform, modelLocation);
super.addQuads(owner, modelBuilder, baker, spriteGetter, modelTransform, modelLocation);
parts.values().stream().filter(part -> owner.isComponentVisible(part.name(), true))
.forEach(part -> part.addQuads(owner, modelBuilder, bakery, spriteGetter, modelTransform, modelLocation));
.forEach(part -> part.addQuads(owner, modelBuilder, baker, spriteGetter, modelTransform, modelLocation));
}
@Override
@@ -9,9 +9,9 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import com.mojang.math.Vector3d;
import com.mojang.math.Vector3f;
import net.minecraft.client.renderer.texture.OverlayTexture;
import org.joml.Vector3d;
import org.joml.Vector3f;
import java.util.Arrays;
import java.util.IdentityHashMap;
@@ -31,8 +31,8 @@ public class RemappingVertexPipeline implements VertexConsumer
private final VertexConsumer parent;
private final VertexFormat targetFormat;
private final Vector3d position = new Vector3d(0, 0, 0);
private final Vector3f normal = new Vector3f(0, 0, 0);
private final Vector3d position = new Vector3d();
private final Vector3f normal = new Vector3f();
private final int[] color = new int[] { 255, 255, 255, 255 };
private final float[] uv0 = new float[] { 0, 0 };
private final int[] uv1 = new int[] { OverlayTexture.NO_WHITE_U, OverlayTexture.WHITE_OVERLAY_V };
@@ -7,8 +7,8 @@ package net.minecraftforge.client.model.pipeline;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
import org.joml.Vector3f;
import org.joml.Vector4f;
/**
* Vertex pipeline element that applies a transformation to incoming geometry.
@@ -28,7 +28,7 @@ public class TransformingVertexPipeline extends VertexConsumerWrapper
{
var vec = new Vector4f((float) x, (float) y, (float) z, 1);
transformation.transformPosition(vec);
vec.perspectiveDivide();
vec.div(vec.w);
return super.vertex(vec.x(), vec.y(), vec.z());
}
@@ -6,7 +6,6 @@
package net.minecraftforge.client.model.renderable;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Vector4f;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.block.model.BakedQuad;
@@ -19,6 +18,7 @@ import net.minecraft.world.inventory.InventoryMenu;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.client.model.data.ModelData;
import org.jetbrains.annotations.Nullable;
import org.joml.Vector4f;
import java.util.Arrays;
@@ -7,11 +7,11 @@ package net.minecraftforge.client.model.renderable;
import com.google.common.collect.ImmutableMap;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Matrix4f;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import java.util.ArrayList;
import java.util.List;