Update to 1.17

Update to Official classnames
Patchwork
Make the game compile and run
Merge in the new HUD overlay API
Merge in the new render properties API
PEEL
Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason.
New FML installer
Update to 1.17.1

Co-authored-by: LexManos <[email protected]>
Co-authored-by: SizableShrimp <[email protected]>
Co-authored-by: cpw <[email protected]>
Co-authored-by: Curle <[email protected]>
Co-authored-by: Unnoen <[email protected]>
Co-authored-by: covers1624 <[email protected]>
Co-authored-by: DaemonUmbra <[email protected]>
Co-authored-by: gigaherz <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
authored and Curle committed 2021-07-22 19:57:02 +01:00
1 parent 064ae6961b
commit be5446b91c
1990 files changed
+35661 -37544

No files matched your search

@@ -26,26 +26,26 @@ import java.util.Random;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
import net.minecraft.client.renderer.model.ItemOverrideList;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.world.level.block.state.BlockState;
import com.mojang.math.Transformation;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.Direction;
import net.minecraft.core.Direction;
public class BakedItemModel implements IBakedModel
public class BakedItemModel implements BakedModel
{
protected final ImmutableList<BakedQuad> quads;
protected final TextureAtlasSprite particle;
protected final ImmutableMap<TransformType, TransformationMatrix> transforms;
protected final ItemOverrideList overrides;
protected final IBakedModel guiModel;
protected final ImmutableMap<TransformType, Transformation> transforms;
protected final ItemOverrides overrides;
protected final BakedModel guiModel;
protected final boolean isSideLit;
public BakedItemModel(ImmutableList<BakedQuad> quads, TextureAtlasSprite particle, ImmutableMap<TransformType, TransformationMatrix> transforms, ItemOverrideList overrides, boolean untransformed, boolean isSideLit)
public BakedItemModel(ImmutableList<BakedQuad> quads, TextureAtlasSprite particle, ImmutableMap<TransformType, Transformation> transforms, ItemOverrides overrides, boolean untransformed, boolean isSideLit)
{
this.quads = quads;
this.particle = particle;
@@ -55,9 +55,9 @@ public class BakedItemModel implements IBakedModel
this.guiModel = untransformed && hasGuiIdentity(transforms) ? new BakedGuiItemModel<>(this) : null;
}
private static boolean hasGuiIdentity(ImmutableMap<TransformType, TransformationMatrix> transforms)
private static boolean hasGuiIdentity(ImmutableMap<TransformType, Transformation> transforms)
{
TransformationMatrix guiTransform = transforms.get(TransformType.GUI);
Transformation guiTransform = transforms.get(TransformType.GUI);
return guiTransform == null || guiTransform.isIdentity();
}
@@ -66,7 +66,7 @@ public class BakedItemModel implements IBakedModel
@Override public boolean usesBlockLight() { return isSideLit; }
@Override public boolean isCustomRenderer() { return false; }
@Override public TextureAtlasSprite getParticleIcon() { return particle; }
@Override public ItemOverrideList getOverrides() { return overrides; }
@Override public ItemOverrides getOverrides() { return overrides; }
@Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand)
@@ -79,13 +79,13 @@ public class BakedItemModel implements IBakedModel
}
@Override
public IBakedModel handlePerspective(TransformType type, MatrixStack mat)
public BakedModel handlePerspective(TransformType type, PoseStack poseStack)
{
if (type == TransformType.GUI && this.guiModel != null)
{
return this.guiModel.handlePerspective(type, mat);
return this.guiModel.handlePerspective(type, poseStack);
}
return PerspectiveMapWrapper.handlePerspective(this, transforms, type, mat);
return PerspectiveMapWrapper.handlePerspective(this, transforms, type, poseStack);
}
public static class BakedGuiItemModel<T extends BakedItemModel> extends BakedModelWrapper<T>
@@ -123,13 +123,13 @@ public class BakedItemModel implements IBakedModel
}
@Override
public IBakedModel handlePerspective(TransformType type, MatrixStack mat)
public BakedModel handlePerspective(TransformType type, PoseStack poseStack)
{
if (type == TransformType.GUI)
{
return PerspectiveMapWrapper.handlePerspective(this, originalModel.transforms, type, mat);
return PerspectiveMapWrapper.handlePerspective(this, originalModel.transforms, type, poseStack);
}
return this.originalModel.handlePerspective(type, mat);
return this.originalModel.handlePerspective(type, poseStack);
}
}
}
@@ -24,19 +24,19 @@ import javax.annotation.Nullable;
import java.util.List;
import java.util.Random;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemOverrideList;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockDisplayReader;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraftforge.client.model.data.IModelData;
public abstract class BakedModelWrapper<T extends IBakedModel> implements IBakedModel
public abstract class BakedModelWrapper<T extends BakedModel> implements BakedModel
{
protected final T originalModel;
@@ -88,13 +88,13 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
}
@Override
public ItemCameraTransforms getTransforms()
public ItemTransforms getTransforms()
{
return originalModel.getTransforms();
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
return originalModel.getOverrides();
}
@@ -106,15 +106,15 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
}
@Override
public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack)
{
return originalModel.handlePerspective(cameraTransformType, mat);
return originalModel.handlePerspective(cameraTransformType, poseStack);
}
@Override
public TextureAtlasSprite getParticleTexture(@Nonnull IModelData data)
public TextureAtlasSprite getParticleIcon(@Nonnull IModelData data)
{
return originalModel.getParticleTexture(data);
return originalModel.getParticleIcon(data);
}
@Nonnull
@@ -126,7 +126,7 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
@Nonnull
@Override
public IModelData getModelData(@Nonnull IBlockDisplayReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
public IModelData getModelData(@Nonnull BlockAndTintGetter world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
{
return originalModel.getModelData(world, pos, state, tileData);
}
@@ -20,9 +20,8 @@
package net.minecraftforge.client.model;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.geometry.IModelGeometry;
import net.minecraftforge.client.model.geometry.IModelGeometryPart;
@@ -30,6 +29,15 @@ import javax.annotation.Nullable;
import java.util.*;
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.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;
public class BlockModelConfiguration implements IModelConfiguration
{
public final BlockModel owner;
@@ -37,7 +45,7 @@ public class BlockModelConfiguration implements IModelConfiguration
@Nullable
private IModelGeometry<?> customGeometry;
@Nullable
private IModelTransform customModelState;
private ModelState customModelState;
public BlockModelConfiguration(BlockModel owner)
{
@@ -46,7 +54,7 @@ public class BlockModelConfiguration implements IModelConfiguration
@Nullable
@Override
public IUnbakedModel getOwnerModel()
public UnbakedModel getOwnerModel()
{
return owner;
}
@@ -74,12 +82,12 @@ public class BlockModelConfiguration implements IModelConfiguration
}
@Nullable
public IModelTransform getCustomModelState()
public ModelState getCustomModelState()
{
return owner.parent != null && customModelState == null ? owner.parent.customData.getCustomModelState() : customModelState;
}
public void setCustomModelState(IModelTransform modelState)
public void setCustomModelState(ModelState modelState)
{
this.customModelState = modelState;
}
@@ -99,7 +107,7 @@ public class BlockModelConfiguration implements IModelConfiguration
}
@Override
public RenderMaterial resolveTexture(String name)
public Material resolveTexture(String name)
{
return owner.getMaterial(name);
}
@@ -122,19 +130,19 @@ public class BlockModelConfiguration implements IModelConfiguration
}
@Override
public ItemCameraTransforms getCameraTransforms()
public ItemTransforms getCameraTransforms()
{
return owner.getTransforms();
}
@Override
public IModelTransform getCombinedTransform()
public ModelState getCombinedTransform()
{
IModelTransform state = getCustomModelState();
ModelState state = getCustomModelState();
return state != null
? new SimpleModelTransform(PerspectiveMapWrapper.getTransformsWithFallback(state, getCameraTransforms()), state.getRotation())
: new SimpleModelTransform(PerspectiveMapWrapper.getTransforms(getCameraTransforms()));
? new SimpleModelState(PerspectiveMapWrapper.getTransformsWithFallback(state, getCameraTransforms()), state.getRotation())
: new SimpleModelState(PerspectiveMapWrapper.getTransforms(getCameraTransforms()));
}
public void copyFrom(BlockModelConfiguration other)
@@ -144,14 +152,14 @@ public class BlockModelConfiguration implements IModelConfiguration
this.visibilityData.copyFrom(other.visibilityData);
}
public Collection<RenderMaterial> getTextureDependencies(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextureDependencies(Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
IModelGeometry<?> geometry = getCustomGeometry();
return geometry == null ? Collections.emptySet() :
geometry.getTextures(this, modelGetter, missingTextureErrors);
}
public IBakedModel bake(ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
public BakedModel bake(ModelBakery bakery, Function<Material, TextureAtlasSprite> bakedTextureGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
IModelGeometry<?> geometry = getCustomGeometry();
if (geometry == null)
@@ -23,16 +23,15 @@ import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.*;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockDisplayReader;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraftforge.client.model.data.*;
import net.minecraftforge.client.model.geometry.IModelGeometryPart;
import net.minecraftforge.client.model.geometry.IMultipartModelGeometry;
@@ -42,17 +41,27 @@ import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.BakedQuad;
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.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;
public class CompositeModel implements IDynamicBakedModel
{
private final ImmutableMap<String, IBakedModel> bakedParts;
private final ImmutableMap<String, BakedModel> bakedParts;
private final boolean isAmbientOcclusion;
private final boolean isGui3d;
private final boolean isSideLit;
private final TextureAtlasSprite particle;
private final ItemOverrideList overrides;
private final IModelTransform transforms;
private final ItemOverrides overrides;
private final ModelState transforms;
public CompositeModel(boolean isGui3d, boolean isSideLit, boolean isAmbientOcclusion, TextureAtlasSprite particle, ImmutableMap<String, IBakedModel> bakedParts, IModelTransform combinedTransform, ItemOverrideList overrides)
public CompositeModel(boolean isGui3d, boolean isSideLit, boolean isAmbientOcclusion, TextureAtlasSprite particle, ImmutableMap<String, BakedModel> bakedParts, ModelState combinedTransform, ItemOverrides overrides)
{
this.bakedParts = bakedParts;
this.isAmbientOcclusion = isAmbientOcclusion;
@@ -68,7 +77,7 @@ public class CompositeModel implements IDynamicBakedModel
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData)
{
List<BakedQuad> quads = new ArrayList<>();
for(Map.Entry<String, IBakedModel> entry : bakedParts.entrySet())
for(Map.Entry<String, BakedModel> entry : bakedParts.entrySet())
{
quads.addAll(entry.getValue().getQuads(state, side, rand, CompositeModelData.get(extraData, entry.getKey())));
}
@@ -77,10 +86,10 @@ public class CompositeModel implements IDynamicBakedModel
@Nonnull
@Override
public IModelData getModelData(@Nonnull IBlockDisplayReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
public IModelData getModelData(@Nonnull BlockAndTintGetter world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
{
CompositeModelData composite = new CompositeModelData();
for(Map.Entry<String, IBakedModel> entry : bakedParts.entrySet())
for(Map.Entry<String, BakedModel> entry : bakedParts.entrySet())
{
composite.putSubmodelData(entry.getKey(), entry.getValue().getModelData(world, pos, state, ModelDataWrapper.wrap(tileData)));
}
@@ -118,7 +127,7 @@ public class CompositeModel implements IDynamicBakedModel
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
return overrides;
}
@@ -130,13 +139,13 @@ public class CompositeModel implements IDynamicBakedModel
}
@Override
public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack)
{
return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType, mat);
return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType, poseStack);
}
@Nullable
public IBakedModel getPart(String name)
public BakedModel getPart(String name)
{
return bakedParts.get(name);
}
@@ -145,9 +154,9 @@ public class CompositeModel implements IDynamicBakedModel
{
private final String name;
private final BlockModel model;
private final IModelTransform modelTransform;
private final ModelState modelTransform;
private Submodel(String name, BlockModel model, IModelTransform modelTransform)
private Submodel(String name, BlockModel model, ModelState modelTransform)
{
this.name = name;
this.model = model;
@@ -161,19 +170,19 @@ public class CompositeModel implements IDynamicBakedModel
}
@Override
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
throw new UnsupportedOperationException("Attempted to call adQuads on a Submodel instance. Please don't.");
}
public IBakedModel bakeModel(ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public BakedModel bakeModel(ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
return model.bake(bakery, spriteGetter, new ModelTransformComposition(this.modelTransform, modelTransform,
return model.bake(bakery, spriteGetter, new CompositeModelState(this.modelTransform, modelTransform,
this.modelTransform.isUvLocked() || modelTransform.isUvLocked()), modelLocation);
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
return model.getMaterials(modelGetter, missingTextureErrors);
}
@@ -201,12 +210,12 @@ public class CompositeModel implements IDynamicBakedModel
}
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
public BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
RenderMaterial particleLocation = owner.resolveTexture("particle");
Material particleLocation = owner.resolveTexture("particle");
TextureAtlasSprite particle = spriteGetter.apply(particleLocation);
ImmutableMap.Builder<String, IBakedModel> bakedParts = ImmutableMap.builder();
ImmutableMap.Builder<String, BakedModel> bakedParts = ImmutableMap.builder();
for(Map.Entry<String, Submodel> part : parts.entrySet())
{
Submodel submodel = part.getValue();
@@ -218,9 +227,9 @@ public class CompositeModel implements IDynamicBakedModel
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<RenderMaterial> textures = new HashSet<>();
Set<Material> textures = new HashSet<>();
for(Submodel part : parts.values())
{
textures.addAll(part.getTextures(owner, modelGetter, missingTextureErrors));
@@ -236,7 +245,7 @@ public class CompositeModel implements IDynamicBakedModel
private Loader() {}
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
public void onResourceManagerReload(ResourceManager resourceManager)
{
}
@@ -250,7 +259,7 @@ public class CompositeModel implements IDynamicBakedModel
for(Map.Entry<String, JsonElement> part : modelContents.get("parts").getAsJsonObject().entrySet())
{
// TODO: Allow customizing state? If so, how?
IModelTransform modelTransform = SimpleModelTransform.IDENTITY;
ModelState modelTransform = SimpleModelState.IDENTITY;
parts.put(part.getKey(), new Submodel(
part.getKey(),
deserializationContext.deserialize(part.getValue(), BlockModel.class),
@@ -20,24 +20,24 @@
package net.minecraftforge.client.model;
import com.google.common.base.Objects;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.client.renderer.model.IModelTransform;
import com.mojang.math.Transformation;
import net.minecraft.client.resources.model.ModelState;
/**
* An {@link IModelTransform} that combines the transforms from two child {@link IModelTransform}.
*/
public class ModelTransformComposition implements IModelTransform
public class CompositeModelState implements ModelState
{
private final IModelTransform first;
private final IModelTransform second;
private final ModelState first;
private final ModelState second;
private final boolean uvLock;
public ModelTransformComposition(IModelTransform first, IModelTransform second)
public CompositeModelState(ModelState first, ModelState second)
{
this(first, second, false);
}
public ModelTransformComposition(IModelTransform first, IModelTransform second, boolean uvLock)
public CompositeModelState(ModelState first, ModelState second, boolean uvLock)
{
this.first = first;
this.second = second;
@@ -51,13 +51,13 @@ public class ModelTransformComposition implements IModelTransform
}
@Override
public TransformationMatrix getRotation()
public Transformation getRotation()
{
return first.getRotation().compose(second.getRotation());
}
@Override
public TransformationMatrix getPartTransformation(Object part)
public Transformation getPartTransformation(Object part)
{
return first.getPartTransformation(part).compose(second.getPartTransformation(part));
}
@@ -73,7 +73,7 @@ public class ModelTransformComposition implements IModelTransform
{
return false;
}
ModelTransformComposition that = (ModelTransformComposition) o;
CompositeModelState that = (CompositeModelState) o;
return Objects.equal(first, that.first) && Objects.equal(second, that.second);
}
@@ -23,19 +23,18 @@ import com.google.common.collect.*;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.util.math.vector.Quaternion;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
import net.minecraft.client.multiplayer.ClientLevel;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.LivingEntity;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemStack;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.item.ItemStack;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.model.geometry.IModelGeometry;
import net.minecraftforge.fluids.FluidUtil;
@@ -51,6 +50,14 @@ import java.util.*;
import java.util.function.Function;
import java.util.function.Predicate;
import net.minecraft.client.renderer.block.model.ItemOverrides;
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.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
public final class DynamicBucketModel implements IModelGeometry<DynamicBucketModel>
{
private static final Logger LOGGER = LogManager.getLogger();
@@ -94,20 +101,20 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
}
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
public BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
RenderMaterial particleLocation = owner.isTexturePresent("particle") ? owner.resolveTexture("particle") : null;
RenderMaterial baseLocation = owner.isTexturePresent("base") ? owner.resolveTexture("base") : null;
RenderMaterial fluidMaskLocation = owner.isTexturePresent("fluid") ? owner.resolveTexture("fluid") : null;
RenderMaterial coverLocation = owner.isTexturePresent("cover") ? owner.resolveTexture("cover") : null;
Material particleLocation = owner.isTexturePresent("particle") ? owner.resolveTexture("particle") : null;
Material baseLocation = owner.isTexturePresent("base") ? owner.resolveTexture("base") : null;
Material fluidMaskLocation = owner.isTexturePresent("fluid") ? owner.resolveTexture("fluid") : null;
Material coverLocation = owner.isTexturePresent("cover") ? owner.resolveTexture("cover") : null;
IModelTransform transformsFromModel = owner.getCombinedTransform();
ModelState transformsFromModel = owner.getCombinedTransform();
TextureAtlasSprite fluidSprite = fluid != Fluids.EMPTY ? spriteGetter.apply(ForgeHooksClient.getBlockMaterial(fluid.getAttributes().getStillTexture())) : null;
TextureAtlasSprite coverSprite = (coverLocation != null && (!coverIsMask || baseLocation != null)) ? spriteGetter.apply(coverLocation) : null;
ImmutableMap<TransformType, TransformationMatrix> transformMap =
PerspectiveMapWrapper.getTransforms(new ModelTransformComposition(transformsFromModel, modelTransform));
ImmutableMap<TransformType, Transformation> transformMap =
PerspectiveMapWrapper.getTransforms(new CompositeModelState(transformsFromModel, modelTransform));
TextureAtlasSprite particleSprite = particleLocation != null ? spriteGetter.apply(particleLocation) : null;
@@ -117,12 +124,12 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
// if the fluid is lighter than air, will manipulate the initial state to be rotated 180deg to turn it upside down
if (flipGas && fluid != Fluids.EMPTY && fluid.getAttributes().isLighterThanAir())
{
modelTransform = new SimpleModelTransform(
modelTransform = new SimpleModelState(
modelTransform.getRotation().blockCornerToCenter().compose(
new TransformationMatrix(null, new Quaternion(0, 0, 1, 0), null, null)).blockCenterToCorner());
new Transformation(null, new Quaternion(0, 0, 1, 0), null, null)).blockCenterToCorner());
}
TransformationMatrix transform = modelTransform.getRotation();
Transformation transform = modelTransform.getRotation();
ItemMultiLayerBakedModel.Builder builder = ItemMultiLayerBakedModel.builder(owner, particleSprite, new ContainedFluidOverrideHandler(overrides, bakery, owner, this), transformMap);
@@ -169,9 +176,9 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<RenderMaterial> texs = Sets.newHashSet();
Set<Material> texs = Sets.newHashSet();
if (owner.isTexturePresent("particle")) texs.add(owner.resolveTexture("particle"));
if (owner.isTexturePresent("base")) texs.add(owner.resolveTexture("base"));
@@ -192,13 +199,7 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
}
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
{
// no need to clear cache since we create a new model instance
}
@Override
public void onResourceManagerReload(IResourceManager resourceManager, Predicate<IResourceType> resourcePredicate)
public void onResourceManagerReload(ResourceManager resourceManager)
{
// no need to clear cache since we create a new model instance
}
@@ -242,15 +243,15 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
}
}
private static final class ContainedFluidOverrideHandler extends ItemOverrideList
private static final class ContainedFluidOverrideHandler extends ItemOverrides
{
private final Map<String, IBakedModel> cache = Maps.newHashMap(); // contains all the baked models since they'll never change
private final ItemOverrideList nested;
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 IModelConfiguration owner;
private final DynamicBucketModel parent;
private ContainedFluidOverrideHandler(ItemOverrideList nested, ModelBakery bakery, IModelConfiguration owner, DynamicBucketModel parent)
private ContainedFluidOverrideHandler(ItemOverrides nested, ModelBakery bakery, IModelConfiguration owner, DynamicBucketModel parent)
{
this.nested = nested;
this.bakery = bakery;
@@ -259,9 +260,9 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
}
@Override
public IBakedModel resolve(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
public BakedModel resolve(BakedModel originalModel, ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int seed)
{
IBakedModel overriden = nested.resolve(originalModel, stack, world, entity);
BakedModel overriden = nested.resolve(originalModel, stack, world, entity, seed);
if (overriden != originalModel) return overriden;
return FluidUtil.getFluidContained(stack)
.map(fluidStack -> {
@@ -271,7 +272,7 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
if (!cache.containsKey(name))
{
DynamicBucketModel unbaked = this.parent.withFluid(fluid);
IBakedModel bakedModel = unbaked.bake(owner, bakery, ModelLoader.defaultTextureGetter(), ModelRotation.X0_Y0, this, new ResourceLocation("forge:bucket_override"));
BakedModel bakedModel = unbaked.bake(owner, bakery, ModelLoader.defaultTextureGetter(), BlockModelRotation.X0_Y0, this, new ResourceLocation("forge:bucket_override"));
cache.put(name, bakedModel);
return bakedModel;
}
@@ -30,20 +30,19 @@ import java.util.Set;
import javax.annotation.Nullable;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.world.level.block.state.BlockState;
import com.mojang.math.Transformation;
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -59,6 +58,14 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
// TODO: Write a model loader and test/fix as needed
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverrides;
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;
public final class FluidModel implements IModelGeometry<FluidModel>
{
public static final FluidModel WATER = new FluidModel(Fluids.WATER);
@@ -72,13 +79,13 @@ public final class FluidModel implements IModelGeometry<FluidModel>
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
{
return ForgeHooksClient.getFluidMaterials(fluid).collect(Collectors.toList());
}
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
public BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
FluidAttributes attrs = fluid.getAttributes();
return new CachingBakedFluid(
@@ -121,7 +128,7 @@ public final class FluidModel implements IModelGeometry<FluidModel>
}
});
public CachingBakedFluid(TransformationMatrix transformation, ImmutableMap<TransformType, TransformationMatrix> transforms, ResourceLocation modelLocation, int color, TextureAtlasSprite still, TextureAtlasSprite flowing, Optional<TextureAtlasSprite> overlay, boolean gas, Optional<IModelData> stateOption)
public CachingBakedFluid(Transformation transformation, ImmutableMap<TransformType, Transformation> transforms, ResourceLocation modelLocation, int color, TextureAtlasSprite still, TextureAtlasSprite flowing, Optional<TextureAtlasSprite> overlay, boolean gas, Optional<IModelData> stateOption)
{
super(transformation, transforms, modelLocation, color, still, flowing, overlay, gas, stateOption.isPresent(), getCorners(stateOption), getFlow(stateOption), getOverlay(stateOption));
}
@@ -166,7 +173,7 @@ public final class FluidModel implements IModelGeometry<FluidModel>
if (flow == null) flow = -1000f;
}
int flowRound = (int) Math.round(Math.toDegrees(flow));
flowRound = MathHelper.clamp(flowRound, -1000, 1000);
flowRound = Mth.clamp(flowRound, -1000, 1000);
return flowRound;
}
@@ -226,14 +233,14 @@ public final class FluidModel implements IModelGeometry<FluidModel>
}
}
private static class BakedFluid implements IBakedModel
private static class BakedFluid implements BakedModel
{
private static final int x[] = { 0, 0, 1, 1 };
private static final int z[] = { 0, 1, 1, 0 };
private static final float eps = 1e-3f;
protected final TransformationMatrix transformation;
protected final ImmutableMap<TransformType, TransformationMatrix> transforms;
protected final Transformation transformation;
protected final ImmutableMap<TransformType, Transformation> transforms;
protected final ResourceLocation modelLocation;
protected final int color;
protected final TextureAtlasSprite still, flowing;
@@ -241,7 +248,7 @@ public final class FluidModel implements IModelGeometry<FluidModel>
protected final boolean gas;
protected final ImmutableMap<Direction, ImmutableList<BakedQuad>> faceQuads;
public BakedFluid(TransformationMatrix transformation, ImmutableMap<TransformType, TransformationMatrix> transforms, ResourceLocation modelLocation, int color, TextureAtlasSprite still, TextureAtlasSprite flowing, Optional<TextureAtlasSprite> overlay, boolean gas, boolean statePresent, int[] cornerRound, int flowRound, boolean[] sideOverlays)
public BakedFluid(Transformation transformation, ImmutableMap<TransformType, Transformation> transforms, ResourceLocation modelLocation, int color, TextureAtlasSprite still, TextureAtlasSprite flowing, Optional<TextureAtlasSprite> overlay, boolean gas, boolean statePresent, int[] cornerRound, int flowRound, boolean[] sideOverlays)
{
this.transformation = transformation;
this.transforms = transforms;
@@ -281,8 +288,8 @@ public final class FluidModel implements IModelGeometry<FluidModel>
TextureAtlasSprite topSprite = isFlowing ? flowing : still;
float scale = isFlowing ? 4f : 8f;
float c = MathHelper.cos(flow) * scale;
float s = MathHelper.sin(flow) * scale;
float c = Mth.cos(flow) * scale;
float s = Mth.sin(flow) * scale;
// top
Direction top = gas ? Direction.DOWN : Direction.UP;
@@ -387,7 +394,7 @@ public final class FluidModel implements IModelGeometry<FluidModel>
private void putVertex(IVertexConsumer consumer, Direction side, boolean offset, float x, float y, float z, float u, float v)
{
VertexFormat format = DefaultVertexFormats.BLOCK;
VertexFormat format = DefaultVertexFormat.BLOCK;
ImmutableList<VertexFormatElement> elements = format.getElements();
for(int e = 0; e < elements.size(); e++)
{
@@ -463,9 +470,9 @@ public final class FluidModel implements IModelGeometry<FluidModel>
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
return ItemOverrideList.EMPTY;
return ItemOverrides.EMPTY;
}
@Override
@@ -475,9 +482,9 @@ public final class FluidModel implements IModelGeometry<FluidModel>
}
@Override
public IBakedModel handlePerspective(TransformType type, MatrixStack mat)
public BakedModel handlePerspective(TransformType type, PoseStack poseStack)
{
return PerspectiveMapWrapper.handlePerspective(this, transforms, type, mat);
return PerspectiveMapWrapper.handlePerspective(this, transforms, type, poseStack);
}
}
}
@@ -19,16 +19,16 @@
package net.minecraftforge.client.model;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.model.SimpleBakedModel;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.resources.model.SimpleBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.Direction;
import net.minecraft.core.Direction;
public interface IModelBuilder<T extends IModelBuilder<T>>
{
static IModelBuilder<?> of(IModelConfiguration owner, ItemOverrideList overrides, TextureAtlasSprite particle)
static IModelBuilder<?> of(IModelConfiguration owner, ItemOverrides overrides, TextureAtlasSprite particle)
{
return new Simple(new SimpleBakedModel.Builder(owner, overrides).particle(particle));
}
@@ -36,7 +36,7 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
T addFaceQuad(Direction facing, BakedQuad quad);
T addGeneralQuad(BakedQuad quad);
IBakedModel build();
BakedModel build();
class Simple implements IModelBuilder<Simple> {
final SimpleBakedModel.Builder builder;
@@ -61,7 +61,7 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
}
@Override
public IBakedModel build()
public BakedModel build()
{
return builder.build();
}
@@ -19,10 +19,10 @@
package net.minecraftforge.client.model;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.RenderMaterial;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.resources.model.Material;
import net.minecraftforge.client.model.geometry.IModelGeometryPart;
import javax.annotation.Nullable;
@@ -37,7 +37,7 @@ public interface IModelConfiguration {
* If available, gets the owning model (usually BlockModel) of this configuration
*/
@Nullable
IUnbakedModel getOwnerModel();
UnbakedModel getOwnerModel();
/**
* @return The name of the model being baked, for logging and cache purposes.
@@ -55,7 +55,7 @@ public interface IModelConfiguration {
* @param name The name of a texture channel.
* @return The location of the texture, or the missing texture if not found.
*/
RenderMaterial resolveTexture(String name);
Material resolveTexture(String name);
/**
* @return True if the item is a 3D model, false if it's a generated item model.
@@ -79,12 +79,12 @@ public interface IModelConfiguration {
* Gets the vanilla camera transforms data.
* Do not use for non-vanilla code. For general usage, prefer getCombinedState.
*/
ItemCameraTransforms getCameraTransforms();
ItemTransforms getCameraTransforms();
/**
* @return The combined transformation state including vanilla and forge transforms data.
*/
IModelTransform getCombinedTransform();
ModelState getCombinedTransform();
/**
* Queries the visibility information for the model parts.
@@ -21,33 +21,15 @@ package net.minecraftforge.client.model;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import net.minecraft.resources.IResourceManager;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
import net.minecraftforge.client.model.geometry.IModelGeometry;
import net.minecraftforge.resource.IResourceType;
import net.minecraftforge.resource.ISelectiveResourceReloadListener;
import net.minecraftforge.resource.VanillaResourceType;
import java.util.function.Predicate;
public interface IModelLoader<T extends IModelGeometry<T>> extends ISelectiveResourceReloadListener
public interface IModelLoader<T extends IModelGeometry<T>> extends ResourceManagerReloadListener
{
@Override
default IResourceType getResourceType()
{
return VanillaResourceType.MODELS;
}
@Override
void onResourceManagerReload(IResourceManager resourceManager);
@Override
default void onResourceManagerReload(IResourceManager resourceManager, Predicate<IResourceType> resourcePredicate)
{
if (resourcePredicate.test(getResourceType()))
{
onResourceManagerReload(resourceManager);
}
}
T read(JsonDeserializationContext deserializationContext, JsonObject modelContents);
}
@@ -25,15 +25,14 @@ import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.vector.TransformationMatrix;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.core.Direction;
import net.minecraft.util.GsonHelper;
import net.minecraft.resources.ResourceLocation;
import com.mojang.math.Transformation;
import net.minecraftforge.client.ForgeRenderTypes;
import net.minecraftforge.client.model.geometry.IModelGeometry;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
@@ -44,6 +43,15 @@ import javax.annotation.Nullable;
import java.util.*;
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.block.model.ItemTransforms;
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;
/**
* Forge reimplementation of vanilla {@link ItemModelGenerator}, i.e. builtin/generated models,
* with the following changes:
@@ -59,7 +67,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
private static final Direction[] HORIZONTALS = {Direction.UP, Direction.DOWN};
private static final Direction[] VERTICALS = {Direction.WEST, Direction.EAST};
private ImmutableList<RenderMaterial> textures;
private ImmutableList<Material> textures;
private final ImmutableSet<Integer> fullbrightLayers;
public ItemLayerModel()
@@ -67,20 +75,20 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
this(null, ImmutableSet.of());
}
public ItemLayerModel(ImmutableList<RenderMaterial> textures)
public ItemLayerModel(ImmutableList<Material> textures)
{
this(textures, ImmutableSet.of());
}
public ItemLayerModel(@Nullable ImmutableList<RenderMaterial> textures, ImmutableSet<Integer> fullbrightLayers)
public ItemLayerModel(@Nullable ImmutableList<Material> textures, ImmutableSet<Integer> fullbrightLayers)
{
this.textures = textures;
this.fullbrightLayers = fullbrightLayers;
}
private static ImmutableList<RenderMaterial> getTextures(IModelConfiguration model)
private static ImmutableList<Material> getTextures(IModelConfiguration model)
{
ImmutableList.Builder<RenderMaterial> builder = ImmutableList.builder();
ImmutableList.Builder<Material> builder = ImmutableList.builder();
for(int i = 0; model.isTexturePresent("layer" + i); i++)
{
builder.add(model.resolveTexture("layer" + i));
@@ -89,13 +97,13 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
}
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery,
Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, ResourceLocation modelLocation)
public BakedModel bake(IModelConfiguration owner, ModelBakery bakery,
Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform,
ItemOverrides overrides, ResourceLocation modelLocation)
{
ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> transformMap =
PerspectiveMapWrapper.getTransforms(new ModelTransformComposition(owner.getCombinedTransform(), modelTransform));
TransformationMatrix transform = modelTransform.getRotation();
ImmutableMap<ItemTransforms.TransformType, Transformation> transformMap =
PerspectiveMapWrapper.getTransforms(new CompositeModelState(owner.getCombinedTransform(), modelTransform));
Transformation transform = modelTransform.getRotation();
TextureAtlasSprite particle = spriteGetter.apply(
owner.isTexturePresent("particle") ? owner.resolveTexture("particle") : textures.get(0)
);
@@ -116,12 +124,12 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
return isFullbright ? ForgeRenderTypes.ITEM_UNSORTED_UNLIT_TRANSLUCENT.get() : ForgeRenderTypes.ITEM_UNSORTED_TRANSLUCENT.get();
}
public static ImmutableList<BakedQuad> getQuadsForSprites(List<RenderMaterial> textures, TransformationMatrix transform, Function<RenderMaterial, TextureAtlasSprite> spriteGetter)
public static ImmutableList<BakedQuad> getQuadsForSprites(List<Material> textures, Transformation transform, Function<Material, TextureAtlasSprite> spriteGetter)
{
return getQuadsForSprites(textures, transform, spriteGetter, Collections.emptySet());
}
public static ImmutableList<BakedQuad> getQuadsForSprites(List<RenderMaterial> textures, TransformationMatrix transform, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, Set<Integer> fullbrights)
public static ImmutableList<BakedQuad> getQuadsForSprites(List<Material> textures, Transformation transform, Function<Material, TextureAtlasSprite> spriteGetter, Set<Integer> fullbrights)
{
ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
for(int i = 0; i < textures.size(); i++)
@@ -132,12 +140,12 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
return builder.build();
}
public static ImmutableList<BakedQuad> getQuadsForSprite(int tint, TextureAtlasSprite sprite, TransformationMatrix transform)
public static ImmutableList<BakedQuad> getQuadsForSprite(int tint, TextureAtlasSprite sprite, Transformation transform)
{
return getQuadsForSprite(tint, sprite, transform, false);
}
public static ImmutableList<BakedQuad> getQuadsForSprite(int tint, TextureAtlasSprite sprite, TransformationMatrix transform, boolean fullbright)
public static ImmutableList<BakedQuad> getQuadsForSprite(int tint, TextureAtlasSprite sprite, Transformation transform, boolean fullbright)
{
ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
@@ -313,7 +321,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
textures = getTextures(owner);
return textures;
@@ -351,7 +359,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
}
}
private static BakedQuad buildSideQuad(TransformationMatrix transform, Direction side, int tint, TextureAtlasSprite sprite, int u, int v, int size, boolean fullbright)
private static BakedQuad buildSideQuad(Transformation transform, Direction side, int tint, TextureAtlasSprite sprite, int u, int v, int size, boolean fullbright)
{
final float eps = 1e-2f;
@@ -404,7 +412,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
return side.getAxis() == Direction.Axis.Y ? side.getOpposite() : side;
}
private static BakedQuad buildQuad(TransformationMatrix transform, Direction side, TextureAtlasSprite sprite, int tint, boolean fullbright,
private static BakedQuad buildQuad(Transformation transform, Direction side, TextureAtlasSprite sprite, int tint, boolean fullbright,
float x0, float y0, float z0, float u0, float v0,
float x1, float y1, float z1, float u1, float v1,
float x2, float y2, float z2, float u2, float v2,
@@ -473,7 +481,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
public static final Loader INSTANCE = new Loader();
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
public void onResourceManagerReload(ResourceManager resourceManager)
{
// nothing to do
}
@@ -484,7 +492,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
ImmutableSet.Builder<Integer> fullbrightLayers = ImmutableSet.builder();
if (modelContents.has("fullbright_layers"))
{
JsonArray arr = JSONUtils.getAsJsonArray(modelContents, "fullbright_layers");
JsonArray arr = GsonHelper.getAsJsonArray(modelContents, "fullbright_layers");
for(int i=0;i<arr.size();i++)
{
fullbrightLayers.add(arr.get(i).getAsInt());
@@ -22,18 +22,18 @@ package net.minecraftforge.client.model;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.BlockState;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.world.item.ItemStack;
import net.minecraft.core.Direction;
import com.mojang.math.Transformation;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
@@ -49,14 +49,14 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
private final boolean shadedInGui;
private final boolean sideLit;
private final TextureAtlasSprite particle;
private final ItemOverrideList overrides;
private final ImmutableList<Pair<IBakedModel, RenderType>> layerModels;
private final ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> cameraTransforms;
private final ItemOverrides overrides;
private final ImmutableList<Pair<BakedModel, RenderType>> layerModels;
private final ImmutableMap<ItemTransforms.TransformType, Transformation> cameraTransforms;
public ItemMultiLayerBakedModel(boolean smoothLighting, boolean shadedInGui, boolean sideLit,
TextureAtlasSprite particle, ItemOverrideList overrides,
ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> cameraTransforms,
ImmutableList<Pair<IBakedModel, RenderType>> layerModels)
TextureAtlasSprite particle, ItemOverrides overrides,
ImmutableMap<ItemTransforms.TransformType, Transformation> cameraTransforms,
ImmutableList<Pair<BakedModel, RenderType>> layerModels)
{
this.smoothLighting = smoothLighting;
this.shadedInGui = shadedInGui;
@@ -106,7 +106,7 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
return overrides;
}
@@ -118,9 +118,9 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
}
@Override
public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack)
{
return PerspectiveMapWrapper.handlePerspective(this, cameraTransforms, cameraTransformType, mat);
return PerspectiveMapWrapper.handlePerspective(this, cameraTransforms, cameraTransformType, poseStack);
}
//@Override
@@ -130,29 +130,29 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
}
//@Override
public List<Pair<IBakedModel, RenderType>> getLayerModels(ItemStack itemStack, boolean fabulous)
public List<Pair<BakedModel, RenderType>> getLayerModels(ItemStack itemStack, boolean fabulous)
{
return layerModels;
}
public static Builder builder(IModelConfiguration owner, TextureAtlasSprite particle, ItemOverrideList overrides,
ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> cameraTransforms)
public static Builder builder(IModelConfiguration owner, TextureAtlasSprite particle, ItemOverrides overrides,
ImmutableMap<ItemTransforms.TransformType, Transformation> cameraTransforms)
{
return new Builder(owner, particle, overrides, cameraTransforms);
}
public static class Builder
{
private final ImmutableList.Builder<Pair<IBakedModel, RenderType>> builder = ImmutableList.builder();
private final ImmutableList.Builder<Pair<BakedModel, RenderType>> builder = ImmutableList.builder();
private final List<BakedQuad> quads = Lists.newArrayList();
private final ItemOverrideList overrides;
private final ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> cameraTransforms;
private final ItemOverrides overrides;
private final ImmutableMap<ItemTransforms.TransformType, Transformation> cameraTransforms;
private final IModelConfiguration owner;
private TextureAtlasSprite particle;
private RenderType lastRt = null;
private Builder(IModelConfiguration owner, TextureAtlasSprite particle, ItemOverrideList overrides,
ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> cameraTransforms)
private Builder(IModelConfiguration owner, TextureAtlasSprite particle, ItemOverrides overrides,
ImmutableMap<ItemTransforms.TransformType, Transformation> cameraTransforms)
{
this.owner = owner;
this.particle = particle;
@@ -160,9 +160,9 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
this.cameraTransforms = cameraTransforms;
}
private void addLayer(ImmutableList.Builder<Pair<IBakedModel, RenderType>> builder, List<BakedQuad> quads, RenderType rt)
private void addLayer(ImmutableList.Builder<Pair<BakedModel, RenderType>> builder, List<BakedQuad> quads, RenderType rt)
{
IBakedModel model = new BakedItemModel(ImmutableList.copyOf(quads), particle, ImmutableMap.of(), ItemOverrideList.EMPTY, true, owner.isSideLit());
BakedModel model = new BakedItemModel(ImmutableList.copyOf(quads), particle, ImmutableMap.of(), ItemOverrides.EMPTY, true, owner.isSideLit());
builder.add(Pair.of(model, rt));
}
@@ -199,7 +199,7 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
return this;
}
public IBakedModel build()
public BakedModel build()
{
if (quads.size() > 0)
{
@@ -21,12 +21,12 @@ package net.minecraftforge.client.model;
import com.google.common.collect.Lists;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.Direction;
import net.minecraft.util.math.vector.TransformationMatrix;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.core.Direction;
import com.mojang.math.Transformation;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
import net.minecraftforge.client.model.pipeline.IVertexConsumer;
import net.minecraftforge.client.model.pipeline.TRSRTransformer;
@@ -52,11 +52,11 @@ public final class ItemTextureQuadConverter
* @param sprite The texture whose UVs shall be used
* @return The generated quads.
*/
public static List<BakedQuad> convertTexture(TransformationMatrix transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint)
public static List<BakedQuad> convertTexture(Transformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint)
{
return convertTexture(transform, template, sprite, z, facing, color, tint, 0);
}
public static List<BakedQuad> convertTexture(TransformationMatrix transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint, int luminosity)
public static List<BakedQuad> convertTexture(Transformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint, int luminosity)
{
List<BakedQuad> horizontal = convertTextureHorizontal(transform, template, sprite, z, facing, color, tint, luminosity);
List<BakedQuad> vertical = convertTextureVertical(transform, template, sprite, z, facing, color, tint, luminosity);
@@ -68,11 +68,11 @@ public final class ItemTextureQuadConverter
* Scans a texture and converts it into a list of horizontal strips stacked on top of each other.
* The height of the strips is as big as possible.
*/
public static List<BakedQuad> convertTextureHorizontal(TransformationMatrix transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint)
public static List<BakedQuad> convertTextureHorizontal(Transformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint)
{
return convertTextureHorizontal(transform, template, sprite, z, facing, color, tint, 0);
}
public static List<BakedQuad> convertTextureHorizontal(TransformationMatrix transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint, int luminosity)
public static List<BakedQuad> convertTextureHorizontal(Transformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint, int luminosity)
{
int w = template.getWidth();
int h = template.getHeight();
@@ -150,11 +150,11 @@ public final class ItemTextureQuadConverter
* Scans a texture and converts it into a list of vertical strips stacked next to each other from left to right.
* The width of the strips is as big as possible.
*/
public static List<BakedQuad> convertTextureVertical(TransformationMatrix transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint)
public static List<BakedQuad> convertTextureVertical(Transformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint)
{
return convertTextureVertical(transform, template, sprite, z, facing, color, tint, 0);
}
public static List<BakedQuad> convertTextureVertical(TransformationMatrix transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint, int luminosity)
public static List<BakedQuad> convertTextureVertical(Transformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, Direction facing, int color, int tint, int luminosity)
{
int w = template.getWidth();
int h = template.getHeight();
@@ -237,11 +237,11 @@ public final class ItemTextureQuadConverter
* Generates a Front/Back quad for an itemmodel. Therefore only supports facing NORTH and SOUTH.
* Coordinates are [0,16] to match the usual coordinates used in TextureAtlasSprites
*/
public static BakedQuad genQuad(TransformationMatrix transform, float x1, float y1, float x2, float y2, float z, TextureAtlasSprite sprite, Direction facing, int color, int tint)
public static BakedQuad genQuad(Transformation transform, float x1, float y1, float x2, float y2, float z, TextureAtlasSprite sprite, Direction facing, int color, int tint)
{
return genQuad(transform, x1, y1, x2, y2, z, sprite, facing, color, tint, 0);
}
public static BakedQuad genQuad(TransformationMatrix transform, float x1, float y1, float x2, float y2, float z, TextureAtlasSprite sprite, Direction facing, int color, int tint, int luminosity)
public static BakedQuad genQuad(Transformation transform, float x1, float y1, float x2, float y2, float z, TextureAtlasSprite sprite, Direction facing, int color, int tint, int luminosity)
{
float u1 = sprite.getU(x1);
float v1 = sprite.getV(y1);
@@ -260,7 +260,7 @@ public final class ItemTextureQuadConverter
return putQuad(transform, facing, sprite, color, tint, x1, y1, x2, y2, z, u1, v1, u2, v2, luminosity);
}
private static BakedQuad putQuad(TransformationMatrix transform, Direction side, TextureAtlasSprite sprite, int color, int tint,
private static BakedQuad putQuad(Transformation transform, Direction side, TextureAtlasSprite sprite, int color, int tint,
float x1, float y1, float x2, float y2, float z,
float u1, float v1, float u2, float v2, int luminosity)
{
@@ -31,10 +31,10 @@ import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import net.minecraft.client.Minecraft;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.Level;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.event.world.ChunkEvent;
@@ -45,13 +45,13 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
@EventBusSubscriber(modid = "forge", bus = Bus.FORGE, value = Dist.CLIENT)
public class ModelDataManager
{
private static WeakReference<World> currentWorld = new WeakReference<>(null);
private static WeakReference<Level> currentWorld = new WeakReference<>(null);
private static final Map<ChunkPos, Set<BlockPos>> needModelDataRefresh = new ConcurrentHashMap<>();
private static final Map<ChunkPos, Map<BlockPos, IModelData>> modelDataCache = new ConcurrentHashMap<>();
private static void cleanCaches(World world)
private static void cleanCaches(Level world)
{
Preconditions.checkNotNull(world, "World must not be null");
Preconditions.checkArgument(world == Minecraft.getInstance().level, "Cannot use model data for a world other than the current client world");
@@ -63,17 +63,17 @@ public class ModelDataManager
}
}
public static void requestModelDataRefresh(TileEntity te)
public static void requestModelDataRefresh(BlockEntity te)
{
Preconditions.checkNotNull(te, "Tile entity must not be null");
World world = te.getLevel();
Level world = te.getLevel();
cleanCaches(world);
needModelDataRefresh.computeIfAbsent(new ChunkPos(te.getBlockPos()), $ -> Collections.synchronizedSet(new HashSet<>()))
.add(te.getBlockPos());
}
private static void refreshModelData(World world, ChunkPos chunk)
private static void refreshModelData(Level world, ChunkPos chunk)
{
cleanCaches(world);
Set<BlockPos> needUpdate = needModelDataRefresh.remove(chunk);
@@ -83,7 +83,7 @@ public class ModelDataManager
Map<BlockPos, IModelData> data = modelDataCache.computeIfAbsent(chunk, $ -> new ConcurrentHashMap<>());
for (BlockPos pos : needUpdate)
{
TileEntity toUpdate = world.getBlockEntity(pos);
BlockEntity toUpdate = world.getBlockEntity(pos);
if (toUpdate != null && !toUpdate.isRemoved())
{
data.put(pos, toUpdate.getModelData());
@@ -106,12 +106,12 @@ public class ModelDataManager
modelDataCache.remove(chunk);
}
public static @Nullable IModelData getModelData(World world, BlockPos pos)
public static @Nullable IModelData getModelData(Level world, BlockPos pos)
{
return getModelData(world, new ChunkPos(pos)).get(pos);
}
public static Map<BlockPos, IModelData> getModelData(World world, ChunkPos pos)
public static Map<BlockPos, IModelData> getModelData(Level world, ChunkPos pos)
{
Preconditions.checkArgument(world.isClientSide, "Cannot request model data for server world");
refreshModelData(world, pos);
@@ -23,15 +23,12 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.MissingTextureSprite;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.profiler.IProfiler;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.util.profiling.ProfilerFiller;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.logging.ModelLoaderErrorMessage;
import java.util.function.Function;
@@ -44,11 +41,17 @@ import javax.annotation.Nullable;
import static net.minecraftforge.fml.Logging.MODELLOADING;
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.ModelResourceLocation;
import net.minecraft.client.resources.model.UnbakedModel;
public final class ModelLoader extends ModelBakery
{
private static final Logger LOGGER = LogManager.getLogger();
private final Map<ResourceLocation, Exception> loadingExceptions = Maps.newHashMap();
private IUnbakedModel missingModel = null;
private UnbakedModel missingModel = null;
private boolean isLoading = false;
@@ -65,7 +68,7 @@ public final class ModelLoader extends ModelBakery
return isLoading;
}
public ModelLoader(IResourceManager manager, BlockColors colours, IProfiler profiler, int maxMipmapLevel)
public ModelLoader(ResourceManager manager, BlockColors colours, ProfilerFiller profiler, int maxMipmapLevel)
{
super(manager, colours, false);
instance = this;
@@ -107,7 +110,7 @@ public final class ModelLoader extends ModelBakery
return new ResourceLocation(model.getNamespace(), model.getPath() + ".json");
}
protected IUnbakedModel getMissingModel()
protected UnbakedModel getMissingModel()
{
if (missingModel == null)
{
@@ -126,7 +129,7 @@ public final class ModelLoader extends ModelBakery
/**
* Use this if you don't care about the exception and want some model anyway.
*/
public IUnbakedModel getModelOrMissing(ResourceLocation location)
public UnbakedModel getModelOrMissing(ResourceLocation location)
{
try
{
@@ -141,7 +144,7 @@ public final class ModelLoader extends ModelBakery
/**
* Use this if you want the model, but need to log the error.
*/
public IUnbakedModel getModelOrLogError(ResourceLocation location, String error)
public UnbakedModel getModelOrLogError(ResourceLocation location, String error)
{
try
{
@@ -163,7 +166,7 @@ public final class ModelLoader extends ModelBakery
{
if (instance == null)
{
instance = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS, LOCATION).sprite();
instance = new Material(TextureAtlas.LOCATION_BLOCKS, LOCATION).sprite();
}
return instance;
}
@@ -228,9 +231,9 @@ public final class ModelLoader extends ModelBakery
/**
* Internal, do not use.
*/
public void onPostBakeEvent(Map<ResourceLocation, IBakedModel> modelRegistry)
public void onPostBakeEvent(Map<ResourceLocation, BakedModel> modelRegistry)
{
IBakedModel missingModel = modelRegistry.get(MISSING_MODEL_LOCATION);
BakedModel missingModel = modelRegistry.get(MISSING_MODEL_LOCATION);
for(Map.Entry<ResourceLocation, Exception> entry : loadingExceptions.entrySet())
{
// ignoring pure ResourceLocation arguments, all things we care about pass ModelResourceLocation
@@ -238,7 +241,7 @@ public final class ModelLoader extends ModelBakery
{
LOGGER.debug(MODELLOADING, ()-> new ModelLoaderErrorMessage((ModelResourceLocation)entry.getKey(), entry.getValue()));
final ModelResourceLocation location = (ModelResourceLocation)entry.getKey();
final IBakedModel model = modelRegistry.get(location);
final BakedModel model = modelRegistry.get(location);
if(model == null)
{
modelRegistry.put(location, missingModel);
@@ -258,17 +261,17 @@ public final class ModelLoader extends ModelBakery
}
*/
private static final Function<ResourceLocation, IUnbakedModel> DEFAULT_MODEL_GETTER = (rl) -> ModelLoader.instance().getModelOrMissing(rl);
private static final Function<ResourceLocation, UnbakedModel> DEFAULT_MODEL_GETTER = (rl) -> ModelLoader.instance().getModelOrMissing(rl);
/**
* Get the default texture getter the models will be baked with.
*/
public static Function<RenderMaterial, TextureAtlasSprite> defaultTextureGetter()
public static Function<Material, TextureAtlasSprite> defaultTextureGetter()
{
return RenderMaterial::sprite;
return Material::sprite;
}
public static Function<ResourceLocation, IUnbakedModel> defaultModelGetter()
public static Function<ResourceLocation, UnbakedModel> defaultModelGetter()
{
return DEFAULT_MODEL_GETTER;
}
@@ -26,17 +26,15 @@ import com.google.common.collect.Sets;
import com.google.gson.*;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.MissingTextureSprite;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.resources.IReloadableResourceManager;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraft.server.packs.resources.ReloadableResourceManager;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.core.Direction;
import net.minecraft.util.GsonHelper;
import net.minecraft.resources.ResourceLocation;
import com.mojang.math.Transformation;
import net.minecraftforge.client.model.geometry.IModelGeometry;
import net.minecraftforge.client.model.geometry.ISimpleModelGeometry;
import net.minecraftforge.client.model.obj.OBJLoader;
@@ -50,6 +48,20 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace;
import net.minecraft.client.renderer.block.model.BlockFaceUV;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.block.model.ItemModelGenerator;
import net.minecraft.client.renderer.block.model.ItemOverride;
import net.minecraft.client.renderer.block.model.ItemTransform;
import net.minecraft.client.renderer.block.model.ItemTransforms;
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;
/**
* Central hub for custom model loaders.
*/
@@ -102,7 +114,7 @@ public class ModelLoaderRegistry
synchronized(loaders)
{
loaders.put(id, loader);
((IReloadableResourceManager) Minecraft.getInstance().getResourceManager()).registerReloadListener(loader);
((ReloadableResourceManager) Minecraft.getInstance().getResourceManager()).registerReloadListener(loader);
}
}
@@ -133,7 +145,7 @@ public class ModelLoaderRegistry
return null;
}
ResourceLocation loader = new ResourceLocation(JSONUtils.getAsString(object,"loader"));
ResourceLocation loader = new ResourceLocation(GsonHelper.getAsString(object,"loader"));
return getModel(loader, deserializationContext, object);
}
@@ -153,7 +165,7 @@ public class ModelLoaderRegistry
private static final Pattern FILESYSTEM_PATH_TO_RESLOC =
Pattern.compile("(?:.*[\\\\/]assets[\\\\/](?<namespace>[a-z_-]+)[\\\\/]textures[\\\\/])?(?<path>[a-z_\\\\/-]+)\\.png");
public static RenderMaterial resolveTexture(@Nullable String tex, IModelConfiguration owner)
public static Material resolveTexture(@Nullable String tex, IModelConfiguration owner)
{
if (tex == null)
return blockMaterial(WHITE_TEXTURE);
@@ -176,19 +188,19 @@ public class ModelLoaderRegistry
}
@SuppressWarnings("deprecation")
public static RenderMaterial blockMaterial(String location)
public static Material blockMaterial(String location)
{
return new RenderMaterial(AtlasTexture.LOCATION_BLOCKS, new ResourceLocation(location));
return new Material(TextureAtlas.LOCATION_BLOCKS, new ResourceLocation(location));
}
@SuppressWarnings("deprecation")
public static RenderMaterial blockMaterial(ResourceLocation location)
public static Material blockMaterial(ResourceLocation location)
{
return new RenderMaterial(AtlasTexture.LOCATION_BLOCKS, location);
return new Material(TextureAtlas.LOCATION_BLOCKS, location);
}
@Nullable
public static IModelTransform deserializeModelTransforms(JsonDeserializationContext deserializationContext, JsonObject modelData)
public static ModelState deserializeModelTransforms(JsonDeserializationContext deserializationContext, JsonObject modelData)
{
if (!modelData.has("transform"))
return null;
@@ -196,14 +208,14 @@ public class ModelLoaderRegistry
return deserializeTransform(deserializationContext, modelData.get("transform")).orElse(null);
}
public static Optional<IModelTransform> deserializeTransform(JsonDeserializationContext context, JsonElement transformData)
public static Optional<ModelState> deserializeTransform(JsonDeserializationContext context, JsonElement transformData)
{
if (!transformData.isJsonObject())
{
try
{
TransformationMatrix base = context.deserialize(transformData, TransformationMatrix.class);
return Optional.of(new SimpleModelTransform(ImmutableMap.of(), base.blockCenterToCorner()));
Transformation base = context.deserialize(transformData, Transformation.class);
return Optional.of(new SimpleModelState(ImmutableMap.of(), base.blockCenterToCorner()));
}
catch (JsonParseException e)
{
@@ -213,20 +225,20 @@ public class ModelLoaderRegistry
else
{
JsonObject transform = transformData.getAsJsonObject();
EnumMap<ItemCameraTransforms.TransformType, TransformationMatrix> transforms = Maps.newEnumMap(ItemCameraTransforms.TransformType.class);
EnumMap<ItemTransforms.TransformType, Transformation> transforms = Maps.newEnumMap(ItemTransforms.TransformType.class);
deserializeTRSR(context, transforms, transform, "thirdperson", ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "thirdperson_righthand", ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "thirdperson_lefthand", ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND);
deserializeTRSR(context, transforms, transform, "thirdperson", ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "thirdperson_righthand", ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "thirdperson_lefthand", ItemTransforms.TransformType.THIRD_PERSON_LEFT_HAND);
deserializeTRSR(context, transforms, transform, "firstperson", ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "firstperson_righthand", ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "firstperson_lefthand", ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND);
deserializeTRSR(context, transforms, transform, "firstperson", ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "firstperson_righthand", ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND);
deserializeTRSR(context, transforms, transform, "firstperson_lefthand", ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND);
deserializeTRSR(context, transforms, transform, "head", ItemCameraTransforms.TransformType.HEAD);
deserializeTRSR(context, transforms, transform, "gui", ItemCameraTransforms.TransformType.GUI);
deserializeTRSR(context, transforms, transform, "ground", ItemCameraTransforms.TransformType.GROUND);
deserializeTRSR(context, transforms, transform, "fixed", ItemCameraTransforms.TransformType.FIXED);
deserializeTRSR(context, transforms, transform, "head", ItemTransforms.TransformType.HEAD);
deserializeTRSR(context, transforms, transform, "gui", ItemTransforms.TransformType.GUI);
deserializeTRSR(context, transforms, transform, "ground", ItemTransforms.TransformType.GROUND);
deserializeTRSR(context, transforms, transform, "fixed", ItemTransforms.TransformType.FIXED);
int k = transform.entrySet().size();
if(transform.has("matrix")) k--;
@@ -239,32 +251,32 @@ public class ModelLoaderRegistry
{
throw new JsonParseException("transform: allowed keys: 'thirdperson', 'firstperson', 'gui', 'head', 'matrix', 'translation', 'rotation', 'scale', 'post-rotation', 'origin'");
}
TransformationMatrix base = TransformationMatrix.identity();
Transformation base = Transformation.identity();
if(!transform.entrySet().isEmpty())
{
base = context.deserialize(transform, TransformationMatrix.class);
base = context.deserialize(transform, Transformation.class);
}
IModelTransform state = new SimpleModelTransform(Maps.immutableEnumMap(transforms), base);
ModelState state = new SimpleModelState(Maps.immutableEnumMap(transforms), base);
return Optional.of(state);
}
}
private static void deserializeTRSR(JsonDeserializationContext context, EnumMap<ItemCameraTransforms.TransformType, TransformationMatrix> transforms, JsonObject transform, String name, ItemCameraTransforms.TransformType itemCameraTransform)
private static void deserializeTRSR(JsonDeserializationContext context, EnumMap<ItemTransforms.TransformType, Transformation> transforms, JsonObject transform, String name, ItemTransforms.TransformType itemCameraTransform)
{
if(transform.has(name))
{
TransformationMatrix t = context.deserialize(transform.remove(name), TransformationMatrix.class);
Transformation t = context.deserialize(transform.remove(name), Transformation.class);
transforms.put(itemCameraTransform, t.blockCenterToCorner());
}
}
public static IBakedModel bakeHelper(BlockModel blockModel, ModelBakery modelBakery, BlockModel otherModel, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation, boolean guiLight3d)
public static BakedModel bakeHelper(BlockModel blockModel, ModelBakery modelBakery, BlockModel otherModel, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation, boolean guiLight3d)
{
IBakedModel model;
BakedModel model;
IModelGeometry<?> customModel = blockModel.customData.getCustomGeometry();
IModelTransform customModelState = blockModel.customData.getCustomModelState();
ModelState customModelState = blockModel.customData.getCustomModelState();
if (customModelState != null)
modelTransform = new ModelTransformComposition(modelTransform, customModelState, modelTransform.isUvLocked());
modelTransform = new CompositeModelState(modelTransform, customModelState, modelTransform.isUvLocked());
if (customModel != null)
model = customModel.bake(blockModel.customData, modelBakery, spriteGetter, modelTransform, blockModel.getOverrides(modelBakery, otherModel, spriteGetter), modelLocation);
@@ -288,19 +300,19 @@ public class ModelLoaderRegistry
public static class VanillaProxy implements ISimpleModelGeometry<VanillaProxy>
{
private final List<BlockPart> elements;
private final List<BlockElement> elements;
public VanillaProxy(List<BlockPart> list)
public VanillaProxy(List<BlockElement> list)
{
this.elements = list;
}
@Override
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
for(BlockPart blockpart : elements) {
for(BlockElement blockpart : elements) {
for(Direction direction : blockpart.faces.keySet()) {
BlockPartFace blockpartface = blockpart.faces.get(direction);
BlockElementFace blockpartface = blockpart.faces.get(direction);
TextureAtlasSprite textureatlassprite1 = spriteGetter.apply(owner.resolveTexture(blockpartface.texture));
if (blockpartface.cullForDirection == null) {
modelBuilder.addGeneralQuad(BlockModel.makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, modelTransform, modelLocation));
@@ -314,14 +326,14 @@ public class ModelLoaderRegistry
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<RenderMaterial> textures = Sets.newHashSet();
Set<Material> textures = Sets.newHashSet();
for(BlockPart part : elements) {
for(BlockPartFace face : part.faces.values()) {
RenderMaterial texture = owner.resolveTexture(face.texture);
if (Objects.equals(texture, MissingTextureSprite.getLocation().toString())) {
for(BlockElement part : elements) {
for(BlockElementFace face : part.faces.values()) {
Material texture = owner.resolveTexture(face.texture);
if (Objects.equals(texture, MissingTextureAtlasSprite.getLocation().toString())) {
missingTextureErrors.add(Pair.of(face.texture, owner.getModelName()));
}
@@ -341,7 +353,7 @@ public class ModelLoaderRegistry
}
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
public void onResourceManagerReload(ResourceManager resourceManager)
{
}
@@ -349,15 +361,15 @@ public class ModelLoaderRegistry
@Override
public VanillaProxy read(JsonDeserializationContext deserializationContext, JsonObject modelContents)
{
List<BlockPart> list = this.getModelElements(deserializationContext, modelContents);
List<BlockElement> list = this.getModelElements(deserializationContext, modelContents);
return new VanillaProxy(list);
}
private List<BlockPart> getModelElements(JsonDeserializationContext deserializationContext, JsonObject object) {
List<BlockPart> list = Lists.newArrayList();
private List<BlockElement> getModelElements(JsonDeserializationContext deserializationContext, JsonObject object) {
List<BlockElement> list = Lists.newArrayList();
if (object.has("elements")) {
for(JsonElement jsonelement : JSONUtils.getAsJsonArray(object, "elements")) {
list.add(deserializationContext.deserialize(jsonelement, BlockPart.class));
for(JsonElement jsonelement : GsonHelper.getAsJsonArray(object, "elements")) {
list.add(deserializationContext.deserialize(jsonelement, BlockElement.class));
}
}
@@ -370,13 +382,13 @@ public class ModelLoaderRegistry
{
public static final Gson INSTANCE = (new GsonBuilder())
.registerTypeAdapter(BlockModel.class, new ExpandedBlockModelDeserializer())
.registerTypeAdapter(BlockPart.class, new BlockPart.Deserializer())
.registerTypeAdapter(BlockPartFace.class, new BlockPartFace.Deserializer())
.registerTypeAdapter(BlockElement.class, new BlockElement.Deserializer())
.registerTypeAdapter(BlockElementFace.class, new BlockElementFace.Deserializer())
.registerTypeAdapter(BlockFaceUV.class, new BlockFaceUV.Deserializer())
.registerTypeAdapter(ItemTransformVec3f.class, new ItemTransformVec3f.Deserializer())
.registerTypeAdapter(ItemCameraTransforms.class, new ItemCameraTransforms.Deserializer())
.registerTypeAdapter(ItemTransform.class, new ItemTransform.Deserializer())
.registerTypeAdapter(ItemTransforms.class, new ItemTransforms.Deserializer())
.registerTypeAdapter(ItemOverride.class, new ItemOverride.Deserializer())
.registerTypeAdapter(TransformationMatrix.class, new TransformationHelper.Deserializer())
.registerTypeAdapter(Transformation.class, new TransformationHelper.Deserializer())
.create();
public BlockModel deserialize(JsonElement element, Type targetType, JsonDeserializationContext deserializationContext) throws JsonParseException {
@@ -384,13 +396,13 @@ public class ModelLoaderRegistry
JsonObject jsonobject = element.getAsJsonObject();
IModelGeometry<?> geometry = deserializeGeometry(deserializationContext, jsonobject);
List<BlockPart> elements = model.getElements();
List<BlockElement> elements = model.getElements();
if (geometry != null) {
elements.clear();
model.customData.setCustomGeometry(geometry);
}
IModelTransform modelState = deserializeModelTransforms(deserializationContext, jsonobject);
ModelState modelState = deserializeModelTransforms(deserializationContext, jsonobject);
if (modelState != null)
{
model.customData.setCustomModelState(modelState);
@@ -398,7 +410,7 @@ public class ModelLoaderRegistry
if (jsonobject.has("visibility"))
{
JsonObject visibility = JSONUtils.getAsJsonObject(jsonobject, "visibility");
JsonObject visibility = GsonHelper.getAsJsonObject(jsonobject, "visibility");
for(Map.Entry<String, JsonElement> part : visibility.entrySet())
{
model.customData.visibilityData.setVisibilityState(part.getKey(), part.getValue().getAsBoolean());
@@ -27,20 +27,18 @@ import javax.annotation.Nullable;
import com.google.common.collect.*;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.BlockState;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
import com.mojang.math.Transformation;
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.ForgeRenderTypes;
import net.minecraft.world.item.ItemStack;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.core.Direction;
import net.minecraft.util.GsonHelper;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
@@ -52,6 +50,15 @@ import org.apache.logging.log4j.Logger;
import java.util.function.Function;
import java.util.stream.Collectors;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.client.renderer.block.model.ItemOverrides;
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;
/**
* A model that can be rendered in multiple {@link RenderType}.
*/
@@ -59,35 +66,35 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
{
private static final Logger LOGGER = LogManager.getLogger();
private final ImmutableList<Pair<RenderType, IUnbakedModel>> models;
private final ImmutableList<Pair<RenderType, UnbakedModel>> models;
private final boolean convertRenderTypes;
public MultiLayerModel(Map<RenderType, IUnbakedModel> models)
public MultiLayerModel(Map<RenderType, UnbakedModel> models)
{
this(models.entrySet().stream().map(kv -> Pair.of(kv.getKey(), kv.getValue())).collect(ImmutableList.toImmutableList()), true);
}
public MultiLayerModel(ImmutableList<Pair<RenderType, IUnbakedModel>> models, boolean convertRenderTypes)
public MultiLayerModel(ImmutableList<Pair<RenderType, UnbakedModel>> models, boolean convertRenderTypes)
{
this.models = models;
this.convertRenderTypes = convertRenderTypes;
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<RenderMaterial> materials = Sets.newHashSet();
Set<Material> materials = Sets.newHashSet();
materials.add(owner.resolveTexture("particle"));
for (Pair<RenderType, IUnbakedModel> m : models)
for (Pair<RenderType, UnbakedModel> m : models)
materials.addAll(m.getSecond().getMaterials(modelGetter, missingTextureErrors));
return materials;
}
private static ImmutableList<Pair<RenderType, IBakedModel>> buildModels(List<Pair<RenderType, IUnbakedModel>> models, IModelTransform modelTransform,
ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, ResourceLocation modelLocation)
private static ImmutableList<Pair<RenderType, BakedModel>> buildModels(List<Pair<RenderType, UnbakedModel>> models, ModelState modelTransform,
ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ResourceLocation modelLocation)
{
ImmutableList.Builder<Pair<RenderType, IBakedModel>> builder = ImmutableList.builder();
for(Pair<RenderType, IUnbakedModel> entry : models)
ImmutableList.Builder<Pair<RenderType, BakedModel>> builder = ImmutableList.builder();
for(Pair<RenderType, UnbakedModel> entry : models)
{
builder.add(Pair.of(entry.getFirst(), entry.getSecond().bake(bakery, spriteGetter, modelTransform, modelLocation)));
}
@@ -95,33 +102,33 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
}
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
public BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
return new MultiLayerBakedModel(
owner.useSmoothLighting(), owner.isShadedInGui(), owner.isSideLit(),
spriteGetter.apply(owner.resolveTexture("particle")), overrides, convertRenderTypes,
buildModels(models, modelTransform, bakery, spriteGetter, modelLocation),
PerspectiveMapWrapper.getTransforms(new ModelTransformComposition(owner.getCombinedTransform(), modelTransform))
PerspectiveMapWrapper.getTransforms(new CompositeModelState(owner.getCombinedTransform(), modelTransform))
);
}
private static final class MultiLayerBakedModel implements IDynamicBakedModel
{
private final ImmutableMap<RenderType, IBakedModel> models;
private final ImmutableMap<TransformType, TransformationMatrix> cameraTransforms;
private final ImmutableMap<RenderType, BakedModel> models;
private final ImmutableMap<TransformType, Transformation> cameraTransforms;
protected final boolean ambientOcclusion;
protected final boolean gui3d;
protected final boolean isSideLit;
protected final TextureAtlasSprite particle;
protected final ItemOverrideList overrides;
protected final ItemOverrides overrides;
private final List<BakedQuad> missing = ImmutableList.of();
private final boolean convertRenderTypes;
private final List<Pair<IBakedModel, RenderType>> itemLayers;
private final List<Pair<BakedModel, RenderType>> itemLayers;
public MultiLayerBakedModel(
boolean ambientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrideList overrides,
boolean convertRenderTypes, List<Pair<RenderType, IBakedModel>> models,
ImmutableMap<TransformType, TransformationMatrix> cameraTransforms)
boolean ambientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides,
boolean convertRenderTypes, List<Pair<RenderType, BakedModel>> models,
ImmutableMap<TransformType, Transformation> cameraTransforms)
{
this.isSideLit = isSideLit;
this.cameraTransforms = cameraTransforms;
@@ -146,7 +153,7 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
if (layer == null)
{
ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
for (IBakedModel model : models.values())
for (BakedModel model : models.values())
{
builder.addAll(model.getQuads(state, side, rand, extraData));
}
@@ -204,15 +211,15 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
}
@Override
public IBakedModel handlePerspective(TransformType cameraTransformType, MatrixStack mat)
public BakedModel handlePerspective(TransformType cameraTransformType, PoseStack poseStack)
{
return PerspectiveMapWrapper.handlePerspective(this, cameraTransforms, cameraTransformType, mat);
return PerspectiveMapWrapper.handlePerspective(this, cameraTransforms, cameraTransformType, poseStack);
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
return ItemOverrideList.EMPTY;
return ItemOverrides.EMPTY;
}
@Override
@@ -222,18 +229,19 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
}
@Override
public List<Pair<IBakedModel, RenderType>> getLayerModels(ItemStack itemStack, boolean fabulous)
public List<Pair<BakedModel, RenderType>> getLayerModels(ItemStack itemStack, boolean fabulous)
{
return itemLayers;
}
public static BiMap<RenderType, RenderType> ITEM_RENDER_TYPE_MAPPING = HashBiMap.create();
static {
// TODO ForgeRenderTypes
/* static {
ITEM_RENDER_TYPE_MAPPING.put(RenderType.solid(), ForgeRenderTypes.ITEM_LAYERED_SOLID.get());
ITEM_RENDER_TYPE_MAPPING.put(RenderType.cutout(), ForgeRenderTypes.ITEM_LAYERED_CUTOUT.get());
ITEM_RENDER_TYPE_MAPPING.put(RenderType.cutoutMipped(), ForgeRenderTypes.ITEM_LAYERED_CUTOUT_MIPPED.get());
ITEM_RENDER_TYPE_MAPPING.put(RenderType.translucent(), ForgeRenderTypes.ITEM_LAYERED_TRANSLUCENT.get());
}
}*/
}
public static final class Loader implements IModelLoader<MultiLayerModel>
@@ -251,7 +259,7 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
private Loader() {}
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
public void onResourceManagerReload(ResourceManager resourceManager)
{
}
@@ -259,17 +267,17 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
@Override
public MultiLayerModel read(JsonDeserializationContext deserializationContext, JsonObject modelContents)
{
ImmutableList.Builder<Pair<RenderType, IUnbakedModel>> builder = ImmutableList.builder();
JsonObject layersObject = JSONUtils.getAsJsonObject(modelContents, "layers");
ImmutableList.Builder<Pair<RenderType, UnbakedModel>> builder = ImmutableList.builder();
JsonObject layersObject = GsonHelper.getAsJsonObject(modelContents, "layers");
for(Map.Entry<String, RenderType> layer : BLOCK_LAYERS.entrySet()) // block layers
{
String layerName = layer.getKey(); // mc overrides toString to return the ID for the layer
if(layersObject.has(layerName))
{
builder.add(Pair.of(layer.getValue(), deserializationContext.deserialize(JSONUtils.getAsJsonObject(layersObject, layerName), BlockModel.class)));
builder.add(Pair.of(layer.getValue(), deserializationContext.deserialize(GsonHelper.getAsJsonObject(layersObject, layerName), BlockModel.class)));
}
}
boolean convertRenderTypes = JSONUtils.getAsBoolean(modelContents, "convert_render_types", true);
boolean convertRenderTypes = GsonHelper.getAsBoolean(modelContents, "convert_render_types", true);
return new MultiLayerModel(builder.build(), convertRenderTypes);
}
}
@@ -24,16 +24,14 @@ import java.util.Random;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.*;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.world.World;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.core.Direction;
import com.mojang.math.Transformation;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.common.model.TransformationHelper;
@@ -41,29 +39,36 @@ import net.minecraftforge.common.model.TransformationHelper;
import javax.annotation.Nullable;
import java.util.List;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverride;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.ModelState;
public class PerspectiveMapWrapper implements IDynamicBakedModel
{
private final IBakedModel parent;
private final ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> transforms;
private final BakedModel parent;
private final ImmutableMap<ItemTransforms.TransformType, Transformation> transforms;
private final OverrideListWrapper overrides = new OverrideListWrapper();
public PerspectiveMapWrapper(IBakedModel parent, ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> transforms)
public PerspectiveMapWrapper(BakedModel parent, ImmutableMap<ItemTransforms.TransformType, Transformation> transforms)
{
this.parent = parent;
this.transforms = transforms;
}
public PerspectiveMapWrapper(IBakedModel parent, IModelTransform state)
public PerspectiveMapWrapper(BakedModel parent, ModelState state)
{
this(parent, getTransforms(state));
}
public static ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> getTransforms(IModelTransform state)
public static ImmutableMap<ItemTransforms.TransformType, Transformation> getTransforms(ModelState state)
{
EnumMap<ItemCameraTransforms.TransformType, TransformationMatrix> map = new EnumMap<>(ItemCameraTransforms.TransformType.class);
for(ItemCameraTransforms.TransformType type : ItemCameraTransforms.TransformType.values())
EnumMap<ItemTransforms.TransformType, Transformation> map = new EnumMap<>(ItemTransforms.TransformType.class);
for(ItemTransforms.TransformType type : ItemTransforms.TransformType.values())
{
TransformationMatrix tr = state.getPartTransformation(type);
Transformation tr = state.getPartTransformation(type);
if(!tr.isIdentity())
{
map.put(type, tr);
@@ -73,10 +78,10 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
}
@SuppressWarnings("deprecation")
public static ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> getTransforms(ItemCameraTransforms transforms)
public static ImmutableMap<ItemTransforms.TransformType, Transformation> getTransforms(ItemTransforms transforms)
{
EnumMap<ItemCameraTransforms.TransformType, TransformationMatrix> map = new EnumMap<>(ItemCameraTransforms.TransformType.class);
for(ItemCameraTransforms.TransformType type : ItemCameraTransforms.TransformType.values())
EnumMap<ItemTransforms.TransformType, Transformation> map = new EnumMap<>(ItemTransforms.TransformType.class);
for(ItemTransforms.TransformType type : ItemTransforms.TransformType.values())
{
if (transforms.hasTransform(type))
{
@@ -87,12 +92,12 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
}
@SuppressWarnings("deprecation")
public static ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> getTransformsWithFallback(IModelTransform state, ItemCameraTransforms transforms)
public static ImmutableMap<ItemTransforms.TransformType, Transformation> getTransformsWithFallback(ModelState state, ItemTransforms transforms)
{
EnumMap<ItemCameraTransforms.TransformType, TransformationMatrix> map = new EnumMap<>(ItemCameraTransforms.TransformType.class);
for(ItemCameraTransforms.TransformType type : ItemCameraTransforms.TransformType.values())
EnumMap<ItemTransforms.TransformType, Transformation> map = new EnumMap<>(ItemTransforms.TransformType.class);
for(ItemTransforms.TransformType type : ItemTransforms.TransformType.values())
{
TransformationMatrix tr = state.getPartTransformation(type);
Transformation tr = state.getPartTransformation(type);
if(!tr.isIdentity())
{
map.put(type, tr);
@@ -105,9 +110,9 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
return ImmutableMap.copyOf(map);
}
public static IBakedModel handlePerspective(IBakedModel model, ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> transforms, ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
public static BakedModel handlePerspective(BakedModel model, ImmutableMap<ItemTransforms.TransformType, Transformation> transforms, ItemTransforms.TransformType cameraTransformType, PoseStack mat)
{
TransformationMatrix tr = transforms.getOrDefault(cameraTransformType, TransformationMatrix.identity());
Transformation tr = transforms.getOrDefault(cameraTransformType, Transformation.identity());
if (!tr.isIdentity())
{
tr.push(mat);
@@ -115,9 +120,9 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
return model;
}
public static IBakedModel handlePerspective(IBakedModel model, IModelTransform state, ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
public static BakedModel handlePerspective(BakedModel model, ModelState state, ItemTransforms.TransformType cameraTransformType, PoseStack mat)
{
TransformationMatrix tr = state.getPartTransformation(cameraTransformType);
Transformation tr = state.getPartTransformation(cameraTransformType);
if (!tr.isIdentity())
{
tr.push(mat);
@@ -132,14 +137,14 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
@Override public boolean isCustomRenderer() { return parent.isCustomRenderer(); }
@Override public TextureAtlasSprite getParticleIcon() { return parent.getParticleIcon(); }
@SuppressWarnings("deprecation")
@Override public ItemCameraTransforms getTransforms() { return parent.getTransforms(); }
@Override public ItemTransforms getTransforms() { return parent.getTransforms(); }
@Override public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData extraData)
{
return parent.getQuads(state, side, rand, extraData);
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
return overrides;
}
@@ -151,12 +156,12 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
}
@Override
public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack)
{
return handlePerspective(this, transforms, cameraTransformType, mat);
return handlePerspective(this, transforms, cameraTransformType, poseStack);
}
private class OverrideListWrapper extends ItemOverrideList
private class OverrideListWrapper extends ItemOverrides
{
public OverrideListWrapper()
{
@@ -165,14 +170,14 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
@Nullable
@Override
public IBakedModel resolve(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn)
public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel worldIn, @Nullable LivingEntity entityIn, int seed)
{
model = parent.getOverrides().resolve(parent, stack, worldIn, entityIn);
model = parent.getOverrides().resolve(parent, stack, worldIn, entityIn, seed);
return new PerspectiveMapWrapper(model, transforms);
}
@Override
public ImmutableList<ItemOverride> getOverrides()
public ImmutableList<BakedOverride> getOverrides()
{
return parent.getOverrides().getOverrides();
}
@@ -25,28 +25,28 @@ import java.util.List;
import com.google.common.collect.Lists;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.util.math.vector.Vector4f;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
import net.minecraft.client.renderer.block.model.BakedQuad;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
public class QuadTransformer
{
private static final int POSITION = findPositionOffset(DefaultVertexFormats.BLOCK);
private static final int NORMAL = findNormalOffset(DefaultVertexFormats.BLOCK);
private final TransformationMatrix transform;
private static final int POSITION = findPositionOffset(DefaultVertexFormat.BLOCK);
private static final int NORMAL = findNormalOffset(DefaultVertexFormat.BLOCK);
private final Transformation transform;
public QuadTransformer(TransformationMatrix transform)
public QuadTransformer(Transformation transform)
{
this.transform = transform;
}
private void processVertices(int[] inData, int[] outData)
{
int stride = DefaultVertexFormats.BLOCK.getVertexSize();
int stride = DefaultVertexFormat.BLOCK.getVertexSize();
int count = (inData.length * 4) / stride;
for (int i=0;i<count;i++)
{
@@ -25,34 +25,46 @@ 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.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.*;
import net.minecraft.util.profiling.ProfilerFiller;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.core.Direction;
import net.minecraft.util.GsonHelper;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.geometry.IModelGeometry;
import javax.annotation.Nullable;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.BakedQuad;
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.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;
public class SeparatePerspectiveModel implements IModelGeometry<SeparatePerspectiveModel>
{
private final BlockModel baseModel;
private final ImmutableMap<ItemCameraTransforms.TransformType, BlockModel> perspectives;
private final ImmutableMap<ItemTransforms.TransformType, BlockModel> perspectives;
public SeparatePerspectiveModel(BlockModel baseModel, ImmutableMap<ItemCameraTransforms.TransformType, BlockModel> perspectives)
public SeparatePerspectiveModel(BlockModel baseModel, ImmutableMap<ItemTransforms.TransformType, BlockModel> perspectives)
{
this.baseModel = baseModel;
this.perspectives = perspectives;
}
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
public net.minecraft.client.resources.model.BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
return new BakedModel(
owner.useSmoothLighting(), owner.isShadedInGui(), owner.isSideLit(),
@@ -65,26 +77,26 @@ public class SeparatePerspectiveModel implements IModelGeometry<SeparatePerspect
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<RenderMaterial> textures = Sets.newHashSet();
Set<Material> textures = Sets.newHashSet();
textures.addAll(baseModel.getMaterials(modelGetter, missingTextureErrors));
for(BlockModel model : perspectives.values())
textures.addAll(model.getMaterials(modelGetter, missingTextureErrors));
return textures;
}
public static class BakedModel implements IBakedModel
public static class BakedModel implements net.minecraft.client.resources.model.BakedModel
{
private final boolean isAmbientOcclusion;
private final boolean isGui3d;
private final boolean isSideLit;
private final TextureAtlasSprite particle;
private final ItemOverrideList overrides;
private final IBakedModel baseModel;
private final ImmutableMap<ItemCameraTransforms.TransformType, IBakedModel> perspectives;
private final ItemOverrides overrides;
private final net.minecraft.client.resources.model.BakedModel baseModel;
private final ImmutableMap<ItemTransforms.TransformType, net.minecraft.client.resources.model.BakedModel> perspectives;
public BakedModel(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrideList overrides, IBakedModel baseModel, ImmutableMap<ItemCameraTransforms.TransformType, IBakedModel> perspectives)
public BakedModel(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides, net.minecraft.client.resources.model.BakedModel baseModel, ImmutableMap<ItemTransforms.TransformType, net.minecraft.client.resources.model.BakedModel> perspectives)
{
this.isAmbientOcclusion = isAmbientOcclusion;
this.isGui3d = isGui3d;
@@ -132,7 +144,7 @@ public class SeparatePerspectiveModel implements IModelGeometry<SeparatePerspect
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
return overrides;
}
@@ -144,20 +156,20 @@ public class SeparatePerspectiveModel implements IModelGeometry<SeparatePerspect
}
@Override
public ItemCameraTransforms getTransforms()
public ItemTransforms getTransforms()
{
return ItemCameraTransforms.NO_TRANSFORMS;
return ItemTransforms.NO_TRANSFORMS;
}
@Override
public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
public net.minecraft.client.resources.model.BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack)
{
if (perspectives.containsKey(cameraTransformType))
{
IBakedModel p = perspectives.get(cameraTransformType);
return p.handlePerspective(cameraTransformType, mat);
net.minecraft.client.resources.model.BakedModel p = perspectives.get(cameraTransformType);
return p.handlePerspective(cameraTransformType, poseStack);
}
return baseModel.handlePerspective(cameraTransformType, mat);
return baseModel.handlePerspective(cameraTransformType, poseStack);
}
}
@@ -165,37 +177,36 @@ public class SeparatePerspectiveModel implements IModelGeometry<SeparatePerspect
{
public static final Loader INSTANCE = new Loader();
public static final ImmutableBiMap<String, ItemCameraTransforms.TransformType> PERSPECTIVES = ImmutableBiMap.<String, ItemCameraTransforms.TransformType>builder()
.put("none", ItemCameraTransforms.TransformType.NONE)
.put("third_person_left_hand", ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND)
.put("third_person_right_hand", ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND)
.put("first_person_left_hand", ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND)
.put("first_person_right_hand", ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND)
.put("head", ItemCameraTransforms.TransformType.HEAD)
.put("gui", ItemCameraTransforms.TransformType.GUI)
.put("ground", ItemCameraTransforms.TransformType.GROUND)
.put("fixed", ItemCameraTransforms.TransformType.FIXED)
public static final ImmutableBiMap<String, ItemTransforms.TransformType> PERSPECTIVES = ImmutableBiMap.<String, ItemTransforms.TransformType>builder()
.put("none", ItemTransforms.TransformType.NONE)
.put("third_person_left_hand", ItemTransforms.TransformType.THIRD_PERSON_LEFT_HAND)
.put("third_person_right_hand", ItemTransforms.TransformType.THIRD_PERSON_RIGHT_HAND)
.put("first_person_left_hand", ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND)
.put("first_person_right_hand", ItemTransforms.TransformType.FIRST_PERSON_RIGHT_HAND)
.put("head", ItemTransforms.TransformType.HEAD)
.put("gui", ItemTransforms.TransformType.GUI)
.put("ground", ItemTransforms.TransformType.GROUND)
.put("fixed", ItemTransforms.TransformType.FIXED)
.build();
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
{
// Not used
public void onResourceManagerReload(final ResourceManager p_10758_) {
}
@Override
public SeparatePerspectiveModel read(JsonDeserializationContext deserializationContext, JsonObject modelContents)
{
BlockModel baseModel = deserializationContext.deserialize(JSONUtils.getAsJsonObject(modelContents, "base"), BlockModel.class);
BlockModel baseModel = deserializationContext.deserialize(GsonHelper.getAsJsonObject(modelContents, "base"), BlockModel.class);
JsonObject perspectiveData = JSONUtils.getAsJsonObject(modelContents, "perspectives");
JsonObject perspectiveData = GsonHelper.getAsJsonObject(modelContents, "perspectives");
ImmutableMap.Builder<ItemCameraTransforms.TransformType, BlockModel> perspectives = ImmutableMap.builder();
for(Map.Entry<String, ItemCameraTransforms.TransformType> perspective : PERSPECTIVES.entrySet())
ImmutableMap.Builder<ItemTransforms.TransformType, BlockModel> perspectives = ImmutableMap.builder();
for(Map.Entry<String, ItemTransforms.TransformType> perspective : PERSPECTIVES.entrySet())
{
if (perspectiveData.has(perspective.getKey()))
{
BlockModel perspectiveModel = deserializationContext.deserialize(JSONUtils.getAsJsonObject(perspectiveData, perspective.getKey()), BlockModel.class);
BlockModel perspectiveModel = deserializationContext.deserialize(GsonHelper.getAsJsonObject(perspectiveData, perspective.getKey()), BlockModel.class);
perspectives.put(perspective.getValue(), perspectiveModel);
}
}
@@ -19,46 +19,46 @@
package net.minecraftforge.client.model;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.resources.model.ModelState;
import com.google.common.collect.ImmutableMap;
import net.minecraft.util.math.vector.TransformationMatrix;
import com.mojang.math.Transformation;
/**
* Simple implementation of IModelState via a map and a default value.
*/
public final class SimpleModelTransform implements IModelTransform
public final class SimpleModelState implements ModelState
{
public static final SimpleModelTransform IDENTITY = new SimpleModelTransform(TransformationMatrix.identity());
public static final SimpleModelState IDENTITY = new SimpleModelState(Transformation.identity());
private final ImmutableMap<?, TransformationMatrix> map;
private final TransformationMatrix base;
private final ImmutableMap<?, Transformation> map;
private final Transformation base;
public SimpleModelTransform(ImmutableMap<?, TransformationMatrix> map)
public SimpleModelState(ImmutableMap<?, Transformation> map)
{
this(map, TransformationMatrix.identity());
this(map, Transformation.identity());
}
public SimpleModelTransform(TransformationMatrix base)
public SimpleModelState(Transformation base)
{
this(ImmutableMap.of(), base);
}
public SimpleModelTransform(ImmutableMap<?, TransformationMatrix> map, TransformationMatrix base)
public SimpleModelState(ImmutableMap<?, Transformation> map, Transformation base)
{
this.map = map;
this.base = base;
}
@Override
public TransformationMatrix getRotation()
public Transformation getRotation()
{
return base;
}
@Override
public TransformationMatrix getPartTransformation(Object part)
public Transformation getPartTransformation(Object part)
{
return map.getOrDefault(part, TransformationMatrix.identity());
return map.getOrDefault(part, Transformation.identity());
}
}
@@ -19,7 +19,7 @@
package net.minecraftforge.client.model.animation;
import net.minecraft.world.World;
import net.minecraft.world.level.Level;
import java.lang.ref.WeakReference;
@@ -30,12 +30,12 @@ public enum Animation
private float clientPartialTickTime;
private static long epochTime;
private static WeakReference<World> worldRef;
private static WeakReference<Level> worldRef;
/**
* Get the global world time for the current tick, in seconds.
*/
public static float getWorldTime(World world)
public static float getWorldTime(Level world)
{
return getWorldTime(world, 0);
}
@@ -43,7 +43,7 @@ public enum Animation
/**
* Get the global world time for the current tick + partial tick progress, in seconds.
*/
public static float getWorldTime(World world, float tickProgress)
public static float getWorldTime(Level world, float tickProgress)
{
if (worldRef == null || worldRef.get() != world)
{
@@ -21,19 +21,19 @@ package net.minecraftforge.client.model.animation;
import java.util.Random;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.block.BlockState;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Atlases;
import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockDisplayReader;
import net.minecraft.client.renderer.Sheets;
import net.minecraft.client.renderer.block.BlockRenderDispatcher;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.ModelDataManager;
import net.minecraftforge.client.model.data.IModelData;
@@ -47,17 +47,12 @@ import net.minecraftforge.common.util.LazyOptional;
/**
* Generic {@link TileGameRenderer} that works with the Forge model system and animations.
*/
public class TileEntityRendererAnimation<T extends TileEntity> extends TileEntityRenderer<T> implements IEventHandler<T>
public class AnimationBlockEntityRenderer<T extends BlockEntity> implements BlockEntityRenderer<T>, IEventHandler<T>
{
public TileEntityRendererAnimation(TileEntityRendererDispatcher rendererDispatcherIn)
{
super(rendererDispatcherIn);
}
protected static BlockRendererDispatcher blockRenderer;
protected static BlockRenderDispatcher blockRenderer;
@Override
public void render(T te, float partialTick, MatrixStack mat, IRenderTypeBuffer renderer, int light, int otherlight)
public void render(T te, float partialTick, PoseStack mat, MultiBufferSource renderer, int light, int otherlight)
{
LazyOptional<IAnimationStateMachine> cap = te.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY);
if(!cap.isPresent())
@@ -66,10 +61,10 @@ public class TileEntityRendererAnimation<T extends TileEntity> extends TileEntit
}
if(blockRenderer == null) blockRenderer = Minecraft.getInstance().getBlockRenderer();
BlockPos pos = te.getBlockPos();
IBlockDisplayReader world = MinecraftForgeClient.getRegionRenderCacheOptional(te.getLevel(), pos)
.map(IBlockDisplayReader.class::cast).orElseGet(() -> te.getLevel());
BlockAndTintGetter world = MinecraftForgeClient.getRegionRenderCacheOptional(te.getLevel(), pos)
.map(BlockAndTintGetter.class::cast).orElseGet(() -> te.getLevel());
BlockState state = world.getBlockState(pos);
IBakedModel model = blockRenderer.getBlockModelShaper().getBlockModel(state);
BakedModel model = blockRenderer.getBlockModelShaper().getBlockModel(state);
IModelData data = model.getModelData(world, pos, state, ModelDataManager.getModelData(te.getLevel(), pos));
if (data.hasProperty(Properties.AnimationProperty))
{
@@ -82,7 +77,7 @@ public class TileEntityRendererAnimation<T extends TileEntity> extends TileEntit
// TODO: caching?
data.setData(Properties.AnimationProperty, pair.getLeft());
blockRenderer.getModelRenderer().renderModel(world, model, state, pos, mat, renderer.getBuffer(Atlases.solidBlockSheet()), false, new Random(), 42, light, data);
blockRenderer.getModelRenderer().tesselateBlock(world, model, state, pos, mat, renderer.getBuffer(Sheets.solidBlockSheet()), false, new Random(), 42, light, data);
});
}
}
@@ -25,33 +25,43 @@ import java.util.function.Function;
import javax.annotation.Nullable;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.Level;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelTransformComposition;
import net.minecraftforge.client.model.CompositeModelState;
import net.minecraftforge.common.model.animation.CapabilityAnimation;
public final class AnimationItemOverrideList extends ItemOverrideList
import net.minecraft.client.renderer.block.model.ItemOverride;
import net.minecraft.client.renderer.block.model.ItemOverrides;
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;
public final class AnimationItemOverrideList extends ItemOverrides
{
private final ModelBakery bakery;
private final IUnbakedModel model;
private final UnbakedModel model;
private final ResourceLocation modelLoc;
private final IModelTransform state;
private final ModelState state;
private final Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter;
private final Function<Material, TextureAtlasSprite> bakedTextureGetter;
public AnimationItemOverrideList(ModelBakery bakery, IUnbakedModel model, ResourceLocation modelLoc, IModelTransform state, Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter, ItemOverrideList overrides)
//TODO, Mojang now bakes overrides, figure out how to reverse them.
/*
public AnimationItemOverrideList(ModelBakery bakery, UnbakedModel model, ResourceLocation modelLoc, ModelState state, Function<Material, TextureAtlasSprite> bakedTextureGetter, ItemOverrides overrides)
{
this(bakery, model, modelLoc, state, bakedTextureGetter, overrides.getOverrides().reverse());
}
*/
public AnimationItemOverrideList(ModelBakery bakery, IUnbakedModel model, ResourceLocation modelLoc, IModelTransform state, Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter, List<ItemOverride> overrides)
public AnimationItemOverrideList(ModelBakery bakery, UnbakedModel model, ResourceLocation modelLoc, ModelState state, Function<Material, TextureAtlasSprite> bakedTextureGetter, List<ItemOverride> overrides)
{
super(bakery, model, ModelLoader.defaultModelGetter(), bakedTextureGetter, overrides);
this.bakery = bakery;
@@ -63,12 +73,12 @@ public final class AnimationItemOverrideList extends ItemOverrideList
@SuppressWarnings("resource")
@Override
public IBakedModel resolve(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
public BakedModel resolve(BakedModel originalModel, ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int seed)
{
return stack.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null)
.map(asm ->
{
World w = world;
Level w = world;
// TODO caching?
if(w == null && entity != null)
{
@@ -81,7 +91,7 @@ public final class AnimationItemOverrideList extends ItemOverrideList
return asm.apply(Animation.getWorldTime(world, Animation.getPartialTickTime())).getLeft();
})
// TODO where should uvlock data come from?
.map(state -> model.bake(bakery, bakedTextureGetter, new ModelTransformComposition(state, this.state), modelLoc))
.orElseGet(() -> super.resolve(originalModel, stack, world, entity));
.map(state -> model.bake(bakery, bakedTextureGetter, new CompositeModelState(state, this.state), modelLoc))
.orElseGet(() -> super.resolve(originalModel, stack, world, entity, seed));
}
}
@@ -33,19 +33,19 @@ import java.util.TreeMap;
import javax.annotation.Nullable;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraft.util.math.vector.Quaternion;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.client.resources.model.ModelState;
import com.mojang.math.Matrix4f;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraft.client.renderer.model.BlockPart;
import net.minecraft.resources.IResource;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraftforge.client.model.animation.ModelBlockAnimation.Parameter.Interpolation;
import net.minecraftforge.client.model.animation.ModelBlockAnimation.Parameter.Type;
import net.minecraftforge.client.model.animation.ModelBlockAnimation.Parameter.Variable;
@@ -326,7 +326,7 @@ public class ModelBlockAnimation
}
@Override
public TransformationMatrix apply(float time)
public Transformation apply(float time)
{
time -= Math.floor(time);
Vector3f translation = new Vector3f(0, 0, 0);
@@ -338,7 +338,7 @@ public class ModelBlockAnimation
{
int length = loop ? var.samples.length : (var.samples.length - 1);
float timeScaled = time * length;
int s1 = MathHelper.clamp((int)Math.round(Math.floor(timeScaled)), 0, length - 1);
int s1 = Mth.clamp((int)Math.round(Math.floor(timeScaled)), 0, length - 1);
float progress = timeScaled - s1;
int s2 = s1 + 1;
if(s2 == length && loop) s2 = 0;
@@ -409,10 +409,10 @@ public class ModelBlockAnimation
}
}
Quaternion rot = new Quaternion(rotation_axis, rotation_angle, false);
TransformationMatrix base = new TransformationMatrix(translation, rot, scale, null);
Transformation base = new Transformation(translation, rot, scale, null);
Vector3f negOrigin = origin.copy();
negOrigin.mul(-1,-1,-1);
base = new TransformationMatrix(origin, null, null, null).compose(base).compose(new TransformationMatrix(negOrigin, null, null, null));
base = new Transformation(origin, null, null, null).compose(base).compose(new Transformation(negOrigin, null, null, null));
return base.blockCenterToCorner();
}
}
@@ -428,9 +428,9 @@ public class ModelBlockAnimation
}
@Override
public TransformationMatrix getInvBindPose()
public Transformation getInvBindPose()
{
return TransformationMatrix.identity();
return Transformation.identity();
}
@Override
@@ -517,13 +517,13 @@ public class ModelBlockAnimation
}
@Nullable
public TransformationMatrix getPartTransform(IModelTransform state, BlockPart part, int i)
public Transformation getPartTransform(ModelState state, BlockElement part, int i)
{
return getPartTransform(state, i);
}
@Nullable
public TransformationMatrix getPartTransform(IModelTransform state, int i)
public Transformation getPartTransform(ModelState state, int i)
{
ImmutableCollection<MBJointWeight> infos = getJoint(i);
if(!infos.isEmpty())
@@ -535,7 +535,7 @@ public class ModelBlockAnimation
if(info.getWeights().containsKey(i))
{
ModelBlockAnimation.MBJoint joint = new ModelBlockAnimation.MBJoint(info.getName());
TransformationMatrix trOp = state.getPartTransformation(joint);
Transformation trOp = state.getPartTransformation(joint);
if(!trOp.isIdentity())
{
float w = info.getWeights().get(i)[0];
@@ -549,7 +549,7 @@ public class ModelBlockAnimation
if(weight > 1e-5)
{
m.multiply(1f / weight);
return new TransformationMatrix(m);
return new Transformation(m);
}
}
return null;
@@ -558,11 +558,11 @@ public class ModelBlockAnimation
/**
* Load armature associated with a vanilla model.
*/
public static ModelBlockAnimation loadVanillaAnimation(IResourceManager manager, ResourceLocation armatureLocation)
public static ModelBlockAnimation loadVanillaAnimation(ResourceManager manager, ResourceLocation armatureLocation)
{
try
{
try (IResource resource = manager.getResource(armatureLocation))
try (Resource resource = manager.getResource(armatureLocation))
{
ModelBlockAnimation mba = mbaGson.fromJson(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8), ModelBlockAnimation.class);
//String json = mbaGson.toJson(mba);
@@ -21,5 +21,6 @@
@MethodsReturnNonnullByDefault
package net.minecraftforge.client.model.animation;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -19,7 +19,7 @@
package net.minecraftforge.client.model.b3d;
import net.minecraft.util.math.vector.TransformationMatrix;
import com.mojang.math.Transformation;
import net.minecraftforge.client.model.b3d.B3DLoader.NodeJoint;
import net.minecraftforge.client.model.b3d.B3DModel.Key;
import net.minecraftforge.client.model.b3d.B3DModel.Node;
@@ -63,25 +63,25 @@ public enum B3DClip implements IClip
}
@Override
public TransformationMatrix apply(float time)
public Transformation apply(float time)
{
TransformationMatrix ret = TransformationMatrix.identity();
Transformation ret = Transformation.identity();
if(node.getAnimation() == null)
{
return ret.compose(new TransformationMatrix(node.getPos(), node.getRot(), node.getScale(), null));
return ret.compose(new Transformation(node.getPos(), node.getRot(), node.getScale(), null));
}
int start = Math.max(1, (int)Math.round(Math.floor(time)));
int end = Math.min(start + 1, (int)Math.round(Math.ceil(time)));
float progress = time - (float)Math.floor(time);
Key keyStart = node.getAnimation().getKeys().get(start, node);
Key keyEnd = node.getAnimation().getKeys().get(end, node);
TransformationMatrix startTr = keyStart == null ? null : new TransformationMatrix(keyStart.getPos(), keyStart.getRot(),keyStart.getScale(), null);
TransformationMatrix endTr = keyEnd == null ? null : new TransformationMatrix(keyEnd.getPos(), keyEnd.getRot(),keyEnd.getScale(), null);
Transformation startTr = keyStart == null ? null : new Transformation(keyStart.getPos(), keyStart.getRot(),keyStart.getScale(), null);
Transformation endTr = keyEnd == null ? null : new Transformation(keyEnd.getPos(), keyEnd.getRot(),keyEnd.getScale(), null);
if(keyStart == null)
{
if(keyEnd == null)
{
ret = ret.compose(new TransformationMatrix(node.getPos(), node.getRot(), node.getScale(), null));
ret = ret.compose(new Transformation(node.getPos(), node.getRot(), node.getScale(), null));
}
// TODO animated TRSRTransformation for speed?
else
@@ -37,18 +37,16 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.MissingTextureSprite;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Matrix4f;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraftforge.client.model.*;
import net.minecraftforge.common.model.*;
import net.minecraftforge.resource.IResourceType;
import net.minecraftforge.resource.ISelectiveResourceReloadListener;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.logging.log4j.LogManager;
@@ -64,14 +62,14 @@ import com.google.common.collect.ImmutableSet;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.resources.IResource;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraftforge.client.model.b3d.B3DModel.Animation;
import net.minecraftforge.client.model.b3d.B3DModel.Face;
import net.minecraftforge.client.model.b3d.B3DModel.Key;
@@ -87,6 +85,14 @@ import net.minecraftforge.common.model.animation.IClip;
import net.minecraftforge.common.model.animation.IJoint;
import net.minecraftforge.common.property.Properties;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverrides;
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;
/*
* Loader for Blitz3D models.
* To enable for your mod call instance.addDomain(modId).
@@ -94,30 +100,23 @@ import net.minecraftforge.common.property.Properties;
*/
// TODO: Implement as a new model loader
@SuppressWarnings("unused")
public enum B3DLoader implements ISelectiveResourceReloadListener
public enum B3DLoader
{
INSTANCE;
private static final Logger LOGGER = LogManager.getLogger();
private IResourceManager manager;
private ResourceManager manager;
private final Set<String> enabledDomains = new HashSet<>();
private final Map<ResourceLocation, B3DModel> cache = new HashMap<>();
@Override
public void onResourceManagerReload(IResourceManager manager, Predicate<IResourceType> resourcePredicate)
{
this.manager = manager;
cache.clear();
}
public IUnbakedModel loadModel(ResourceLocation modelLocation) throws Exception
public UnbakedModel loadModel(ResourceLocation modelLocation) throws Exception
{
ResourceLocation file = new ResourceLocation(modelLocation.getNamespace(), modelLocation.getPath());
if(!cache.containsKey(file))
{
IResource resource = null;
Resource resource = null;
try
{
try
@@ -155,7 +154,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
return new ModelWrapper(modelLocation, model, ImmutableSet.of(model.getRoot().getName()), true, true, true, 1);
}
public static final class B3DState implements IModelTransform
public static final class B3DState implements ModelState
{
@Nullable
private final Animation animation;
@@ -163,14 +162,14 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
private final int nextFrame;
private final float progress;
@Nullable
private final IModelTransform parent;
private final ModelState parent;
public B3DState(@Nullable Animation animation, int frame)
{
this(animation, frame, frame, 0);
}
public B3DState(@Nullable Animation animation, int frame, IModelTransform parent)
public B3DState(@Nullable Animation animation, int frame, ModelState parent)
{
this(animation, frame, frame, 0, parent);
}
@@ -180,17 +179,17 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
this(animation, frame, nextFrame, progress, null);
}
public B3DState(@Nullable Animation animation, int frame, int nextFrame, float progress, @Nullable IModelTransform parent)
public B3DState(@Nullable Animation animation, int frame, int nextFrame, float progress, @Nullable ModelState parent)
{
this.animation = animation;
this.frame = frame;
this.nextFrame = nextFrame;
this.progress = MathHelper.clamp(progress, 0, 1);
this.progress = Mth.clamp(progress, 0, 1);
this.parent = getParent(parent);
}
@Nullable
private IModelTransform getParent(@Nullable IModelTransform parent)
private ModelState getParent(@Nullable ModelState parent)
{
if (parent == null) return null;
else if (parent instanceof B3DState) return ((B3DState)parent).parent;
@@ -219,33 +218,33 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}
@Nullable
public IModelTransform getParent()
public ModelState getParent()
{
return parent;
}
@Override
public TransformationMatrix getRotation()
public Transformation getRotation()
{
if(parent != null)
{
return parent.getRotation();
}
return TransformationMatrix.identity();
return Transformation.identity();
}
@Override
public TransformationMatrix getPartTransformation(Object part)
public Transformation getPartTransformation(Object part)
{
// TODO make more use of Optional
if(!(part instanceof NodeJoint))
{
return TransformationMatrix.identity();
return Transformation.identity();
}
Node<?> node = ((NodeJoint)part).getNode();
TransformationMatrix nodeTransform;
Transformation nodeTransform;
if(progress < 1e-5 || frame == nextFrame)
{
nodeTransform = getNodeMatrix(node, frame);
@@ -266,31 +265,31 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
return nodeTransform;
}
private static LoadingCache<Triple<Animation, Node<?>, Integer>, TransformationMatrix> cache = CacheBuilder.newBuilder()
private static LoadingCache<Triple<Animation, Node<?>, Integer>, Transformation> cache = CacheBuilder.newBuilder()
.maximumSize(16384)
.expireAfterAccess(2, TimeUnit.MINUTES)
.build(new CacheLoader<Triple<Animation, Node<?>, Integer>, TransformationMatrix>()
.build(new CacheLoader<Triple<Animation, Node<?>, Integer>, Transformation>()
{
@Override
public TransformationMatrix load(Triple<Animation, Node<?>, Integer> key) throws Exception
public Transformation load(Triple<Animation, Node<?>, Integer> key) throws Exception
{
return getNodeMatrix(key.getLeft(), key.getMiddle(), key.getRight());
}
});
public TransformationMatrix getNodeMatrix(Node<?> node)
public Transformation getNodeMatrix(Node<?> node)
{
return getNodeMatrix(node, frame);
}
public TransformationMatrix getNodeMatrix(Node<?> node, int frame)
public Transformation getNodeMatrix(Node<?> node, int frame)
{
return cache.getUnchecked(Triple.of(animation, node, frame));
}
public static TransformationMatrix getNodeMatrix(@Nullable Animation animation, Node<?> node, int frame)
public static Transformation getNodeMatrix(@Nullable Animation animation, Node<?> node, int frame)
{
TransformationMatrix ret = TransformationMatrix.identity();
Transformation ret = Transformation.identity();
Key key = null;
if(animation != null) key = animation.getKeys().get(frame, node);
else if(node.getAnimation() != null) key = node.getAnimation().getKeys().get(frame, node);
@@ -300,13 +299,13 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
if(parent != null)
{
// parent model-global current pose
TransformationMatrix pm = cache.getUnchecked(Triple.of(animation, node.getParent(), frame));
Transformation pm = cache.getUnchecked(Triple.of(animation, node.getParent(), frame));
ret = ret.compose(pm);
// joint offset in the parent coords
ret = ret.compose(new TransformationMatrix(parent.getPos(), parent.getRot(), parent.getScale(), null));
ret = ret.compose(new Transformation(parent.getPos(), parent.getRot(), parent.getScale(), null));
}
// current node local pose
ret = ret.compose(new TransformationMatrix(key.getPos(), key.getRot(), key.getScale(), null));
ret = ret.compose(new Transformation(key.getPos(), key.getRot(), key.getScale(), null));
// this part moved inside the model
// inverse bind of the current node
/*Matrix4f rm = new TRSRTransformation(node.getPos(), node.getRot(), node.getScale(), null).getMatrix();
@@ -320,7 +319,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
ret = ret.compose(new TRSRTransformation(rm));
}*/
// TODO cache
TransformationMatrix invBind = new NodeJoint(node).getInvBindPose();
Transformation invBind = new NodeJoint(node).getInvBindPose();
ret = ret.compose(invBind);
}
else
@@ -329,14 +328,14 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
if(parent != null)
{
// parent model-global current pose
TransformationMatrix pm = cache.getUnchecked(Triple.of(animation, node.getParent(), frame));
Transformation pm = cache.getUnchecked(Triple.of(animation, node.getParent(), frame));
ret = ret.compose(pm);
// joint offset in the parent coords
ret = ret.compose(new TransformationMatrix(parent.getPos(), parent.getRot(), parent.getScale(), null));
ret = ret.compose(new Transformation(parent.getPos(), parent.getRot(), parent.getScale(), null));
}
ret = ret.compose(new TransformationMatrix(node.getPos(), node.getRot(), node.getScale(), null));
ret = ret.compose(new Transformation(node.getPos(), node.getRot(), node.getScale(), null));
// TODO cache
TransformationMatrix invBind = new NodeJoint(node).getInvBindPose();
Transformation invBind = new NodeJoint(node).getInvBindPose();
ret = ret.compose(invBind);
}
return ret;
@@ -353,15 +352,15 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}
@Override
public TransformationMatrix getInvBindPose()
public Transformation getInvBindPose()
{
Matrix4f m = new TransformationMatrix(node.getPos(), node.getRot(), node.getScale(), null).getMatrix();
Matrix4f m = new Transformation(node.getPos(), node.getRot(), node.getScale(), null).getMatrix();
m.invert();
TransformationMatrix pose = new TransformationMatrix(m);
Transformation pose = new Transformation(m);
if(node.getParent() != null)
{
TransformationMatrix parent = new NodeJoint(node.getParent()).getInvBindPose();
Transformation parent = new NodeJoint(node.getParent()).getInvBindPose();
pose = pose.compose(parent);
}
return pose;
@@ -397,7 +396,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}
}
private static final class ModelWrapper implements IUnbakedModel
private static final class ModelWrapper implements UnbakedModel
{
private final ResourceLocation modelLocation;
private final B3DModel model;
@@ -447,10 +446,10 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
@SuppressWarnings("deprecation")
@Override
public Collection<RenderMaterial> getMaterials(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
public Collection<Material> getMaterials(Function<ResourceLocation, UnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
{
return textures.values().stream().filter(loc -> !loc.startsWith("#"))
.map(t -> new RenderMaterial(AtlasTexture.LOCATION_BLOCKS, new ResourceLocation(t)))
.map(t -> new Material(TextureAtlas.LOCATION_BLOCKS, new ResourceLocation(t)))
.collect(Collectors.toList());
}
@@ -463,10 +462,10 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
@SuppressWarnings("deprecation")
@Nullable
@Override
public IBakedModel bake(ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public BakedModel bake(ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
ImmutableMap.Builder<String, TextureAtlasSprite> builder = ImmutableMap.builder();
TextureAtlasSprite missing = spriteGetter.apply(new RenderMaterial(AtlasTexture.LOCATION_BLOCKS, MissingTextureSprite.getLocation()));
TextureAtlasSprite missing = spriteGetter.apply(new Material(TextureAtlas.LOCATION_BLOCKS, MissingTextureAtlasSprite.getLocation()));
for(Map.Entry<String, String> e : textures.entrySet())
{
if(e.getValue().startsWith("#"))
@@ -476,7 +475,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}
else
{
builder.put(e.getKey(), spriteGetter.apply(new RenderMaterial(AtlasTexture.LOCATION_BLOCKS, new ResourceLocation(e.getValue()))));
builder.put(e.getKey(), spriteGetter.apply(new Material(TextureAtlas.LOCATION_BLOCKS, new ResourceLocation(e.getValue()))));
}
}
builder.put("missingno", missing);
@@ -570,7 +569,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
return Optional.empty();
}
public IModelTransform getDefaultState()
public ModelState getDefaultState()
{
return new B3DState(model.getRoot().getAnimation(), defaultKey, defaultKey, 0);
}
@@ -597,7 +596,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
private static final class BakedWrapper implements IDynamicBakedModel
{
private final Node<?> node;
private final IModelTransform state;
private final ModelState state;
private final boolean smooth;
private final boolean gui3d;
private final boolean isSideLit;
@@ -607,7 +606,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
private ImmutableList<BakedQuad> quads;
public BakedWrapper(final Node<?> node, final IModelTransform state, final boolean smooth, final boolean gui3d, boolean isSideLit, final ImmutableSet<String> meshes, final ImmutableMap<String, TextureAtlasSprite> textures)
public BakedWrapper(final Node<?> node, final ModelState state, final boolean smooth, final boolean gui3d, boolean isSideLit, final ImmutableSet<String> meshes, final ImmutableMap<String, TextureAtlasSprite> textures)
{
this(node, state, smooth, gui3d, isSideLit, meshes, textures, CacheBuilder.newBuilder()
.maximumSize(128)
@@ -617,7 +616,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
@Override
public B3DState load(Integer frame) throws Exception
{
IModelTransform parent = state;
ModelState parent = state;
Animation newAnimation = node.getAnimation();
if(parent instanceof B3DState)
{
@@ -629,7 +628,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}));
}
public BakedWrapper(Node<?> node, IModelTransform state, boolean smooth, boolean gui3d, boolean isSideLit, ImmutableSet<String> meshes, ImmutableMap<String, TextureAtlasSprite> textures, LoadingCache<Integer, B3DState> cache)
public BakedWrapper(Node<?> node, ModelState state, boolean smooth, boolean gui3d, boolean isSideLit, ImmutableSet<String> meshes, ImmutableMap<String, TextureAtlasSprite> textures, LoadingCache<Integer, B3DState> cache)
{
this.node = node;
this.state = state;
@@ -645,12 +644,12 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData data)
{
if(side != null) return ImmutableList.of();
IModelTransform modelState = this.state;
IModelTransform newState = data.getData(Properties.AnimationProperty);
ModelState modelState = this.state;
ModelState newState = data.getData(Properties.AnimationProperty);
if(newState != null)
{
// FIXME: should animation state handle the parent state, or should it remain here?
IModelTransform parent = this.state;
ModelState parent = this.state;
if(parent instanceof B3DState)
{
B3DState ps = (B3DState)parent;
@@ -662,7 +661,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}
else
{
modelState = new ModelTransformComposition(parent, newState);
modelState = new CompositeModelState(parent, newState);
}
}
if(quads == null)
@@ -681,7 +680,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
return quads;
}
private void generateQuads(ImmutableList.Builder<BakedQuad> builder, Node<?> node, final IModelTransform state, ImmutableList<String> path)
private void generateQuads(ImmutableList.Builder<BakedQuad> builder, Node<?> node, final ModelState state, ImmutableList<String> path)
{
ImmutableList.Builder<String> pathBuilder = ImmutableList.builder();
pathBuilder.addAll(path);
@@ -696,13 +695,13 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
Mesh mesh = (Mesh)node.getKind();
Collection<Face> faces = mesh.bake(new Function<Node<?>, Matrix4f>()
{
private final TransformationMatrix global = state.getRotation();
private final LoadingCache<Node<?>, TransformationMatrix> localCache = CacheBuilder.newBuilder()
private final Transformation global = state.getRotation();
private final LoadingCache<Node<?>, Transformation> localCache = CacheBuilder.newBuilder()
.maximumSize(32)
.build(new CacheLoader<Node<?>, TransformationMatrix>()
.build(new CacheLoader<Node<?>, Transformation>()
{
@Override
public TransformationMatrix load(Node<?> node) throws Exception
public Transformation load(Node<?> node) throws Exception
{
return state.getPartTransformation(new NodeJoint(node));
}
@@ -825,16 +824,16 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}
@Override
public IBakedModel handlePerspective(TransformType cameraTransformType, MatrixStack mat)
public BakedModel handlePerspective(TransformType cameraTransformType, PoseStack poseStack)
{
return PerspectiveMapWrapper.handlePerspective(this, state, cameraTransformType, mat);
return PerspectiveMapWrapper.handlePerspective(this, state, cameraTransformType, poseStack);
}
@Override
public ItemOverrideList getOverrides()
public ItemOverrides getOverrides()
{
// TODO handle items
return ItemOverrideList.EMPTY;
return ItemOverrides.EMPTY;
}
}
}
@@ -39,7 +39,6 @@ import java.util.Set;
import javax.annotation.Nullable;
import net.minecraft.util.math.vector.*;
import net.minecraftforge.versions.forge.ForgeVersion;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.tuple.Pair;
@@ -58,6 +57,13 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableTable;
import com.google.common.collect.Table;
import com.mojang.math.Matrix4f;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
import net.minecraft.world.phys.Vec2;
public class B3DModel
{
static final Logger logger = LogManager.getLogger(ForgeVersion.MOD_ID + ".B3DModel");
@@ -248,8 +254,8 @@ public class B3DModel
String path = readString();
int flags = buf.getInt();
int blend = buf.getInt();
Vector2f pos = new Vector2f(buf.getFloat(), buf.getFloat());
Vector2f scale = new Vector2f(buf.getFloat(), buf.getFloat());
Vec2 pos = new Vec2(buf.getFloat(), buf.getFloat());
Vec2 scale = new Vec2(buf.getFloat(), buf.getFloat());
float rot = buf.getFloat();
ret.add(new Texture(path, flags, blend, pos, scale, rot));
}
@@ -528,15 +534,15 @@ public class B3DModel
public static class Texture
{
public static final Texture White = new Texture("builtin/white", 0, 0, new Vector2f(0, 0), new Vector2f(1, 1), 0);
public static final Texture White = new Texture("builtin/white", 0, 0, new Vec2(0, 0), new Vec2(1, 1), 0);
private final String path;
private final int flags;
private final int blend;
private final Vector2f pos;
private final Vector2f scale;
private final Vec2 pos;
private final Vec2 scale;
private final float rot;
public Texture(String path, int flags, int blend, Vector2f pos, Vector2f scale, float rot)
public Texture(String path, int flags, int blend, Vec2 pos, Vec2 scale, float rot)
{
this.path = path;
this.flags = flags;
@@ -561,12 +567,12 @@ public class B3DModel
return blend;
}
public Vector2f getPos()
public Vec2 getPos()
{
return pos;
}
public Vector2f getScale()
public Vec2 getScale()
{
return scale;
}
@@ -677,7 +683,7 @@ public class B3DModel
else t.setIdentity();
}
TransformationMatrix trsr = new TransformationMatrix(t);
Transformation trsr = new Transformation(t);
// pos
Vector4f pos = new Vector4f(this.pos);
@@ -21,5 +21,6 @@
@MethodsReturnNonnullByDefault
package net.minecraftforge.client.model.b3d;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -25,15 +25,15 @@ import java.util.Random;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.util.Direction;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.Direction;
/**
* Convenience interface with default implementation of {@link IBakedModel#getQuads(net.minecraft.block.BlockState, net.minecraft.util.Direction, java.util.Random)}.
*/
public interface IDynamicBakedModel extends IBakedModel
public interface IDynamicBakedModel extends BakedModel
{
@Override
default @Nonnull List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand)
@@ -19,10 +19,10 @@
package net.minecraftforge.client.model.data;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockDisplayReader;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockAndTintGetter;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nullable;
@@ -35,14 +35,14 @@ public class MultipartModelData implements IModelData
{
public static final ModelProperty<MultipartModelData> MULTIPART_DATA = new ModelProperty<>();
public static IModelData create(List<Pair<Predicate<BlockState>, IBakedModel>> selectors, IBlockDisplayReader world, BlockPos pos, BlockState state, IModelData tileData)
public static IModelData create(List<Pair<Predicate<BlockState>, BakedModel>> selectors, BlockAndTintGetter world, BlockPos pos, BlockState state, IModelData tileData)
{
MultipartModelData multipartData = new MultipartModelData(tileData);
for (Pair<Predicate<BlockState>, IBakedModel> selector : selectors)
for (Pair<Predicate<BlockState>, BakedModel> selector : selectors)
{
if (selector.getLeft().test(state))
{
IBakedModel part = selector.getRight();
BakedModel part = selector.getRight();
IModelData partData = part.getModelData(world, pos, state, tileData);
multipartData.setPartData(part, partData);
}
@@ -50,7 +50,7 @@ public class MultipartModelData implements IModelData
return multipartData;
}
public static IModelData resolve(IBakedModel part, IModelData modelData)
public static IModelData resolve(BakedModel part, IModelData modelData)
{
MultipartModelData multipartData = modelData.getData(MultipartModelData.MULTIPART_DATA);
if (multipartData != null)
@@ -59,20 +59,20 @@ public class MultipartModelData implements IModelData
}
private final IModelData tileData;
private final Map<IBakedModel, IModelData> partData = new HashMap<>();
private final Map<BakedModel, IModelData> partData = new HashMap<>();
public MultipartModelData(IModelData tileData)
{
this.tileData = tileData;
}
public void setPartData(IBakedModel part, IModelData data)
public void setPartData(BakedModel part, IModelData data)
{
partData.put(part, data);
}
@Nullable
public IModelData getPartData(IBakedModel part, final IModelData defaultData)
public IModelData getPartData(BakedModel part, final IModelData defaultData)
{
return partData.getOrDefault(part, defaultData);
}
@@ -19,7 +19,7 @@
package net.minecraftforge.client.model.generators;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.data.ExistingFileHelper;
/**
@@ -42,41 +42,41 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.DoorBlock;
import net.minecraft.block.FenceBlock;
import net.minecraft.block.FenceGateBlock;
import net.minecraft.block.FourWayBlock;
import net.minecraft.block.PaneBlock;
import net.minecraft.block.RotatedPillarBlock;
import net.minecraft.block.SixWayBlock;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.StairsBlock;
import net.minecraft.block.TrapDoorBlock;
import net.minecraft.block.WallBlock;
import net.minecraft.block.WallHeight;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
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.SlabBlock;
import net.minecraft.world.level.block.StairBlock;
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.DirectoryCache;
import net.minecraft.data.IDataProvider;
import net.minecraft.state.Property;
import net.minecraft.state.properties.AttachFace;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.state.properties.DoorHingeSide;
import net.minecraft.state.properties.DoubleBlockHalf;
import net.minecraft.state.properties.Half;
import net.minecraft.state.properties.SlabType;
import net.minecraft.state.properties.StairsShape;
import net.minecraft.util.Direction;
import net.minecraft.util.Direction.Axis;
import net.minecraft.data.HashCache;
import net.minecraft.data.DataProvider;
import net.minecraft.world.level.block.state.properties.Property;
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.SlabType;
import net.minecraft.world.level.block.state.properties.StairsShape;
import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Axis;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
/**
* Data provider for blockstate files. Extends {@link BlockModelProvider} so that
* blockstates and their referenced models can be provided in tandem.
*/
public abstract class BlockStateProvider implements IDataProvider {
public abstract class BlockStateProvider implements DataProvider {
private static final Logger LOGGER = LogManager.getLogger();
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().disableHtmlEscaping().create();
@@ -101,7 +101,7 @@ public abstract class BlockStateProvider implements IDataProvider {
}
@Override
public void run(DirectoryCache cache) throws IOException {
public void run(HashCache cache) throws IOException {
models().clear();
itemModels().clear();
registeredBlocks.clear();
@@ -292,35 +292,35 @@ public abstract class BlockStateProvider implements IDataProvider {
});
}
public void stairsBlock(StairsBlock block, ResourceLocation texture) {
public void stairsBlock(StairBlock block, ResourceLocation texture) {
stairsBlock(block, texture, texture, texture);
}
public void stairsBlock(StairsBlock block, String name, ResourceLocation texture) {
public void stairsBlock(StairBlock block, String name, ResourceLocation texture) {
stairsBlock(block, name, texture, texture, texture);
}
public void stairsBlock(StairsBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
public void stairsBlock(StairBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
stairsBlockInternal(block, block.getRegistryName().toString(), side, bottom, top);
}
public void stairsBlock(StairsBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
public void stairsBlock(StairBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
stairsBlockInternal(block, name + "_stairs", side, bottom, top);
}
private void stairsBlockInternal(StairsBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
private void stairsBlockInternal(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
ModelFile stairs = models().stairs(baseName, side, bottom, top);
ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top);
ModelFile stairsOuter = models().stairsOuter(baseName + "_outer", side, bottom, top);
stairsBlock(block, stairs, stairsInner, stairsOuter);
}
public void stairsBlock(StairsBlock block, ModelFile stairs, ModelFile stairsInner, ModelFile stairsOuter) {
public void stairsBlock(StairBlock block, ModelFile stairs, ModelFile stairsInner, ModelFile stairsOuter) {
getVariantBuilder(block)
.forAllStatesExcept(state -> {
Direction facing = state.getValue(StairsBlock.FACING);
Half half = state.getValue(StairsBlock.HALF);
StairsShape shape = state.getValue(StairsBlock.SHAPE);
Direction facing = state.getValue(StairBlock.FACING);
Half half = state.getValue(StairBlock.HALF);
StairsShape shape = state.getValue(StairBlock.SHAPE);
int yRot = (int) facing.getClockWise().toYRot(); // Stairs model is rotated 90 degrees clockwise for some reason
if (shape == StairsShape.INNER_LEFT || shape == StairsShape.OUTER_LEFT) {
yRot += 270; // Left facing stairs are rotated 90 degrees clockwise
@@ -336,7 +336,7 @@ public abstract class BlockStateProvider implements IDataProvider {
.rotationY(yRot)
.uvLock(uvlock)
.build();
}, StairsBlock.WATERLOGGED);
}, StairBlock.WATERLOGGED);
}
public void slabBlock(SlabBlock block, ResourceLocation doubleslab, ResourceLocation texture) {
@@ -354,14 +354,14 @@ public abstract class BlockStateProvider implements IDataProvider {
.partialState().with(SlabBlock.TYPE, SlabType.DOUBLE).addModels(new ConfiguredModel(doubleslab));
}
public void fourWayBlock(FourWayBlock block, ModelFile post, ModelFile side) {
public void fourWayBlock(CrossCollisionBlock block, ModelFile post, ModelFile side) {
MultiPartBlockStateBuilder builder = getMultipartBuilder(block)
.part().modelFile(post).addModel().end();
fourWayMultipart(builder, side);
}
public void fourWayMultipart(MultiPartBlockStateBuilder builder, ModelFile side) {
SixWayBlock.PROPERTY_BY_DIRECTION.entrySet().forEach(e -> {
PipeBlock.PROPERTY_BY_DIRECTION.entrySet().forEach(e -> {
Direction dir = e.getKey();
if (dir.getAxis().isHorizontal()) {
builder.part().modelFile(side).rotationY((((int) dir.toYRot()) + 180) % 360).uvLock(true).addModel()
@@ -424,7 +424,7 @@ public abstract class BlockStateProvider implements IDataProvider {
wallBlock(block, models().wallPost(baseName + "_post", texture), models().wallSide(baseName + "_side", texture), models().wallSideTall(baseName + "_side_tall", texture));
}
public static final ImmutableMap<Direction, Property<WallHeight>> WALL_PROPS = ImmutableMap.<Direction, Property<WallHeight>>builder()
public static final ImmutableMap<Direction, Property<WallSide>> WALL_PROPS = ImmutableMap.<Direction, Property<WallSide>>builder()
.put(Direction.EAST, BlockStateProperties.EAST_WALL)
.put(Direction.NORTH, BlockStateProperties.NORTH_WALL)
.put(Direction.SOUTH, BlockStateProperties.SOUTH_WALL)
@@ -438,12 +438,12 @@ public abstract class BlockStateProvider implements IDataProvider {
WALL_PROPS.entrySet().stream()
.filter(e -> e.getKey().getAxis().isHorizontal())
.forEach(e -> {
wallSidePart(builder, side, e, WallHeight.LOW);
wallSidePart(builder, sideTall, e, WallHeight.TALL);
wallSidePart(builder, side, e, WallSide.LOW);
wallSidePart(builder, sideTall, e, WallSide.TALL);
});
}
private void wallSidePart(MultiPartBlockStateBuilder builder, ModelFile model, Map.Entry<Direction, Property<WallHeight>> entry, WallHeight height) {
private void wallSidePart(MultiPartBlockStateBuilder builder, ModelFile model, Map.Entry<Direction, Property<WallSide>> entry, WallSide height) {
builder.part()
.modelFile(model)
.rotationY((((int) entry.getKey().toYRot()) + 180) % 360)
@@ -452,15 +452,15 @@ public abstract class BlockStateProvider implements IDataProvider {
.condition(entry.getValue(), height);
}
public void paneBlock(PaneBlock block, ResourceLocation pane, ResourceLocation edge) {
public void paneBlock(IronBarsBlock block, ResourceLocation pane, ResourceLocation edge) {
paneBlockInternal(block, block.getRegistryName().toString(), pane, edge);
}
public void paneBlock(PaneBlock block, String name, ResourceLocation pane, ResourceLocation edge) {
public void paneBlock(IronBarsBlock block, String name, ResourceLocation pane, ResourceLocation edge) {
paneBlockInternal(block, name + "_pane", pane, edge);
}
private void paneBlockInternal(PaneBlock block, String baseName, ResourceLocation pane, ResourceLocation edge) {
private void paneBlockInternal(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge) {
ModelFile post = models().panePost(baseName + "_post", pane, edge);
ModelFile side = models().paneSide(baseName + "_side", pane, edge);
ModelFile sideAlt = models().paneSideAlt(baseName + "_side_alt", pane, edge);
@@ -469,10 +469,10 @@ public abstract class BlockStateProvider implements IDataProvider {
paneBlock(block, post, side, sideAlt, noSide, noSideAlt);
}
public void paneBlock(PaneBlock block, ModelFile post, ModelFile side, ModelFile sideAlt, ModelFile noSide, ModelFile noSideAlt) {
public void paneBlock(IronBarsBlock block, ModelFile post, ModelFile side, ModelFile sideAlt, ModelFile noSide, ModelFile noSideAlt) {
MultiPartBlockStateBuilder builder = getMultipartBuilder(block)
.part().modelFile(post).addModel().end();
SixWayBlock.PROPERTY_BY_DIRECTION.entrySet().forEach(e -> {
PipeBlock.PROPERTY_BY_DIRECTION.entrySet().forEach(e -> {
Direction dir = e.getKey();
if (dir.getAxis().isHorizontal()) {
boolean alt = dir == Direction.SOUTH;
@@ -554,13 +554,13 @@ public abstract class BlockStateProvider implements IDataProvider {
}, TrapDoorBlock.POWERED, TrapDoorBlock.WATERLOGGED);
}
private void saveBlockState(DirectoryCache cache, JsonObject stateJson, Block owner) {
private void saveBlockState(HashCache cache, JsonObject stateJson, Block owner) {
ResourceLocation blockName = Preconditions.checkNotNull(owner.getRegistryName());
Path mainOutput = generator.getOutputFolder();
String pathSuffix = "assets/" + blockName.getNamespace() + "/blockstates/" + blockName.getPath() + ".json";
Path outputPath = mainOutput.resolve(pathSuffix);
try {
IDataProvider.save(GSON, cache, stateJson, outputPath);
DataProvider.save(GSON, cache, stateJson, outputPath);
} catch (IOException e) {
LOGGER.error("Couldn't save blockstate to {}", outputPath, e);
}
@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ObjectArrays;
import com.google.gson.JsonObject;
import net.minecraft.client.renderer.model.ModelRotation;
import net.minecraft.client.resources.model.BlockModelRotation;
import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder.PartBuilder;
import net.minecraftforge.client.model.generators.VariantBlockStateBuilder.PartialBlockstate;
@@ -135,7 +135,7 @@ public final class ConfiguredModel {
}
static void checkRotation(int rotationX, int rotationY) {
Preconditions.checkArgument(ModelRotation.by(rotationX, rotationY) != null, "Invalid model rotation x=%d, y=%d", rotationX, rotationY);
Preconditions.checkArgument(BlockModelRotation.by(rotationX, rotationY) != null, "Invalid model rotation x=%d, y=%d", rotationX, rotationY);
}
static void checkWeight(int weight) {
@@ -166,7 +166,7 @@ public final class ConfiguredModel {
return new Builder<>();
}
static Builder<VariantBlockStateBuilder> builder(VariantBlockStateBuilder outer, VariantBlockStateBuilder.PartialBlockstate state) {
static Builder<VariantBlockStateBuilder> builder(VariantBlockStateBuilder outer, PartialBlockstate state) {
return new Builder<>(models -> outer.setModels(state, models), ImmutableList.of());
}
@@ -21,7 +21,7 @@ package net.minecraftforge.client.model.generators;
import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.data.ExistingFileHelper;
import java.util.LinkedHashMap;
@@ -28,7 +28,7 @@ import com.google.common.base.Preconditions;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.data.ExistingFileHelper;
/**
@@ -37,18 +37,19 @@ import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
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.texture.MissingTextureSprite;
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.minecraft.client.renderer.block.model.BlockFaceUV;
import net.minecraft.client.renderer.block.model.BlockModel.GuiLight;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace;
import net.minecraft.client.renderer.block.model.BlockElementRotation;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
import net.minecraft.client.renderer.block.model.ItemTransform;
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;
/**
@@ -238,20 +239,20 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
root.addProperty("gui_light", this.guiLight.getSerializedName());
}
Map<Perspective, ItemTransformVec3f> transforms = this.transforms.build();
Map<Perspective, ItemTransform> transforms = this.transforms.build();
if (!transforms.isEmpty()) {
JsonObject display = new JsonObject();
for (Entry<Perspective, ItemTransformVec3f> e : transforms.entrySet()) {
for (Entry<Perspective, ItemTransform> e : transforms.entrySet()) {
JsonObject transform = new JsonObject();
ItemTransformVec3f vec = e.getValue();
if (vec.equals(ItemTransformVec3f.NO_TRANSFORM)) continue;
if (!vec.rotation.equals(ItemTransformVec3f.Deserializer.DEFAULT_ROTATION)) {
ItemTransform vec = e.getValue();
if (vec.equals(ItemTransform.NO_TRANSFORM)) continue;
if (!vec.rotation.equals(ItemTransform.Deserializer.DEFAULT_ROTATION)) {
transform.add("rotation", serializeVector3f(vec.rotation));
}
if (!vec.translation.equals(ItemTransformVec3f.Deserializer.DEFAULT_TRANSLATION)) {
if (!vec.translation.equals(ItemTransform.Deserializer.DEFAULT_TRANSLATION)) {
transform.add("translation", serializeVector3f(e.getValue().translation));
}
if (!vec.scale.equals(ItemTransformVec3f.Deserializer.DEFAULT_SCALE)) {
if (!vec.scale.equals(ItemTransform.Deserializer.DEFAULT_SCALE)) {
transform.add("scale", serializeVector3f(e.getValue().scale));
}
display.add(e.getKey().name, transform);
@@ -291,7 +292,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
JsonObject faces = new JsonObject();
for (Direction dir : Direction.values()) {
BlockPartFace face = part.faces.get(dir);
BlockElementFace face = part.faces.get(dir);
if (face == null) continue;
JsonObject faceObj = new JsonObject();
@@ -489,10 +490,10 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
return ($, f) -> f.texture(texture);
}
BlockPart build() {
Map<Direction, BlockPartFace> faces = this.faces.entrySet().stream()
BlockElement build() {
Map<Direction, BlockElementFace> faces = this.faces.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().build(), (k1, k2) -> { throw new IllegalArgumentException(); }, LinkedHashMap::new));
return new BlockPart(from, to, faces, rotation == null ? null : rotation.build(), shade);
return new BlockElement(from, to, faces, rotation == null ? null : rotation.build(), shade);
}
public T end() { return self(); }
@@ -501,7 +502,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
private Direction cullface;
private int tintindex = -1;
private String texture = MissingTextureSprite.getLocation().toString();
private String texture = MissingTextureAtlasSprite.getLocation().toString();
private float[] uvs;
private FaceRotation rotation = FaceRotation.ZERO;
@@ -550,11 +551,11 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
return this;
}
BlockPartFace build() {
BlockElementFace build() {
if (this.texture == null) {
throw new IllegalStateException("A model face must have a texture");
}
return new BlockPartFace(cullface, tintindex, texture, new BlockFaceUV(uvs, rotation.rotation));
return new BlockElementFace(cullface, tintindex, texture, new BlockFaceUV(uvs, rotation.rotation));
}
public ElementBuilder end() { return ElementBuilder.this; }
@@ -590,7 +591,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
*/
public RotationBuilder angle(float angle) {
// Same logic from BlockPart.Deserializer#parseAngle
Preconditions.checkArgument(angle == 0.0F || MathHelper.abs(angle) == 22.5F || MathHelper.abs(angle) == 45.0F, "Invalid rotation %f found, only -45/-22.5/0/22.5/45 allowed", angle);
Preconditions.checkArgument(angle == 0.0F || Mth.abs(angle) == 22.5F || Mth.abs(angle) == 45.0F, "Invalid rotation %f found, only -45/-22.5/0/22.5/45 allowed", angle);
this.angle = angle;
return this;
}
@@ -600,8 +601,8 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
return this;
}
BlockPartRotation build() {
return new BlockPartRotation(origin, axis, angle, rescale);
BlockElementRotation build() {
return new BlockElementRotation(origin, axis, angle, rescale);
}
public ElementBuilder end() { return ElementBuilder.this; }
@@ -660,7 +661,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
return transforms.computeIfAbsent(type, TransformVecBuilder::new);
}
Map<Perspective, ItemTransformVec3f> build() {
Map<Perspective, ItemTransform> build() {
return this.transforms.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().build(), (k1, k2) -> { throw new IllegalArgumentException(); }, LinkedHashMap::new));
}
@@ -669,9 +670,9 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
public class TransformVecBuilder {
private Vector3f rotation = new Vector3f();
private Vector3f translation = new Vector3f();
private Vector3f scale = new Vector3f();
private Vector3f rotation = ItemTransform.Deserializer.DEFAULT_ROTATION.copy();
private Vector3f translation = ItemTransform.Deserializer.DEFAULT_TRANSLATION.copy();
private Vector3f scale = ItemTransform.Deserializer.DEFAULT_SCALE.copy();
TransformVecBuilder(Perspective type) {
// param unused for functional match
@@ -696,8 +697,8 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
return this;
}
ItemTransformVec3f build() {
return new ItemTransformVec3f(rotation, translation, scale);
ItemTransform build() {
return new ItemTransform(rotation, translation, scale);
}
public TransformsBuilder end() { return TransformsBuilder.this; }
@@ -21,7 +21,7 @@ package net.minecraftforge.client.model.generators;
import com.google.common.base.Preconditions;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.data.ExistingFileHelper;
public abstract class ModelFile {
@@ -32,21 +32,21 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.DirectoryCache;
import net.minecraft.data.IDataProvider;
import net.minecraft.resources.ResourcePackType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.data.HashCache;
import net.minecraft.data.DataProvider;
import net.minecraft.server.packs.PackType;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.common.data.ExistingFileHelper.ResourceType;
public abstract class ModelProvider<T extends ModelBuilder<T>> implements IDataProvider {
public abstract class ModelProvider<T extends ModelBuilder<T>> implements DataProvider {
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");
protected 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");
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
protected final DataGenerator generator;
@@ -363,17 +363,17 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements IDataP
}
@Override
public void run(DirectoryCache cache) throws IOException {
public void run(HashCache cache) throws IOException {
clear();
registerModels();
generateAll(cache);
}
protected void generateAll(DirectoryCache cache) {
protected void generateAll(HashCache cache) {
for (T model : generatedModels.values()) {
Path target = getPath(model);
try {
IDataProvider.save(GSON, cache, model.toJson(), target);
DataProvider.save(GSON, cache, model.toJson(), target);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -32,8 +32,8 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.block.Block;
import net.minecraft.state.Property;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.properties.Property;
public final class MultiPartBlockStateBuilder implements IGeneratedBlockstate {
@@ -42,9 +42,9 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.JsonObject;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.state.Property;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.Property;
import net.minecraftforge.client.model.generators.BlockStateProvider.ConfiguredModelList;
/**
@@ -21,8 +21,7 @@ package net.minecraftforge.client.model.generators.loaders;
import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.fluid.Fluid;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
import net.minecraftforge.client.model.generators.ModelBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
@@ -21,8 +21,8 @@ package net.minecraftforge.client.model.generators.loaders;
import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.fluid.Fluid;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
import net.minecraftforge.client.model.generators.ModelBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
@@ -22,7 +22,7 @@ package net.minecraftforge.client.model.generators.loaders;
import com.google.common.base.Preconditions;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
import net.minecraftforge.client.model.generators.ModelBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
@@ -22,7 +22,7 @@ package net.minecraftforge.client.model.generators.loaders;
import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.MultiLayerModel;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
import net.minecraftforge.client.model.generators.ModelBuilder;
@@ -21,8 +21,8 @@ package net.minecraftforge.client.model.generators.loaders;
import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.resources.ResourcePackType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.server.packs.PackType;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
import net.minecraftforge.client.model.generators.ModelBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
@@ -49,7 +49,7 @@ public class OBJLoaderBuilder<T extends ModelBuilder<T>> extends CustomLoaderBui
public OBJLoaderBuilder<T> modelLocation(ResourceLocation modelLocation)
{
Preconditions.checkNotNull(modelLocation, "modelLocation must not be null");
Preconditions.checkArgument(existingFileHelper.exists(modelLocation, ResourcePackType.CLIENT_RESOURCES),
Preconditions.checkArgument(existingFileHelper.exists(modelLocation, PackType.CLIENT_RESOURCES),
"OBJ Model %s does not exist in any known resource pack", modelLocation);
this.modelLocation = modelLocation;
return this;
@@ -82,7 +82,7 @@ public class OBJLoaderBuilder<T extends ModelBuilder<T>> extends CustomLoaderBui
public OBJLoaderBuilder<T> overrideMaterialLibrary(ResourceLocation materialLibraryOverrideLocation)
{
Preconditions.checkNotNull(materialLibraryOverrideLocation, "materialLibraryOverrideLocation must not be null");
Preconditions.checkArgument(existingFileHelper.exists(materialLibraryOverrideLocation, ResourcePackType.CLIENT_RESOURCES),
Preconditions.checkArgument(existingFileHelper.exists(materialLibraryOverrideLocation, PackType.CLIENT_RESOURCES),
"OBJ Model %s does not exist in any known resource pack", materialLibraryOverrideLocation);
this.materialLibraryOverrideLocation = materialLibraryOverrideLocation;
return this;
@@ -21,9 +21,8 @@ package net.minecraftforge.client.model.generators.loaders;
import com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.MultiLayerModel;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.SeparatePerspectiveModel;
import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
import net.minecraftforge.client.model.generators.ModelBuilder;
@@ -54,7 +53,7 @@ public class SeparatePerspectiveModelBuilder<T extends ModelBuilder<T>> extends
return this;
}
public SeparatePerspectiveModelBuilder<T> perspective(ItemCameraTransforms.TransformType perspective, T modelBuilder)
public SeparatePerspectiveModelBuilder<T> perspective(ItemTransforms.TransformType perspective, T modelBuilder)
{
Preconditions.checkNotNull(perspective, "layer must not be null");
Preconditions.checkArgument(SeparatePerspectiveModel.Loader.PERSPECTIVES.containsValue(perspective), "perspective is not included in SeparatePerspectiveModel. New mc version?");
@@ -20,9 +20,8 @@
package net.minecraftforge.client.model.geometry;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.IModelConfiguration;
import java.util.Collection;
@@ -31,6 +30,13 @@ import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.ItemOverrides;
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;
/**
* General interface for any model that can be baked, superset of vanilla {@link net.minecraft.client.renderer.model.IUnbakedModel}.
* Models can be baked to different vertex formats and with different state.
@@ -45,7 +51,7 @@ public interface IModelGeometry<T extends IModelGeometry<T>>
return Optional.empty();
}
IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation);
BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation);
Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
}
@@ -20,12 +20,12 @@
package net.minecraftforge.client.model.geometry;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.ModelBakery;
import net.minecraft.client.renderer.model.RenderMaterial;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.IModelBuilder;
import net.minecraftforge.client.model.IModelConfiguration;
@@ -38,9 +38,9 @@ public interface IModelGeometryPart
{
String name();
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation);
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation);
default Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
default Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
// No texture dependencies
return Collections.emptyList();
}
@@ -21,12 +21,12 @@ package net.minecraftforge.client.model.geometry;
import com.google.common.collect.Sets;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.ModelBakery;
import net.minecraft.client.renderer.model.RenderMaterial;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.Material;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.IModelBuilder;
import net.minecraftforge.client.model.IModelConfiguration;
@@ -43,16 +43,16 @@ public interface IMultipartModelGeometry<T extends IMultipartModelGeometry<T>> e
Optional<? extends IModelGeometryPart> getPart(String name);
@Override
default void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
default void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
getParts().stream().filter(part -> owner.getPartVisibility(part))
.forEach(part -> part.addQuads(owner, modelBuilder, bakery, spriteGetter, modelTransform, modelLocation));
}
@Override
default Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
default Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
Set<RenderMaterial> combined = Sets.newHashSet();
Set<Material> combined = Sets.newHashSet();
for (IModelGeometryPart part : getParts())
combined.addAll(part.getTextures(owner, modelGetter, missingTextureErrors));
return combined;
@@ -20,9 +20,8 @@
package net.minecraftforge.client.model.geometry;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.IModelBuilder;
import net.minecraftforge.client.model.IModelConfiguration;
@@ -30,10 +29,17 @@ import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.ItemOverrides;
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;
public interface ISimpleModelGeometry<T extends ISimpleModelGeometry<T>> extends IModelGeometry<T>
{
@Override
default IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
default BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation)
{
TextureAtlasSprite particle = spriteGetter.apply(owner.resolveTexture("particle"));
@@ -44,8 +50,8 @@ public interface ISimpleModelGeometry<T extends ISimpleModelGeometry<T>> extends
return builder.build();
}
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation);
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation);
@Override
Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
}
@@ -21,7 +21,7 @@ package net.minecraftforge.client.model.obj;
import com.google.common.base.Charsets;
import joptsimple.internal.Strings;
import net.minecraft.resources.IResource;
import net.minecraft.server.packs.resources.Resource;
import javax.annotation.Nullable;
import java.io.BufferedReader;
@@ -36,7 +36,7 @@ public class LineReader implements AutoCloseable
InputStreamReader lineStream;
BufferedReader lineReader;
public LineReader(IResource resource)
public LineReader(Resource resource)
{
this.lineStream = new InputStreamReader(resource.getInputStream(), Charsets.UTF_8);
this.lineReader = new BufferedReader(lineStream);
@@ -21,7 +21,7 @@ package net.minecraftforge.client.model.obj;
import com.google.common.collect.Maps;
import joptsimple.internal.Strings;
import net.minecraft.util.math.vector.Vector4f;
import com.mojang.math.Vector4f;
import java.io.IOException;
import java.util.Arrays;
@@ -23,15 +23,14 @@ import com.google.common.collect.Maps;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.IResource;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.GsonHelper;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.client.model.IModelLoader;
import javax.annotation.Nullable;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.*;
public class OBJLoader implements IModelLoader<OBJModel>
@@ -41,10 +40,10 @@ public class OBJLoader implements IModelLoader<OBJModel>
private final Map<OBJModel.ModelSettings, OBJModel> modelCache = Maps.newHashMap();
private final Map<ResourceLocation, MaterialLibrary> materialCache = Maps.newHashMap();
private IResourceManager manager = Minecraft.getInstance().getResourceManager();
private ResourceManager manager = Minecraft.getInstance().getResourceManager();
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
public void onResourceManagerReload(ResourceManager resourceManager)
{
modelCache.clear();
materialCache.clear();
@@ -59,12 +58,12 @@ public class OBJLoader implements IModelLoader<OBJModel>
String modelLocation = modelContents.get("model").getAsString();
boolean detectCullableFaces = JSONUtils.getAsBoolean(modelContents, "detectCullableFaces", true);
boolean diffuseLighting = JSONUtils.getAsBoolean(modelContents, "diffuseLighting", false);
boolean flipV = JSONUtils.getAsBoolean(modelContents, "flip-v", false);
boolean ambientToFullbright = JSONUtils.getAsBoolean(modelContents, "ambientToFullbright", true);
boolean detectCullableFaces = GsonHelper.getAsBoolean(modelContents, "detectCullableFaces", true);
boolean diffuseLighting = GsonHelper.getAsBoolean(modelContents, "diffuseLighting", false);
boolean flipV = GsonHelper.getAsBoolean(modelContents, "flip-v", false);
boolean ambientToFullbright = GsonHelper.getAsBoolean(modelContents, "ambientToFullbright", true);
@Nullable
String materialLibraryOverrideLocation = modelContents.has("materialLibraryOverride") ? JSONUtils.getAsString(modelContents, "materialLibraryOverride") : null;
String materialLibraryOverrideLocation = modelContents.has("materialLibraryOverride") ? GsonHelper.getAsString(modelContents, "materialLibraryOverride") : null;
return loadModel(new OBJModel.ModelSettings(new ResourceLocation(modelLocation), detectCullableFaces, diffuseLighting, flipV, ambientToFullbright, materialLibraryOverrideLocation));
}
@@ -73,7 +72,7 @@ public class OBJLoader implements IModelLoader<OBJModel>
{
return modelCache.computeIfAbsent(settings, (data) -> {
try(IResource resource = manager.getResource(settings.modelLocation);
try(Resource resource = manager.getResource(settings.modelLocation);
LineReader rdr = new LineReader(resource))
{
return new OBJModel(rdr, settings);
@@ -92,7 +91,7 @@ public class OBJLoader implements IModelLoader<OBJModel>
public MaterialLibrary loadMaterialLibrary(ResourceLocation materialLocation)
{
return materialCache.computeIfAbsent(materialLocation, (location) -> {
try(IResource resource = manager.getResource(location);
try(Resource resource = manager.getResource(location);
LineReader rdr = new LineReader(resource))
{
return new MaterialLibrary(rdr);
@@ -24,16 +24,15 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import joptsimple.internal.Strings;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector2f;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.util.math.vector.Vector4f;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import com.mojang.math.Transformation;
import net.minecraft.world.phys.Vec2;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
import net.minecraftforge.client.model.*;
import net.minecraftforge.client.model.geometry.IModelGeometryPart;
import net.minecraftforge.client.model.geometry.IMultipartModelGeometry;
@@ -48,20 +47,26 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import net.minecraft.client.renderer.block.model.BakedQuad;
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;
public class OBJModel implements IMultipartModelGeometry<OBJModel>
{
private static Vector4f COLOR_WHITE = new Vector4f(1, 1, 1, 1);
private static Vector2f[] DEFAULT_COORDS = {
new Vector2f(0, 0),
new Vector2f(0, 1),
new Vector2f(1, 1),
new Vector2f(1, 0),
private static Vec2[] DEFAULT_COORDS = {
new Vec2(0, 0),
new Vec2(0, 1),
new Vec2(1, 1),
new Vec2(1, 0),
};
private final Map<String, ModelGroup> parts = Maps.newHashMap();
private final List<Vector3f> positions = Lists.newArrayList();
private final List<Vector2f> texCoords = Lists.newArrayList();
private final List<Vec2> texCoords = Lists.newArrayList();
private final List<Vector3f> normals = Lists.newArrayList();
private final List<Vector4f> colors = Lists.newArrayList();
@@ -295,12 +300,12 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
}
}
public static Vector2f parseVector2(String[] line)
public static Vec2 parseVector2(String[] line)
{
switch (line.length) {
case 1: return new Vector2f(0,0);
case 2: return new Vector2f(Float.parseFloat(line[1]), 0);
default: return new Vector2f(Float.parseFloat(line[1]), Float.parseFloat(line[2]));
case 1: return new Vec2(0,0);
case 2: return new Vec2(Float.parseFloat(line[1]), 0);
default: return new Vec2(Float.parseFloat(line[1]), Float.parseFloat(line[2]));
}
}
@@ -337,7 +342,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
return Optional.ofNullable(parts.get(name));
}
private Pair<BakedQuad,Direction> makeQuad(int[][] indices, int tintIndex, Vector4f colorTint, Vector4f ambientColor, TextureAtlasSprite texture, TransformationMatrix transform)
private Pair<BakedQuad,Direction> makeQuad(int[][] indices, int tintIndex, Vector4f colorTint, Vector4f ambientColor, TextureAtlasSprite texture, Transformation transform)
{
boolean needsNormalRecalculation = false;
for (int[] ints : indices)
@@ -365,11 +370,11 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
builder.setQuadTint(tintIndex);
Vector2f uv2 = new Vector2f(0, 0);
Vec2 uv2 = new Vec2(0, 0);
if (ambientToFullbright)
{
int fakeLight = (int) ((ambientColor.x() + ambientColor.y() + ambientColor.z()) * 15 / 3.0f);
uv2 = new Vector2f((fakeLight << 4) / 32767.0f, (fakeLight << 4) / 32767.0f);
uv2 = new Vec2((fakeLight << 4) / 32767.0f, (fakeLight << 4) / 32767.0f);
builder.setApplyDiffuseLighting(fakeLight == 0);
}
else
@@ -379,14 +384,14 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
boolean hasTransform = !transform.isIdentity();
// The incoming transform is referenced on the center of the block, but our coords are referenced on the corner
TransformationMatrix transformation = hasTransform ? transform.blockCenterToCorner() : transform;
Transformation transformation = hasTransform ? transform.blockCenterToCorner() : transform;
for(int i=0;i<4;i++)
{
int[] index = indices[Math.min(i,indices.length-1)];
Vector3f pos0 = positions.get(index[0]);
Vector4f position = new Vector4f(pos0);
Vector2f texCoord = index.length >= 2 && texCoords.size() > 0 ? texCoords.get(index[1]) : DEFAULT_COORDS[i];
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;
@@ -411,50 +416,50 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
Direction cull = null;
if (detectCullableFaces)
{
if (MathHelper.equal(pos[0].x(), 0) && // vertex.position.x
MathHelper.equal(pos[1].x(), 0) &&
MathHelper.equal(pos[2].x(), 0) &&
MathHelper.equal(pos[3].x(), 0) &&
if (Mth.equal(pos[0].x(), 0) && // vertex.position.x
Mth.equal(pos[1].x(), 0) &&
Mth.equal(pos[2].x(), 0) &&
Mth.equal(pos[3].x(), 0) &&
norm[0].x() < 0) // vertex.normal.x
{
cull = Direction.WEST;
}
else if (MathHelper.equal(pos[0].x(), 1) && // vertex.position.x
MathHelper.equal(pos[1].x(), 1) &&
MathHelper.equal(pos[2].x(), 1) &&
MathHelper.equal(pos[3].x(), 1) &&
else if (Mth.equal(pos[0].x(), 1) && // vertex.position.x
Mth.equal(pos[1].x(), 1) &&
Mth.equal(pos[2].x(), 1) &&
Mth.equal(pos[3].x(), 1) &&
norm[0].x() > 0) // vertex.normal.x
{
cull = Direction.EAST;
}
else if (MathHelper.equal(pos[0].z(), 0) && // vertex.position.z
MathHelper.equal(pos[1].z(), 0) &&
MathHelper.equal(pos[2].z(), 0) &&
MathHelper.equal(pos[3].z(), 0) &&
else if (Mth.equal(pos[0].z(), 0) && // vertex.position.z
Mth.equal(pos[1].z(), 0) &&
Mth.equal(pos[2].z(), 0) &&
Mth.equal(pos[3].z(), 0) &&
norm[0].z() < 0) // vertex.normal.z
{
cull = Direction.NORTH; // can never remember
}
else if (MathHelper.equal(pos[0].z(), 1) && // vertex.position.z
MathHelper.equal(pos[1].z(), 1) &&
MathHelper.equal(pos[2].z(), 1) &&
MathHelper.equal(pos[3].z(), 1) &&
else if (Mth.equal(pos[0].z(), 1) && // vertex.position.z
Mth.equal(pos[1].z(), 1) &&
Mth.equal(pos[2].z(), 1) &&
Mth.equal(pos[3].z(), 1) &&
norm[0].z() > 0) // vertex.normal.z
{
cull = Direction.SOUTH;
}
else if (MathHelper.equal(pos[0].y(), 0) && // vertex.position.y
MathHelper.equal(pos[1].y(), 0) &&
MathHelper.equal(pos[2].y(), 0) &&
MathHelper.equal(pos[3].y(), 0) &&
else if (Mth.equal(pos[0].y(), 0) && // vertex.position.y
Mth.equal(pos[1].y(), 0) &&
Mth.equal(pos[2].y(), 0) &&
Mth.equal(pos[3].y(), 0) &&
norm[0].y() < 0) // vertex.normal.z
{
cull = Direction.DOWN; // can never remember
}
else if (MathHelper.equal(pos[0].y(), 1) && // vertex.position.y
MathHelper.equal(pos[1].y(), 1) &&
MathHelper.equal(pos[2].y(), 1) &&
MathHelper.equal(pos[3].y(), 1) &&
else if (Mth.equal(pos[0].y(), 1) && // vertex.position.y
Mth.equal(pos[1].y(), 1) &&
Mth.equal(pos[2].y(), 1) &&
Mth.equal(pos[3].y(), 1) &&
norm[0].y() > 0) // vertex.normal.y
{
cull = Direction.UP;
@@ -464,7 +469,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
return Pair.of(builder.build(), cull);
}
private void putVertexData(IVertexConsumer consumer, Vector4f position0, Vector2f texCoord0, Vector3f normal0, Vector4f color0, Vector2f uv2, TextureAtlasSprite texture)
private void putVertexData(IVertexConsumer consumer, Vector4f position0, Vec2 texCoord0, Vector3f normal0, Vector4f color0, Vec2 uv2, TextureAtlasSprite texture)
{
ImmutableList<VertexFormatElement> elements = consumer.getVertexFormat().getElements();
for(int j=0;j<elements.size();j++)
@@ -523,7 +528,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
}
@Override
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
for(ModelMesh mesh : meshes)
{
@@ -546,7 +551,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
{
return meshes.stream().map(mesh -> ModelLoaderRegistry.resolveTexture(mesh.mat.diffuseColorMap, owner)).collect(Collectors.toSet());
}
@@ -567,7 +572,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
}
@Override
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
super.addQuads(owner, modelBuilder, bakery, spriteGetter, modelTransform, modelLocation);
@@ -576,9 +581,9 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
{
Set<RenderMaterial> combined = Sets.newHashSet();
Set<Material> combined = Sets.newHashSet();
combined.addAll(super.getTextures(owner, modelGetter, missingTextureErrors));
for (IModelGeometryPart part : getParts())
combined.addAll(part.getTextures(owner, modelGetter, missingTextureErrors));
@@ -21,5 +21,6 @@
@MethodsReturnNonnullByDefault
package net.minecraftforge.client.model.obj;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -21,5 +21,6 @@
@MethodsReturnNonnullByDefault
package net.minecraftforge.client.model;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -21,12 +21,12 @@ package net.minecraftforge.client.model.pipeline;
import com.google.common.collect.ImmutableList;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.Direction;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.core.Direction;
/**
* Allows easier building of BakedQuad objects. During building, data is stored
@@ -34,7 +34,7 @@ import net.minecraft.util.Direction;
*/
public class BakedQuadBuilder implements IVertexConsumer
{
private static final int SIZE = DefaultVertexFormats.BLOCK.getElements().size();
private static final int SIZE = DefaultVertexFormat.BLOCK.getElements().size();
private final float[][][] unpackedData = new float[4][SIZE][4];
private int tint = -1;
@@ -62,7 +62,7 @@ public class BakedQuadBuilder implements IVertexConsumer
@Override
public VertexFormat getVertexFormat()
{
return DefaultVertexFormats.BLOCK;
return DefaultVertexFormat.BLOCK;
}
@Override
@@ -134,7 +134,7 @@ public class BakedQuadBuilder implements IVertexConsumer
float tS = tX > tY ? tX : tY;
float ep = 1f / (tS * 0x100);
int uve = 0;
ImmutableList<VertexFormatElement> elements = DefaultVertexFormats.BLOCK.getElements();
ImmutableList<VertexFormatElement> elements = DefaultVertexFormat.BLOCK.getElements();
while(uve < elements.size())
{
VertexFormatElement e = elements.get(uve);
@@ -182,12 +182,12 @@ public class BakedQuadBuilder implements IVertexConsumer
}
}
}
int[] packed = new int[DefaultVertexFormats.BLOCK.getIntegerSize() * 4];
int[] packed = new int[DefaultVertexFormat.BLOCK.getIntegerSize() * 4];
for (int v = 0; v < 4; v++)
{
for (int e = 0; e < SIZE; e++)
{
LightUtil.pack(unpackedData[v][e], packed, DefaultVertexFormats.BLOCK, v, e);
LightUtil.pack(unpackedData[v][e], packed, DefaultVertexFormat.BLOCK, v, e);
}
}
return new BakedQuad(packed, tint, orientation, texture, applyDiffuseLighting);
@@ -19,24 +19,23 @@
package net.minecraftforge.client.model.pipeline;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.VoxelShapes;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.IBlockDisplayReader;
import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.level.BlockAndTintGetter;
public class BlockInfo
{
private static final Direction[] SIDES = Direction.values();
private final BlockColors colors;
private IBlockDisplayReader world;
private BlockAndTintGetter world;
private BlockState state;
private BlockPos blockPos;
@@ -72,7 +71,7 @@ public class BlockInfo
{
}
public void setWorld(IBlockDisplayReader world)
public void setWorld(BlockAndTintGetter world)
{
this.world = world;
cachedTint = -1;
@@ -122,7 +121,7 @@ public class BlockInfo
BlockPos pos = blockPos.offset(x - 1, y - 1, z - 1);
BlockState state = world.getBlockState(pos);
t[x][y][z] = state.getLightBlock(world, pos) < 15;
int brightness = WorldRenderer.getLightColor(world, pos);
int brightness = LevelRenderer.getLightColor(world, pos);
s[x][y][z] = LightTexture.sky(brightness);
b[x][y][z] = LightTexture.block(brightness);
ao[x][y][z] = state.getShadeBrightness(world, pos);
@@ -137,7 +136,7 @@ public class BlockInfo
BlockState thisStateShape = this.state.canOcclude() && this.state.useShapeForLightOcclusion() ? this.state : Blocks.AIR.defaultBlockState();
BlockState otherStateShape = state.canOcclude() && state.useShapeForLightOcclusion() ? state : Blocks.AIR.defaultBlockState();
if(state.getLightBlock(world, pos) == 15 || VoxelShapes.faceShapeOccludes(thisStateShape.getFaceOcclusionShape(world, blockPos, side), otherStateShape.getFaceOcclusionShape(world, pos, side.getOpposite())))
if(state.getLightBlock(world, pos) == 15 || Shapes.faceShapeOccludes(thisStateShape.getFaceOcclusionShape(world, blockPos, side), otherStateShape.getFaceOcclusionShape(world, pos, side.getOpposite())))
{
int x = side.getStepX() + 1;
int y = side.getStepY() + 1;
@@ -190,16 +189,16 @@ public class BlockInfo
public void updateFlatLighting()
{
full = Block.isShapeFullBlock(state.getCollisionShape(world, blockPos));
packed[0] = WorldRenderer.getLightColor(world, blockPos);
packed[0] = LevelRenderer.getLightColor(world, blockPos);
for (Direction side : SIDES)
{
int i = side.ordinal() + 1;
packed[i] = WorldRenderer.getLightColor(world, blockPos.relative(side));
packed[i] = LevelRenderer.getLightColor(world, blockPos.relative(side));
}
}
public IBlockDisplayReader getWorld()
public BlockAndTintGetter getWorld()
{
return world;
}
@@ -22,21 +22,21 @@ package net.minecraftforge.client.model.pipeline;
import java.util.List;
import java.util.Random;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.BlockModelRenderer;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockDisplayReader;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.block.ModelBlockRenderer;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.common.ForgeConfig;
public class ForgeBlockModelRenderer extends BlockModelRenderer
public class ForgeBlockModelRenderer extends ModelBlockRenderer
{
private final ThreadLocal<VertexLighterFlat> lighterFlat;
private final ThreadLocal<VertexLighterSmoothAo> lighterSmooth;
@@ -51,7 +51,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
}
@Override
public boolean renderModelFlat(IBlockDisplayReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
public boolean tesselateWithoutAO(BlockAndTintGetter world, BakedModel model, BlockState state, BlockPos pos, PoseStack matrixStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
{
if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
{
@@ -66,12 +66,12 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
}
else
{
return super.renderModelFlat(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
return super.tesselateWithoutAO(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
}
}
@Override
public boolean renderModelSmooth(IBlockDisplayReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
public boolean tesselateWithAO(BlockAndTintGetter world, BakedModel model, BlockState state, BlockPos pos, PoseStack matrixStack, VertexConsumer buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
{
if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
{
@@ -86,11 +86,11 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
}
else
{
return super.renderModelSmooth(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
return super.tesselateWithAO(world, model, state, pos, matrixStack, buffer, checkSides, rand, seed, combinedOverlayIn, modelData);
}
}
public static boolean render(VertexLighterFlat lighter, IBlockDisplayReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, boolean checkSides, Random rand, long seed, IModelData modelData)
public static boolean render(VertexLighterFlat lighter, BlockAndTintGetter world, BakedModel model, BlockState state, BlockPos pos, PoseStack matrixStack, boolean checkSides, Random rand, long seed, IModelData modelData)
{
lighter.setWorld(world);
lighter.setState(state);
@@ -113,7 +113,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
quads = model.getQuads(state, side, rand, modelData);
if(!quads.isEmpty())
{
if(!checkSides || Block.shouldRenderFace(state, world, pos, side))
if(!checkSides || Block.shouldRenderFace(state, world, pos, side, pos.relative(side)))
{
if(empty) lighter.updateBlockInfo();
empty = false;
@@ -20,8 +20,8 @@
package net.minecraftforge.client.model.pipeline;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.Direction;
import com.mojang.blaze3d.vertex.VertexFormat;
import net.minecraft.core.Direction;
/**
* Assumes that the data length is not less than e.getElements().size().
@@ -24,11 +24,11 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.Direction;
import net.minecraft.client.renderer.block.model.BakedQuad;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.core.Direction;
public class LightUtil
{
@@ -96,7 +96,7 @@ public class LightUtil
consumer.setApplyDiffuseLighting(quad.isShade());
float[] data = new float[4];
VertexFormat formatFrom = consumer.getVertexFormat();
VertexFormat formatTo = DefaultVertexFormats.BLOCK;
VertexFormat formatTo = DefaultVertexFormat.BLOCK;
int countFrom = formatFrom.getElements().size();
int countTo = formatTo.getElements().size();
int[] eMap = mapFormats(formatFrom, formatTo);
@@ -118,8 +118,8 @@ public class LightUtil
}
// TODO: probably useless now, remove?
private static final VertexFormat DEFAULT_FROM = VertexLighterFlat.withNormal(DefaultVertexFormats.BLOCK);
private static final VertexFormat DEFAULT_TO = DefaultVertexFormats.BLOCK;
private static final VertexFormat DEFAULT_FROM = VertexLighterFlat.withNormal(DefaultVertexFormat.BLOCK);
private static final VertexFormat DEFAULT_TO = DefaultVertexFormat.BLOCK;
private static final int[] DEFAULT_MAPPING = generateMapping(DEFAULT_FROM, DEFAULT_TO);
public static int[] mapFormats(VertexFormat from, VertexFormat to)
{
@@ -19,7 +19,7 @@
package net.minecraftforge.client.model.pipeline;
import net.minecraft.client.renderer.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
public abstract class QuadGatheringTransformer implements IVertexConsumer
{
@@ -19,15 +19,15 @@
package net.minecraftforge.client.model.pipeline;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.util.math.vector.Vector4f;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
public class TRSRTransformer extends VertexTransformer
{
private final TransformationMatrix transform;
private final Transformation transform;
public TRSRTransformer(IVertexConsumer parent, TransformationMatrix transform)
public TRSRTransformer(IVertexConsumer parent, Transformation transform)
{
super(parent);
this.transform = transform;
@@ -19,7 +19,7 @@
package net.minecraftforge.client.model.pipeline;
import net.minecraft.client.renderer.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
public abstract class TransformerConsumer implements IVertexConsumer {
private IVertexConsumer parent;
@@ -19,23 +19,23 @@
package net.minecraftforge.client.model.pipeline;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.Direction;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import net.minecraft.core.Direction;
/**
* Assumes VertexFormatElement is present in the BufferBuilder's vertex format.
*/
public class VertexBufferConsumer implements IVertexConsumer
{
private IVertexBuilder renderer;
private VertexConsumer renderer;
public VertexBufferConsumer() {}
public VertexBufferConsumer(IVertexBuilder buffer)
public VertexBufferConsumer(VertexConsumer buffer)
{
setBuffer(buffer);
}
@@ -43,7 +43,7 @@ public class VertexBufferConsumer implements IVertexConsumer
@Override
public final VertexFormat getVertexFormat()
{
return DefaultVertexFormats.BLOCK;
return DefaultVertexFormat.BLOCK;
}
@Override
@@ -82,7 +82,7 @@ public class VertexBufferConsumer implements IVertexConsumer
}
}
public void setBuffer(IVertexBuilder buffer)
public void setBuffer(VertexConsumer buffer)
{
this.renderer = buffer;
}
@@ -20,24 +20,27 @@
package net.minecraftforge.client.model.pipeline;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.google.common.collect.Maps;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.block.BlockState;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3f;
import net.minecraft.util.math.vector.Vector4f;
import net.minecraft.world.IBlockDisplayReader;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import com.mojang.math.Vector3f;
import com.mojang.math.Vector4f;
import net.minecraft.world.level.BlockAndTintGetter;
public class VertexLighterFlat extends QuadGatheringTransformer
{
@@ -45,7 +48,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
// TODO 1.16/1.17 possibly refactor out the need for the "unpacked" format entirely. It's creating more headaches than solutions.
// This mess reverses the conversion to float bits done in LightUtil.unpack
private static final int LIGHTMAP_PACKING_FACTOR = ((256 << (8 * (DefaultVertexFormats.ELEMENT_UV2.getType().getSize() - 1))) - 1) >>> 1;
private static final int LIGHTMAP_PACKING_FACTOR = ((256 << (8 * (DefaultVertexFormat.ELEMENT_UV2.getType().getSize() - 1))) - 1) >>> 1;
// Max lightmap value, for rescaling
private static final int LIGHTMAP_MAX = 0xF0;
// Inlined factor for rescaling input lightmap values, "rounded" up to the next float value to avoid precision loss when result is truncated to int
@@ -61,7 +64,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
protected int lightmapIndex = -1;
protected VertexFormat baseFormat;
protected MatrixStack.Entry pose;
protected PoseStack.Pose pose;
public VertexLighterFlat(BlockColors colors)
{
@@ -75,7 +78,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
setVertexFormat(parent.getVertexFormat());
}
public void setTransform(final MatrixStack.Entry pose)
public void setTransform(final PoseStack.Pose pose)
{
this.pose = pose;
}
@@ -130,8 +133,8 @@ public class VertexLighterFlat extends QuadGatheringTransformer
static VertexFormat withNormal(VertexFormat format)
{
//This is the case in 99.99%. Cache the value, so we don't have to redo it every time, and the speed up the equals check in LightUtil
if (format == DefaultVertexFormats.BLOCK)
return DefaultVertexFormats.BLOCK;
if (format == DefaultVertexFormat.BLOCK)
return DefaultVertexFormat.BLOCK;
return withNormalUncached(format);
}
@@ -139,9 +142,9 @@ public class VertexLighterFlat extends QuadGatheringTransformer
{
if (format == null || format.hasNormal())
return format;
List<VertexFormatElement> l = Lists.newArrayList(format.getElements());
l.add(NORMAL_4F);
return new VertexFormat(ImmutableList.copyOf(l));
Map<String, VertexFormatElement> m = Maps.newHashMap(format.getElementMapping());
m.put("Normal", NORMAL_4F);
return new VertexFormat(ImmutableMap.copyOf(m));
}
@Override
@@ -309,7 +312,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
this.diffuse = diffuse;
}
public void setWorld(IBlockDisplayReader world)
public void setWorld(BlockAndTintGetter world)
{
blockInfo.setWorld(world);
}
@@ -19,8 +19,8 @@
package net.minecraftforge.client.model.pipeline;
import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.util.math.MathHelper;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.util.Mth;
public class VertexLighterSmoothAo extends VertexLighterFlat
@@ -139,7 +139,7 @@ public class VertexLighterSmoothAo extends VertexLighterFlat
}
l /= s;
l = MathHelper.clamp(l, 0, 1);
l = Mth.clamp(l, 0, 1);
return l;
}
@@ -164,7 +164,7 @@ public class VertexLighterSmoothAo extends VertexLighterFlat
a += ao[sx - 0][sy - 0][sz - 1] * (0 + x) * (0 + y) * (1 - z);
a += ao[sx - 0][sy - 0][sz - 0] * (0 + x) * (0 + y) * (0 + z);
a = MathHelper.clamp(a, 0, 1);
a = Mth.clamp(a, 0, 1);
return a;
}
@@ -20,8 +20,8 @@
package net.minecraftforge.client.model.pipeline;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.Direction;
import com.mojang.blaze3d.vertex.VertexFormat;
import net.minecraft.core.Direction;
public class VertexTransformer implements IVertexConsumer
{
@@ -21,5 +21,6 @@
@MethodsReturnNonnullByDefault
package net.minecraftforge.client.model.pipeline;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;