mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Setup and import of 1.16 YEET
This commit is contained in:
931 files changed
+18847
-9127
No files matched your search
@@ -28,7 +28,7 @@ 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.TransformationMatrix;
|
||||
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;
|
||||
|
||||
@@ -33,7 +33,7 @@ import net.minecraft.client.renderer.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.ILightReader;
|
||||
import net.minecraft.world.IBlockDisplayReader;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
|
||||
public abstract class BakedModelWrapper<T extends IBakedModel> implements IBakedModel
|
||||
@@ -126,7 +126,7 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IModelData getModelData(@Nonnull ILightReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
|
||||
public IModelData getModelData(@Nonnull IBlockDisplayReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData)
|
||||
{
|
||||
return originalModel.getModelData(world, pos, state, tileData);
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ public class BlockModelConfiguration implements IModelConfiguration
|
||||
}
|
||||
|
||||
@Override
|
||||
public Material resolveTexture(String name)
|
||||
public RenderMaterial resolveTexture(String name)
|
||||
{
|
||||
return owner.resolveTextureName(name);
|
||||
}
|
||||
@@ -144,14 +144,14 @@ public class BlockModelConfiguration implements IModelConfiguration
|
||||
this.visibilityData.copyFrom(other.visibilityData);
|
||||
}
|
||||
|
||||
public Collection<Material> getTextureDependencies(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextureDependencies(Function<ResourceLocation, IUnbakedModel> 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<Material, TextureAtlasSprite> bakedTextureGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
public IBakedModel bake(ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
{
|
||||
IModelGeometry<?> geometry = getCustomGeometry();
|
||||
if (geometry == null)
|
||||
|
||||
@@ -175,19 +175,19 @@ public class CompositeModel implements IDynamicBakedModel
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
throw new UnsupportedOperationException("Attempted to call adQuads on a Submodel instance. Please don't.");
|
||||
}
|
||||
|
||||
public IBakedModel bakeModel(ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
public IBakedModel bakeModel(ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
return model.bakeModel(bakery, spriteGetter, new ModelTransformComposition(this.modelTransform, modelTransform,
|
||||
this.modelTransform.isUvLock() || modelTransform.isUvLock()), modelLocation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
return model.getTextures(modelGetter, missingTextureErrors);
|
||||
}
|
||||
@@ -215,9 +215,9 @@ public class CompositeModel implements IDynamicBakedModel
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
{
|
||||
Material particleLocation = owner.resolveTexture("particle");
|
||||
RenderMaterial particleLocation = owner.resolveTexture("particle");
|
||||
TextureAtlasSprite particle = spriteGetter.apply(particleLocation);
|
||||
|
||||
ImmutableMap.Builder<String, IBakedModel> bakedParts = ImmutableMap.builder();
|
||||
@@ -232,9 +232,9 @@ public class CompositeModel implements IDynamicBakedModel
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
Set<Material> textures = new HashSet<>();
|
||||
Set<RenderMaterial> textures = new HashSet<>();
|
||||
for(Submodel part : parts.values())
|
||||
{
|
||||
textures.addAll(part.getTextures(owner, modelGetter, missingTextureErrors));
|
||||
|
||||
@@ -26,8 +26,9 @@ import com.google.common.collect.Sets;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraft.client.renderer.Quaternion;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
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.renderer.texture.MissingTextureSprite;
|
||||
@@ -94,27 +95,27 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
{
|
||||
Material particleLocation = owner.resolveTexture("particle");
|
||||
RenderMaterial particleLocation = owner.resolveTexture("particle");
|
||||
if (MissingTextureSprite.getLocation().equals(particleLocation.getTextureLocation()))
|
||||
{
|
||||
particleLocation = null;
|
||||
}
|
||||
|
||||
Material baseLocation = owner.resolveTexture("base");
|
||||
RenderMaterial baseLocation = owner.resolveTexture("base");
|
||||
if (MissingTextureSprite.getLocation().equals(baseLocation.getTextureLocation()))
|
||||
{
|
||||
baseLocation = null;
|
||||
}
|
||||
|
||||
Material fluidMaskLocation = owner.resolveTexture("fluid");
|
||||
RenderMaterial fluidMaskLocation = owner.resolveTexture("fluid");
|
||||
if (MissingTextureSprite.getLocation().equals(fluidMaskLocation.getTextureLocation()))
|
||||
{
|
||||
fluidMaskLocation = null;
|
||||
}
|
||||
|
||||
Material coverLocation = owner.resolveTexture("cover");
|
||||
RenderMaterial coverLocation = owner.resolveTexture("cover");
|
||||
if (!MissingTextureSprite.getLocation().equals(coverLocation.getTextureLocation()))
|
||||
{
|
||||
// cover (the actual item around the other two)
|
||||
@@ -188,9 +189,9 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
Set<Material> texs = Sets.newHashSet();
|
||||
Set<RenderMaterial> texs = Sets.newHashSet();
|
||||
|
||||
texs.add(owner.resolveTexture("particle"));
|
||||
texs.add(owner.resolveTexture("base"));
|
||||
@@ -265,7 +266,7 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel getModelWithOverrides(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable LivingEntity entity)
|
||||
public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
|
||||
{
|
||||
return FluidUtil.getFluidContained(stack)
|
||||
.map(fluidStack -> {
|
||||
|
||||
@@ -1,246 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2019.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.client.model;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Quaternion;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.*;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
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 net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.Util;
|
||||
import net.minecraftforge.common.ForgeConfig;
|
||||
import net.minecraftforge.common.model.TransformationHelper;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
|
||||
final class FancyMissingModel implements IUnbakedModel
|
||||
{
|
||||
private static final ResourceLocation font = new ResourceLocation("minecraft", "textures/font/ascii.png");
|
||||
private static final Material font2 = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation("minecraft", "font/ascii"));
|
||||
private static final TransformationMatrix smallTransformation = new TransformationMatrix(null, null, new Vector3f(.25f, .25f, .25f), null)
|
||||
.blockCenterToCorner();
|
||||
private static final SimpleModelFontRenderer fontRenderer = Util.make(() -> {
|
||||
float [] mv = new float[16];
|
||||
mv[2*4+0] = 1f / 128f;
|
||||
mv[0*4+1] =mv[1*4+2] = -mv[2*4+0];
|
||||
mv[3*4+3] = 1;
|
||||
mv[0*4+3] = 1;
|
||||
mv[0*4+3] = 1 + 1f / 0x100;
|
||||
mv[0*4+3] = 0;
|
||||
Matrix4f m = new Matrix4f(mv);
|
||||
return new SimpleModelFontRenderer(
|
||||
Minecraft.getInstance().gameSettings,
|
||||
font,
|
||||
Minecraft.getInstance().getTextureManager(),
|
||||
false,
|
||||
m
|
||||
) {/* TODO Implement once SimpleModelFontRenderer is fixed
|
||||
@Override
|
||||
protected float renderUnicodeChar(char c, boolean italic)
|
||||
{
|
||||
return super.renderDefaultChar(126, italic);
|
||||
}
|
||||
*/};
|
||||
});
|
||||
|
||||
private final IUnbakedModel missingModel;
|
||||
private final String message;
|
||||
|
||||
public FancyMissingModel(IUnbakedModel missingModel, String message)
|
||||
{
|
||||
this.missingModel = missingModel;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
return ImmutableList.of(font2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ResourceLocation> getDependencies()
|
||||
{
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IBakedModel bakeModel(ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
IBakedModel bigMissing = missingModel.bakeModel(bakery, spriteGetter, modelTransform, modelLocation);
|
||||
ModelTransformComposition smallState = new ModelTransformComposition(modelTransform, new SimpleModelTransform(smallTransformation));
|
||||
IBakedModel smallMissing = missingModel.bakeModel(bakery, spriteGetter, smallState, modelLocation);
|
||||
return new BakedModel(bigMissing, smallMissing, fontRenderer, message, spriteGetter.apply(font2));
|
||||
}
|
||||
|
||||
static final class BakedModel implements IBakedModel
|
||||
{
|
||||
private final SimpleModelFontRenderer fontRenderer;
|
||||
private final String message;
|
||||
private final TextureAtlasSprite fontTexture;
|
||||
private final IBakedModel missingModel;
|
||||
private final IBakedModel otherModel;
|
||||
private final boolean big;
|
||||
private ImmutableList<BakedQuad> quads;
|
||||
|
||||
public BakedModel(IBakedModel bigMissing, IBakedModel smallMissing, SimpleModelFontRenderer fontRenderer, String message, TextureAtlasSprite fontTexture)
|
||||
{
|
||||
this.missingModel = bigMissing;
|
||||
otherModel = new BakedModel(smallMissing, fontRenderer, message, fontTexture, this);
|
||||
this.big = true;
|
||||
this.fontRenderer = fontRenderer;
|
||||
this.message = message;
|
||||
this.fontTexture = fontTexture;
|
||||
}
|
||||
|
||||
public BakedModel(IBakedModel smallMissing, SimpleModelFontRenderer fontRenderer, String message, TextureAtlasSprite fontTexture, BakedModel big)
|
||||
{
|
||||
this.missingModel = smallMissing;
|
||||
otherModel = big;
|
||||
this.big = false;
|
||||
this.fontRenderer = fontRenderer;
|
||||
this.message = message;
|
||||
this.fontTexture = fontTexture;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand)
|
||||
{
|
||||
if (side == null)
|
||||
{
|
||||
if (quads == null)
|
||||
{
|
||||
fontRenderer.setSprite(fontTexture);
|
||||
fontRenderer.setFillBlanks(true);
|
||||
String[] lines = message.split("\\r?\\n");
|
||||
List<String> splitLines = Lists.newArrayList();
|
||||
for (int y = 0; y < lines.length; y++)
|
||||
{
|
||||
splitLines.addAll(fontRenderer.listFormattedStringToWidth(lines[y], 0x80));
|
||||
}
|
||||
for (int y = 0; y < splitLines.size(); y++)
|
||||
{
|
||||
fontRenderer.drawString(splitLines.get(y), 0, ((y - splitLines.size() / 2f) * fontRenderer.FONT_HEIGHT) + 0x40, 0xFF00FFFF);
|
||||
}
|
||||
ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
|
||||
builder.addAll(missingModel.getQuads (state, side, rand));
|
||||
builder.addAll(fontRenderer.build());
|
||||
quads = builder.build();
|
||||
}
|
||||
return quads;
|
||||
}
|
||||
return missingModel.getQuads (state, side, rand);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAmbientOcclusion() { return true; }
|
||||
|
||||
@Override
|
||||
public boolean isGui3d() { return false; }
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_() { return false; }
|
||||
|
||||
@Override
|
||||
public boolean isBuiltInRenderer() { return false; }
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getParticleTexture() { return fontTexture; }
|
||||
|
||||
@Override
|
||||
public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; }
|
||||
|
||||
@Override
|
||||
public boolean doesHandlePerspectives()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
|
||||
{
|
||||
TransformationMatrix transform = TransformationMatrix.identity();
|
||||
boolean big = true;
|
||||
switch (cameraTransformType)
|
||||
{
|
||||
|
||||
case THIRD_PERSON_LEFT_HAND:
|
||||
break;
|
||||
case THIRD_PERSON_RIGHT_HAND:
|
||||
break;
|
||||
case FIRST_PERSON_LEFT_HAND:
|
||||
transform = new TransformationMatrix(new Vector3f(-0.62f, 0.5f, -.5f), new Quaternion(1, -1, -1, 1), null, null);
|
||||
big = false;
|
||||
break;
|
||||
case FIRST_PERSON_RIGHT_HAND:
|
||||
transform = new TransformationMatrix(new Vector3f(-0.5f, 0.5f, -.5f), new Quaternion(1, 1, 1, 1), null, null);
|
||||
big = false;
|
||||
break;
|
||||
case HEAD:
|
||||
break;
|
||||
case GUI:
|
||||
if (ForgeConfig.CLIENT.zoomInMissingModelTextInGui.get())
|
||||
{
|
||||
transform = new TransformationMatrix(null, new Quaternion(1, 1, 1, 1), new Vector3f(4, 4, 4), null);
|
||||
big = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
transform = new TransformationMatrix(null, new Quaternion(1, 1, 1, 1), null, null);
|
||||
big = true;
|
||||
}
|
||||
break;
|
||||
case FIXED:
|
||||
transform = new TransformationMatrix(null, new Quaternion(-1, -1, 1, 1), null, null);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
mat.getLast().getMatrix().mul(transform.getMatrix());
|
||||
if (big != this.big)
|
||||
{
|
||||
return otherModel;
|
||||
}
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -32,7 +32,7 @@ import javax.annotation.Nullable;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
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.renderer.texture.TextureAtlasSprite;
|
||||
@@ -73,13 +73,13 @@ public final class FluidModel implements IModelGeometry<FluidModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> 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<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
{
|
||||
FluidAttributes attrs = fluid.getAttributes();
|
||||
return new CachingBakedFluid(
|
||||
|
||||
@@ -22,7 +22,7 @@ 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.Material;
|
||||
import net.minecraft.client.renderer.model.RenderMaterial;
|
||||
import net.minecraftforge.client.model.geometry.IModelGeometryPart;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@@ -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.
|
||||
*/
|
||||
Material resolveTexture(String name);
|
||||
RenderMaterial resolveTexture(String name);
|
||||
|
||||
/**
|
||||
* @return True if the item uses 3D lighting.
|
||||
|
||||
@@ -28,7 +28,7 @@ import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import it.unimi.dsi.fastutil.ints.IntSet;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
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.renderer.texture.TextureAtlasSprite;
|
||||
@@ -38,7 +38,6 @@ 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.Vec2f;
|
||||
import net.minecraftforge.client.model.geometry.IModelGeometry;
|
||||
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
|
||||
import net.minecraftforge.client.model.pipeline.IVertexConsumer;
|
||||
@@ -64,7 +63,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<Material> textures;
|
||||
private ImmutableList<RenderMaterial> textures;
|
||||
private final ImmutableSet<Integer> fullbrightLayers;
|
||||
|
||||
public ItemLayerModel()
|
||||
@@ -72,20 +71,20 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
|
||||
this(null, ImmutableSet.of());
|
||||
}
|
||||
|
||||
public ItemLayerModel(ImmutableList<Material> textures)
|
||||
public ItemLayerModel(ImmutableList<RenderMaterial> textures)
|
||||
{
|
||||
this(textures, ImmutableSet.of());
|
||||
}
|
||||
|
||||
public ItemLayerModel(@Nullable ImmutableList<Material> textures, ImmutableSet<Integer> fullbrightLayers)
|
||||
public ItemLayerModel(@Nullable ImmutableList<RenderMaterial> textures, ImmutableSet<Integer> fullbrightLayers)
|
||||
{
|
||||
this.textures = textures;
|
||||
this.fullbrightLayers = fullbrightLayers;
|
||||
}
|
||||
|
||||
private static ImmutableList<Material> getTextures(IModelConfiguration model)
|
||||
private static ImmutableList<RenderMaterial> getTextures(IModelConfiguration model)
|
||||
{
|
||||
ImmutableList.Builder<Material> builder = ImmutableList.builder();
|
||||
ImmutableList.Builder<RenderMaterial> builder = ImmutableList.builder();
|
||||
for(int i = 0; model.isTexturePresent("layer" + i); i++)
|
||||
{
|
||||
builder.add(model.resolveTexture("layer" + i));
|
||||
@@ -94,7 +93,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
{
|
||||
//TODO: Verify
|
||||
TransformationMatrix transform = modelTransform.getRotation();
|
||||
@@ -106,12 +105,12 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
|
||||
return new BakedItemModel(quads, particle, map, overrides, transform.isIdentity(), owner.isSideLit());
|
||||
}
|
||||
|
||||
public static ImmutableList<BakedQuad> getQuadsForSprites(List<Material> textures, TransformationMatrix transform, Function<Material, TextureAtlasSprite> spriteGetter)
|
||||
public static ImmutableList<BakedQuad> getQuadsForSprites(List<RenderMaterial> textures, TransformationMatrix transform, Function<RenderMaterial, TextureAtlasSprite> spriteGetter)
|
||||
{
|
||||
return getQuadsForSprites(textures, transform, spriteGetter, Collections.emptySet());
|
||||
}
|
||||
|
||||
public static ImmutableList<BakedQuad> getQuadsForSprites(List<Material> textures, TransformationMatrix transform, Function<Material, TextureAtlasSprite> spriteGetter, Set<Integer> fullbrights)
|
||||
public static ImmutableList<BakedQuad> getQuadsForSprites(List<RenderMaterial> textures, TransformationMatrix transform, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, Set<Integer> fullbrights)
|
||||
{
|
||||
ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
|
||||
for(int i = 0; i < textures.size(); i++)
|
||||
@@ -303,7 +302,7 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
textures = getTextures(owner);
|
||||
return textures;
|
||||
|
||||
@@ -21,7 +21,7 @@ package net.minecraftforge.client.model;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
|
||||
@@ -162,7 +162,7 @@ public final class ModelLoader extends ModelBakery
|
||||
{
|
||||
if (instance == null)
|
||||
{
|
||||
instance = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, LOCATION).getSprite();
|
||||
instance = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, LOCATION).getSprite();
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
@@ -262,9 +262,9 @@ public final class ModelLoader extends ModelBakery
|
||||
/**
|
||||
* Get the default texture getter the models will be baked with.
|
||||
*/
|
||||
public static Function<Material, TextureAtlasSprite> defaultTextureGetter()
|
||||
public static Function<RenderMaterial, TextureAtlasSprite> defaultTextureGetter()
|
||||
{
|
||||
return Material::getSprite;
|
||||
return RenderMaterial::getSprite;
|
||||
}
|
||||
|
||||
public static Function<ResourceLocation, IUnbakedModel> defaultModelGetter()
|
||||
|
||||
@@ -26,7 +26,6 @@ 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.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.model.*;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.MissingTextureSprite;
|
||||
@@ -36,6 +35,7 @@ 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.model.geometry.IModelGeometry;
|
||||
import net.minecraftforge.client.model.geometry.ISimpleModelGeometry;
|
||||
import net.minecraftforge.client.model.obj.OBJLoader;
|
||||
@@ -141,7 +141,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 Material resolveTexture(@Nullable String tex, IModelConfiguration owner)
|
||||
public static RenderMaterial resolveTexture(@Nullable String tex, IModelConfiguration owner)
|
||||
{
|
||||
if (tex == null)
|
||||
return blockMaterial(WHITE_TEXTURE);
|
||||
@@ -163,14 +163,14 @@ public class ModelLoaderRegistry
|
||||
return blockMaterial(tex);
|
||||
}
|
||||
|
||||
public static Material blockMaterial(String location)
|
||||
public static RenderMaterial blockMaterial(String location)
|
||||
{
|
||||
return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(location));
|
||||
return new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(location));
|
||||
}
|
||||
|
||||
public static Material blockMaterial(ResourceLocation location)
|
||||
public static RenderMaterial blockMaterial(ResourceLocation location)
|
||||
{
|
||||
return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, location);
|
||||
return new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, location);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@@ -244,7 +244,7 @@ public class ModelLoaderRegistry
|
||||
}
|
||||
}
|
||||
|
||||
public static IBakedModel bakeHelper(BlockModel blockModel, ModelBakery modelBakery, BlockModel otherModel, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation, boolean guiLight3d)
|
||||
public static IBakedModel bakeHelper(BlockModel blockModel, ModelBakery modelBakery, BlockModel otherModel, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation, boolean guiLight3d)
|
||||
{
|
||||
IBakedModel model;
|
||||
IModelGeometry<?> customModel = blockModel.customData.getCustomGeometry();
|
||||
@@ -273,7 +273,7 @@ public class ModelLoaderRegistry
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
for(BlockPart blockpart : elements) {
|
||||
for(Direction direction : blockpart.mapFaces.keySet()) {
|
||||
@@ -291,13 +291,13 @@ public class ModelLoaderRegistry
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
Set<Material> textures = Sets.newHashSet();
|
||||
Set<RenderMaterial> textures = Sets.newHashSet();
|
||||
|
||||
for(BlockPart part : elements) {
|
||||
for(BlockPartFace face : part.mapFaces.values()) {
|
||||
Material texture = owner.resolveTexture(face.texture);
|
||||
RenderMaterial texture = owner.resolveTexture(face.texture);
|
||||
if (Objects.equals(texture, MissingTextureSprite.getLocation().toString())) {
|
||||
missingTextureErrors.add(Pair.of(face.texture, owner.getModelName()));
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
package net.minecraftforge.client.model;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.model.IModelTransform;
|
||||
|
||||
/**
|
||||
|
||||
@@ -31,7 +31,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
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.renderer.texture.TextureAtlasSprite;
|
||||
@@ -67,16 +67,16 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
Set<Material> materials = Sets.newHashSet();
|
||||
Set<RenderMaterial> materials = Sets.newHashSet();
|
||||
materials.add(owner.resolveTexture("particle"));
|
||||
for (IUnbakedModel m : models.values())
|
||||
materials.addAll(m.getTextures(modelGetter, missingTextureErrors));
|
||||
return materials;
|
||||
}
|
||||
|
||||
private static ImmutableMap<RenderType, IBakedModel> buildModels(ImmutableMap<RenderType, IUnbakedModel> models, IModelTransform modelTransform, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, ResourceLocation modelLocation)
|
||||
private static ImmutableMap<RenderType, IBakedModel> buildModels(ImmutableMap<RenderType, IUnbakedModel> models, IModelTransform modelTransform, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, ResourceLocation modelLocation)
|
||||
{
|
||||
ImmutableMap.Builder<RenderType, IBakedModel> builder = ImmutableMap.builder();
|
||||
for(Map.Entry<RenderType, IUnbakedModel> entry : models.entrySet())
|
||||
@@ -87,7 +87,7 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
{
|
||||
IUnbakedModel missing = ModelLoader.instance().getMissingModel();
|
||||
|
||||
|
||||
@@ -26,12 +26,13 @@ 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.TransformationMatrix;
|
||||
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.Direction;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.model.data.IDynamicBakedModel;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
@@ -164,9 +165,9 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable LivingEntity entityIn)
|
||||
public IBakedModel func_239290_a_(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn)
|
||||
{
|
||||
model = parent.getOverrides().getModelWithOverrides(parent, stack, worldIn, entityIn);
|
||||
model = parent.getOverrides().func_239290_a_(parent, stack, worldIn, entityIn);
|
||||
return new PerspectiveMapWrapper(model, transforms);
|
||||
}
|
||||
|
||||
|
||||
@@ -25,9 +25,9 @@ import java.util.List;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.Vector4f;
|
||||
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;
|
||||
@@ -176,7 +176,7 @@ public class QuadTransformer
|
||||
int[] outData = Arrays.copyOf(inData, inData.length);
|
||||
processVertices(inData, outData);
|
||||
|
||||
return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.shouldApplyDiffuseLighting());
|
||||
return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.func_239287_f_());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -208,7 +208,7 @@ public class QuadTransformer
|
||||
int[] outData = Arrays.copyOf(inData, inData.length);
|
||||
processVertices(inData, outData);
|
||||
|
||||
outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.shouldApplyDiffuseLighting()));
|
||||
outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.func_239287_f_()));
|
||||
}
|
||||
return outputs;
|
||||
}
|
||||
|
||||
@@ -1,110 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2019.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.client.model;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
import net.minecraft.client.GameSettings;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.Vector4f;
|
||||
import net.minecraft.client.renderer.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormatElement;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
|
||||
|
||||
public abstract class SimpleModelFontRenderer extends FontRenderer {
|
||||
|
||||
private float r, g, b, a;
|
||||
private final TransformationMatrix transform;
|
||||
private ImmutableList.Builder<BakedQuad> builder = ImmutableList.builder();
|
||||
private final Vector3f normal = new Vector3f(0, 0, 1);
|
||||
private final Direction orientation;
|
||||
private boolean fillBlanks = false;
|
||||
|
||||
private TextureAtlasSprite sprite;
|
||||
|
||||
public SimpleModelFontRenderer(GameSettings settings, ResourceLocation font, TextureManager manager, boolean isUnicode, Matrix4f matrix)
|
||||
{
|
||||
super(manager, null);
|
||||
this.transform = new TransformationMatrix(matrix);
|
||||
transform.transformNormal(normal);
|
||||
orientation = Direction.getFacingFromVector(normal.getX(), normal.getY(), normal.getZ());
|
||||
}
|
||||
|
||||
public void setSprite(TextureAtlasSprite sprite)
|
||||
{
|
||||
this.sprite = sprite;
|
||||
}
|
||||
|
||||
public void setFillBlanks(boolean fillBlanks)
|
||||
{
|
||||
this.fillBlanks = fillBlanks;
|
||||
}
|
||||
|
||||
private final Vector4f vec = new Vector4f();
|
||||
|
||||
private void addVertex(BakedQuadBuilder quadBuilder, float x, float y, float u, float v)
|
||||
{
|
||||
ImmutableList<VertexFormatElement> elements = quadBuilder.getVertexFormat().getElements();
|
||||
for(int e = 0; e < elements.size(); e++)
|
||||
{
|
||||
VertexFormatElement element = elements.get(e);
|
||||
switch(element.getUsage())
|
||||
{
|
||||
case POSITION:
|
||||
vec.set(x, y, 0f, 1f);
|
||||
transform.transformPosition(vec);
|
||||
quadBuilder.put(e, vec.getX(), vec.getY(), vec.getZ(), vec.getW());
|
||||
break;
|
||||
case COLOR:
|
||||
quadBuilder.put(e, r, g, b, a);
|
||||
break;
|
||||
case NORMAL:
|
||||
//quadBuilder.put(e, normal.x, normal.y, normal.z, 1);
|
||||
quadBuilder.put(e, 0, 0, 1, 1);
|
||||
break;
|
||||
case UV:
|
||||
if(element.getIndex() == 0)
|
||||
{
|
||||
quadBuilder.put(e, sprite.getInterpolatedU(u * 16), sprite.getInterpolatedV(v * 16), 0, 1);
|
||||
break;
|
||||
}
|
||||
// else fallthrough to default
|
||||
default:
|
||||
quadBuilder.put(e);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ImmutableList<BakedQuad> build()
|
||||
{
|
||||
ImmutableList<BakedQuad> ret = builder.build();
|
||||
builder = ImmutableList.builder();
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -19,10 +19,10 @@
|
||||
|
||||
package net.minecraftforge.client.model;
|
||||
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.model.IModelTransform;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
|
||||
/**
|
||||
* Simple implementation of IModelState via a map and a default value.
|
||||
|
||||
+6
-5
@@ -27,6 +27,7 @@ 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;
|
||||
@@ -43,14 +44,14 @@ public final class AnimationItemOverrideList extends ItemOverrideList
|
||||
private final IModelTransform state;
|
||||
|
||||
|
||||
private final Function<Material, TextureAtlasSprite> bakedTextureGetter;
|
||||
private final Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter;
|
||||
|
||||
public AnimationItemOverrideList(ModelBakery bakery, IUnbakedModel model, ResourceLocation modelLoc, IModelTransform state, Function<Material, TextureAtlasSprite> bakedTextureGetter, ItemOverrideList overrides)
|
||||
public AnimationItemOverrideList(ModelBakery bakery, IUnbakedModel model, ResourceLocation modelLoc, IModelTransform state, Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter, ItemOverrideList overrides)
|
||||
{
|
||||
this(bakery, model, modelLoc, state, bakedTextureGetter, overrides.getOverrides().reverse());
|
||||
}
|
||||
|
||||
public AnimationItemOverrideList(ModelBakery bakery, IUnbakedModel model, ResourceLocation modelLoc, IModelTransform state, Function<Material, TextureAtlasSprite> bakedTextureGetter, List<ItemOverride> overrides)
|
||||
public AnimationItemOverrideList(ModelBakery bakery, IUnbakedModel model, ResourceLocation modelLoc, IModelTransform state, Function<RenderMaterial, TextureAtlasSprite> bakedTextureGetter, List<ItemOverride> overrides)
|
||||
{
|
||||
super(bakery, model, ModelLoader.defaultModelGetter(), bakedTextureGetter, overrides);
|
||||
this.bakery = bakery;
|
||||
@@ -61,7 +62,7 @@ public final class AnimationItemOverrideList extends ItemOverrideList
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel getModelWithOverrides(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable LivingEntity entity)
|
||||
public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
|
||||
{
|
||||
return stack.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null)
|
||||
.map(asm ->
|
||||
@@ -80,6 +81,6 @@ public final class AnimationItemOverrideList extends ItemOverrideList
|
||||
})
|
||||
// TODO where should uvlock data come from?
|
||||
.map(state -> model.bakeModel(bakery, bakedTextureGetter, new ModelTransformComposition(state, this.state), modelLoc))
|
||||
.orElseGet(() -> super.getModelWithOverrides(originalModel, stack, world, entity));
|
||||
.orElseGet(() -> super.func_239290_a_(originalModel, stack, world, entity));
|
||||
}
|
||||
}
|
||||
@@ -33,8 +33,11 @@ import java.util.TreeMap;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.client.renderer.*;
|
||||
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 org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
|
||||
+2
-2
@@ -33,7 +33,7 @@ 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.ILightReader;
|
||||
import net.minecraft.world.IBlockDisplayReader;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import net.minecraftforge.client.model.ModelDataManager;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
@@ -66,7 +66,7 @@ public class TileEntityRendererAnimation<T extends TileEntity> extends TileEntit
|
||||
}
|
||||
if(blockRenderer == null) blockRenderer = Minecraft.getInstance().getBlockRendererDispatcher();
|
||||
BlockPos pos = te.getPos();
|
||||
ILightReader world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos);
|
||||
IBlockDisplayReader world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos);
|
||||
BlockState state = world.getBlockState(pos);
|
||||
IBakedModel model = blockRenderer.getBlockModelShapes().getModel(state);
|
||||
IModelData data = model.getModelData(world, pos, state, ModelDataManager.getModelData(te.getWorld(), pos));
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
package net.minecraftforge.client.model.b3d;
|
||||
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
import net.minecraftforge.client.model.b3d.B3DLoader.NodeJoint;
|
||||
import net.minecraftforge.client.model.b3d.B3DModel.Key;
|
||||
import net.minecraftforge.client.model.b3d.B3DModel.Node;
|
||||
|
||||
@@ -38,9 +38,9 @@ import java.util.stream.Collectors;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
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;
|
||||
@@ -446,10 +446,10 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
return textures.values().stream().filter(loc -> !loc.startsWith("#"))
|
||||
.map(t -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(t)))
|
||||
.map(t -> new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(t)))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@@ -461,10 +461,10 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IBakedModel bakeModel(ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
public IBakedModel bakeModel(ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
ImmutableMap.Builder<String, TextureAtlasSprite> builder = ImmutableMap.builder();
|
||||
TextureAtlasSprite missing = spriteGetter.apply(new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation()));
|
||||
TextureAtlasSprite missing = spriteGetter.apply(new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation()));
|
||||
for(Map.Entry<String, String> e : textures.entrySet())
|
||||
{
|
||||
if(e.getValue().startsWith("#"))
|
||||
@@ -474,7 +474,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
|
||||
}
|
||||
else
|
||||
{
|
||||
builder.put(e.getKey(), spriteGetter.apply(new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(e.getValue()))));
|
||||
builder.put(e.getKey(), spriteGetter.apply(new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(e.getValue()))));
|
||||
}
|
||||
}
|
||||
builder.put("missingno", missing);
|
||||
|
||||
@@ -39,8 +39,7 @@ import java.util.Set;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.client.renderer.*;
|
||||
import net.minecraft.util.math.Vec2f;
|
||||
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;
|
||||
@@ -249,8 +248,8 @@ public class B3DModel
|
||||
String path = readString();
|
||||
int flags = buf.getInt();
|
||||
int blend = buf.getInt();
|
||||
Vec2f pos = new Vec2f(buf.getFloat(), buf.getFloat());
|
||||
Vec2f scale = new Vec2f(buf.getFloat(), buf.getFloat());
|
||||
Vector2f pos = new Vector2f(buf.getFloat(), buf.getFloat());
|
||||
Vector2f scale = new Vector2f(buf.getFloat(), buf.getFloat());
|
||||
float rot = buf.getFloat();
|
||||
ret.add(new Texture(path, flags, blend, pos, scale, rot));
|
||||
}
|
||||
@@ -529,15 +528,15 @@ public class B3DModel
|
||||
|
||||
public static class Texture
|
||||
{
|
||||
public static final Texture White = new Texture("builtin/white", 0, 0, new Vec2f(0, 0), new Vec2f(1, 1), 0);
|
||||
public static final Texture White = new Texture("builtin/white", 0, 0, new Vector2f(0, 0), new Vector2f(1, 1), 0);
|
||||
private final String path;
|
||||
private final int flags;
|
||||
private final int blend;
|
||||
private final Vec2f pos;
|
||||
private final Vec2f scale;
|
||||
private final Vector2f pos;
|
||||
private final Vector2f scale;
|
||||
private final float rot;
|
||||
|
||||
public Texture(String path, int flags, int blend, Vec2f pos, Vec2f scale, float rot)
|
||||
public Texture(String path, int flags, int blend, Vector2f pos, Vector2f scale, float rot)
|
||||
{
|
||||
this.path = path;
|
||||
this.flags = flags;
|
||||
@@ -562,12 +561,12 @@ public class B3DModel
|
||||
return blend;
|
||||
}
|
||||
|
||||
public Vec2f getPos()
|
||||
public Vector2f getPos()
|
||||
{
|
||||
return pos;
|
||||
}
|
||||
|
||||
public Vec2f getScale()
|
||||
public Vector2f getScale()
|
||||
{
|
||||
return scale;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,6 @@ import net.minecraft.block.DoorBlock;
|
||||
import net.minecraft.block.FenceBlock;
|
||||
import net.minecraft.block.FenceGateBlock;
|
||||
import net.minecraft.block.FourWayBlock;
|
||||
import net.minecraft.block.LogBlock;
|
||||
import net.minecraft.block.PaneBlock;
|
||||
import net.minecraft.block.RotatedPillarBlock;
|
||||
import net.minecraft.block.SixWayBlock;
|
||||
@@ -194,7 +193,7 @@ public abstract class BlockStateProvider implements IDataProvider {
|
||||
axisBlock(block, blockTexture(block));
|
||||
}
|
||||
|
||||
public void logBlock(LogBlock block) {
|
||||
public void logBlock(RotatedPillarBlock block) {
|
||||
axisBlock(block, blockTexture(block), extend(blockTexture(block), "_top"));
|
||||
}
|
||||
|
||||
|
||||
@@ -49,8 +49,8 @@ public class ExistingFileHelper {
|
||||
private final boolean enable;
|
||||
|
||||
public ExistingFileHelper(Collection<Path> existingPacks, boolean enable) {
|
||||
this.clientResources = new SimpleReloadableResourceManager(ResourcePackType.CLIENT_RESOURCES, Thread.currentThread());
|
||||
this.serverData = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, Thread.currentThread());
|
||||
this.clientResources = new SimpleReloadableResourceManager(ResourcePackType.CLIENT_RESOURCES);
|
||||
this.serverData = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
|
||||
this.clientResources.addResourcePack(new VanillaPack("minecraft", "realms"));
|
||||
this.serverData.addResourcePack(new VanillaPack("minecraft"));
|
||||
for (Path existing : existingPacks) {
|
||||
|
||||
@@ -36,7 +36,7 @@ import com.google.gson.Gson;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraft.client.renderer.model.BlockFaceUV;
|
||||
import net.minecraft.client.renderer.model.BlockPart;
|
||||
import net.minecraft.client.renderer.model.BlockPartFace;
|
||||
@@ -53,11 +53,11 @@ import net.minecraft.util.math.MathHelper;
|
||||
/**
|
||||
* General purpose model builder, contains all the commonalities between item
|
||||
* and block models.
|
||||
*
|
||||
*
|
||||
* @see ModelProvider
|
||||
* @see BlockModelBuilder
|
||||
* @see ItemModelBuilder
|
||||
*
|
||||
*
|
||||
* @param <T> Self type, for simpler chaining of methods.
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
@@ -89,7 +89,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Set the parent model for the current model.
|
||||
*
|
||||
*
|
||||
* @param parent the parent model
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code parent} is {@code null}
|
||||
@@ -104,7 +104,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Set the texture for a given dictionary key.
|
||||
*
|
||||
*
|
||||
* @param key the texture key
|
||||
* @param texture the texture, can be another key e.g. {@code "#all"}
|
||||
* @return this builder
|
||||
@@ -133,7 +133,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Set the texture for a given dictionary key.
|
||||
*
|
||||
*
|
||||
* @param key the texture key
|
||||
* @param texture the texture
|
||||
* @return this builder
|
||||
@@ -170,7 +170,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
public T gui3d(boolean gui3d) {
|
||||
return self();
|
||||
}
|
||||
|
||||
|
||||
public T guiLight(GuiLight light) {
|
||||
this.guiLight = light;
|
||||
return self();
|
||||
@@ -184,7 +184,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Get an existing element builder
|
||||
*
|
||||
*
|
||||
* @param index the index of the existing element builder
|
||||
* @return the element builder
|
||||
* @throws IndexOutOfBoundsException if {@code} index is out of bounds
|
||||
@@ -204,7 +204,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
if (!this.ambientOcclusion) {
|
||||
root.addProperty("ambientocclusion", this.ambientOcclusion);
|
||||
}
|
||||
|
||||
|
||||
if (this.guiLight != null) {
|
||||
root.addProperty("gui_light", this.guiLight.getSerializedName());
|
||||
}
|
||||
@@ -240,7 +240,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
if (!this.elements.isEmpty()) {
|
||||
JsonArray elements = new JsonArray();
|
||||
this.elements.stream().map(ElementBuilder::build).forEach(part -> {
|
||||
this.elements.stream().map(ElementBuilder::build).forEach(part -> {
|
||||
JsonObject partObj = new JsonObject();
|
||||
partObj.add("from", serializeVector3f(part.positionFrom));
|
||||
partObj.add("to", serializeVector3f(part.positionTo));
|
||||
@@ -248,7 +248,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
if (part.partRotation != null) {
|
||||
JsonObject rotation = new JsonObject();
|
||||
rotation.add("origin", serializeVector3f(part.partRotation.origin));
|
||||
rotation.addProperty("axis", part.partRotation.axis.getName());
|
||||
rotation.addProperty("axis", part.partRotation.axis.func_176610_l());
|
||||
rotation.addProperty("angle", part.partRotation.angle);
|
||||
if (part.partRotation.rescale) {
|
||||
rotation.addProperty("rescale", part.partRotation.rescale);
|
||||
@@ -271,7 +271,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
faceObj.add("uv", new Gson().toJsonTree(face.blockFaceUV.uvs));
|
||||
}
|
||||
if (face.cullFace != null) {
|
||||
faceObj.addProperty("cullface", face.cullFace.getName());
|
||||
faceObj.addProperty("cullface", face.cullFace.func_176610_l());
|
||||
}
|
||||
if (face.blockFaceUV.rotation != 0) {
|
||||
faceObj.addProperty("rotation", face.blockFaceUV.rotation);
|
||||
@@ -279,7 +279,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
if (face.tintIndex != -1) {
|
||||
faceObj.addProperty("tintindex", face.tintIndex);
|
||||
}
|
||||
faces.add(dir.getName(), faceObj);
|
||||
faces.add(dir.func_176610_l(), faceObj);
|
||||
}
|
||||
if (!part.mapFaces.isEmpty()) {
|
||||
partObj.add("faces", faces);
|
||||
@@ -341,7 +341,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Set the "from" position for this element.
|
||||
*
|
||||
*
|
||||
* @param x x-position for this vector
|
||||
* @param y y-position for this vector
|
||||
* @param z z-position for this vector
|
||||
@@ -358,7 +358,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Set the "to" position for this element.
|
||||
*
|
||||
*
|
||||
* @param x x-position for this vector
|
||||
* @param y y-position for this vector
|
||||
* @param z z-position for this vector
|
||||
@@ -375,7 +375,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Return or create the face builder for the given direction.
|
||||
*
|
||||
*
|
||||
* @param dir the direction
|
||||
* @return the face builder for the given direction
|
||||
* @throws NullPointerException if {@code dir} is {@code null}
|
||||
@@ -400,7 +400,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
/**
|
||||
* Modify all <em>possible</em> faces dynamically using a function, creating new
|
||||
* faces as necessary.
|
||||
*
|
||||
*
|
||||
* @param action the function to apply to each direction
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code action} is {@code null}
|
||||
@@ -413,7 +413,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Modify all <em>existing</em> faces dynamically using a function.
|
||||
*
|
||||
*
|
||||
* @param action the function to apply to each direction
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code action} is {@code null}
|
||||
@@ -427,7 +427,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
/**
|
||||
* Texture all <em>possible</em> faces in the current element with the given
|
||||
* texture, creating new faces where necessary.
|
||||
*
|
||||
*
|
||||
* @param texture the texture
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code texture} is {@code null}
|
||||
@@ -439,7 +439,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
/**
|
||||
* Texture all <em>existing</em> faces in the current element with the given
|
||||
* texture.
|
||||
*
|
||||
*
|
||||
* @param texture the texture
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code texture} is {@code null}
|
||||
@@ -451,7 +451,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
/**
|
||||
* Create a typical cube element, creating new faces as needed, applying the
|
||||
* given texture, and setting the cullface.
|
||||
*
|
||||
*
|
||||
* @param texture the texture
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code texture} is {@code null}
|
||||
@@ -496,7 +496,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Set the texture for the current face.
|
||||
*
|
||||
*
|
||||
* @param texture the texture
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code texture} is {@code null}
|
||||
@@ -514,7 +514,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Set the texture rotation for the current face.
|
||||
*
|
||||
*
|
||||
* @param rot the rotation
|
||||
* @return this builder
|
||||
* @throws NullPointerException if {@code rot} is {@code null}
|
||||
@@ -625,7 +625,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
|
||||
/**
|
||||
* Begin building a new transform for the given perspective.
|
||||
*
|
||||
*
|
||||
* @param type the perspective to create or return the builder for
|
||||
* @return the builder for the given perspective
|
||||
* @throws NullPointerException if {@code type} is {@code null}
|
||||
|
||||
+5
-5
@@ -32,7 +32,7 @@ import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.state.IProperty;
|
||||
import net.minecraft.state.Property;
|
||||
|
||||
public final class MultiPartBlockStateBuilder implements IGeneratedBlockstate {
|
||||
|
||||
@@ -74,7 +74,7 @@ public final class MultiPartBlockStateBuilder implements IGeneratedBlockstate {
|
||||
public class PartBuilder {
|
||||
public BlockStateProvider.ConfiguredModelList models;
|
||||
public boolean useOr;
|
||||
public final Multimap<IProperty<?>, Comparable<?>> conditions = HashMultimap.create();
|
||||
public final Multimap<Property<?>, Comparable<?>> conditions = HashMultimap.create();
|
||||
|
||||
PartBuilder(BlockStateProvider.ConfiguredModelList models) {
|
||||
this.models = models;
|
||||
@@ -101,7 +101,7 @@ public final class MultiPartBlockStateBuilder implements IGeneratedBlockstate {
|
||||
* current block's state
|
||||
*/
|
||||
@SafeVarargs
|
||||
public final <T extends Comparable<T>> PartBuilder condition(IProperty<T> prop, T... values) {
|
||||
public final <T extends Comparable<T>> PartBuilder condition(Property<T> prop, T... values) {
|
||||
Preconditions.checkNotNull(prop, "Property must not be null");
|
||||
Preconditions.checkNotNull(values, "Value list must not be null");
|
||||
Preconditions.checkArgument(values.length > 0, "Value list must not be empty");
|
||||
@@ -117,12 +117,12 @@ public final class MultiPartBlockStateBuilder implements IGeneratedBlockstate {
|
||||
JsonObject out = new JsonObject();
|
||||
if (!conditions.isEmpty()) {
|
||||
JsonObject when = new JsonObject();
|
||||
for (Entry<IProperty<?>, Collection<Comparable<?>>> e : conditions.asMap().entrySet()) {
|
||||
for (Entry<Property<?>, Collection<Comparable<?>>> e : conditions.asMap().entrySet()) {
|
||||
StringBuilder activeString = new StringBuilder();
|
||||
for (Comparable<?> val : e.getValue()) {
|
||||
if (activeString.length() > 0)
|
||||
activeString.append("|");
|
||||
activeString.append(((IProperty) e.getKey()).getName(val));
|
||||
activeString.append(((Property) e.getKey()).getName(val));
|
||||
}
|
||||
when.addProperty(e.getKey().getName(), activeString.toString());
|
||||
}
|
||||
|
||||
+18
-18
@@ -44,7 +44,7 @@ import com.google.gson.JsonObject;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.state.IProperty;
|
||||
import net.minecraft.state.Property;
|
||||
import net.minecraftforge.client.model.generators.BlockStateProvider.ConfiguredModelList;
|
||||
|
||||
/**
|
||||
@@ -60,7 +60,7 @@ import net.minecraftforge.client.model.generators.BlockStateProvider.ConfiguredM
|
||||
* <p>
|
||||
* This class also provides the convenience methods
|
||||
* {@link #forAllStates(Function)} and
|
||||
* {@link #forAllStatesExcept(Function, IProperty...)} for cases where the model
|
||||
* {@link #forAllStatesExcept(Function, Property...)} for cases where the model
|
||||
* for each variant can be decided dynamically based on the state's property
|
||||
* values.
|
||||
*
|
||||
@@ -160,11 +160,11 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
return forAllStatesExcept(mapper);
|
||||
}
|
||||
|
||||
public VariantBlockStateBuilder forAllStatesExcept(Function<BlockState, ConfiguredModel[]> mapper, IProperty<?>... ignored) {
|
||||
public VariantBlockStateBuilder forAllStatesExcept(Function<BlockState, ConfiguredModel[]> mapper, Property<?>... ignored) {
|
||||
Set<PartialBlockstate> seen = new HashSet<>();
|
||||
for (BlockState fullState : owner.getStateContainer().getValidStates()) {
|
||||
Map<IProperty<?>, Comparable<?>> propertyValues = Maps.newLinkedHashMap(fullState.getValues());
|
||||
for (IProperty<?> p : ignored) {
|
||||
Map<Property<?>, Comparable<?>> propertyValues = Maps.newLinkedHashMap(fullState.getValues());
|
||||
for (Property<?> p : ignored) {
|
||||
propertyValues.remove(p);
|
||||
}
|
||||
PartialBlockstate partialState = new PartialBlockstate(owner, propertyValues, this);
|
||||
@@ -177,7 +177,7 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
|
||||
public static class PartialBlockstate implements Predicate<BlockState> {
|
||||
private final Block owner;
|
||||
private final SortedMap<IProperty<?>, Comparable<?>> setStates;
|
||||
private final SortedMap<Property<?>, Comparable<?>> setStates;
|
||||
@Nullable
|
||||
private final VariantBlockStateBuilder outerBuilder;
|
||||
|
||||
@@ -185,22 +185,22 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
this(owner, ImmutableMap.of(), outerBuilder);
|
||||
}
|
||||
|
||||
PartialBlockstate(Block owner, Map<IProperty<?>, Comparable<?>> setStates, @Nullable VariantBlockStateBuilder outerBuilder) {
|
||||
PartialBlockstate(Block owner, Map<Property<?>, Comparable<?>> setStates, @Nullable VariantBlockStateBuilder outerBuilder) {
|
||||
this.owner = owner;
|
||||
this.outerBuilder = outerBuilder;
|
||||
for (Map.Entry<IProperty<?>, Comparable<?>> entry : setStates.entrySet()) {
|
||||
IProperty<?> prop = entry.getKey();
|
||||
for (Map.Entry<Property<?>, Comparable<?>> entry : setStates.entrySet()) {
|
||||
Property<?> prop = entry.getKey();
|
||||
Comparable<?> value = entry.getValue();
|
||||
Preconditions.checkArgument(owner.getStateContainer().getProperties().contains(prop), "Property %s not found on block %s", entry, this.owner);
|
||||
Preconditions.checkArgument(prop.getAllowedValues().contains(value), "%s is not a valid value for %s", value, prop);
|
||||
}
|
||||
this.setStates = Maps.newTreeMap(Comparator.comparing(IProperty::getName));
|
||||
this.setStates = Maps.newTreeMap(Comparator.comparing(Property::getName));
|
||||
this.setStates.putAll(setStates);
|
||||
}
|
||||
|
||||
public <T extends Comparable<T>> PartialBlockstate with(IProperty<T> prop, T value) {
|
||||
public <T extends Comparable<T>> PartialBlockstate with(Property<T> prop, T value) {
|
||||
Preconditions.checkArgument(!setStates.containsKey(prop), "Property %s has already been set", prop);
|
||||
Map<IProperty<?>, Comparable<?>> newState = new HashMap<>(setStates);
|
||||
Map<Property<?>, Comparable<?>> newState = new HashMap<>(setStates);
|
||||
newState.put(prop, value);
|
||||
return new PartialBlockstate(owner, newState, outerBuilder);
|
||||
}
|
||||
@@ -281,7 +281,7 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
return owner;
|
||||
}
|
||||
|
||||
public SortedMap<IProperty<?>, Comparable<?>> getSetStates() {
|
||||
public SortedMap<Property<?>, Comparable<?>> getSetStates() {
|
||||
return setStates;
|
||||
}
|
||||
|
||||
@@ -290,7 +290,7 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
if (blockState.getBlock() != getOwner()) {
|
||||
return false;
|
||||
}
|
||||
for (Map.Entry<IProperty<?>, Comparable<?>> entry : setStates.entrySet()) {
|
||||
for (Map.Entry<Property<?>, Comparable<?>> entry : setStates.entrySet()) {
|
||||
if (blockState.get(entry.getKey()) != entry.getValue()) {
|
||||
return false;
|
||||
}
|
||||
@@ -301,13 +301,13 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder ret = new StringBuilder();
|
||||
for (Map.Entry<IProperty<?>, Comparable<?>> entry : setStates.entrySet()) {
|
||||
for (Map.Entry<Property<?>, Comparable<?>> entry : setStates.entrySet()) {
|
||||
if (ret.length() > 0) {
|
||||
ret.append(',');
|
||||
}
|
||||
ret.append(entry.getKey().getName())
|
||||
.append('=')
|
||||
.append(((IProperty) entry.getKey()).getName(entry.getValue()));
|
||||
.append(((Property) entry.getKey()).getName(entry.getValue()));
|
||||
}
|
||||
return ret.toString();
|
||||
}
|
||||
@@ -316,10 +316,10 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate {
|
||||
public static Comparator<PartialBlockstate> comparingByProperties() {
|
||||
// Sort variants inversely by property values, to approximate vanilla style
|
||||
return (s1, s2) -> {
|
||||
SortedSet<IProperty<?>> propUniverse = new TreeSet<>(s1.getSetStates().comparator().reversed());
|
||||
SortedSet<Property<?>> propUniverse = new TreeSet<>(s1.getSetStates().comparator().reversed());
|
||||
propUniverse.addAll(s1.getSetStates().keySet());
|
||||
propUniverse.addAll(s2.getSetStates().keySet());
|
||||
for (IProperty<?> prop : propUniverse) {
|
||||
for (Property<?> prop : propUniverse) {
|
||||
Comparable val1 = s1.getSetStates().get(prop);
|
||||
Comparable val2 = s2.getSetStates().get(prop);
|
||||
if (val1 == null && val2 != null) {
|
||||
|
||||
@@ -45,7 +45,7 @@ public interface IModelGeometry<T extends IModelGeometry<T>>
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation);
|
||||
IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation);
|
||||
|
||||
Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
|
||||
Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
|
||||
}
|
||||
@@ -22,8 +22,8 @@ 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.Material;
|
||||
import net.minecraft.client.renderer.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.model.RenderMaterial;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.IModelBuilder;
|
||||
@@ -38,9 +38,9 @@ public interface IModelGeometryPart
|
||||
{
|
||||
String name();
|
||||
|
||||
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation);
|
||||
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation);
|
||||
|
||||
default Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
|
||||
default Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
|
||||
// No texture dependencies
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@@ -23,8 +23,8 @@ 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.Material;
|
||||
import net.minecraft.client.renderer.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.model.RenderMaterial;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.IModelBuilder;
|
||||
@@ -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<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
default void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
getParts().stream().filter(part -> owner.getPartVisibility(part))
|
||||
.forEach(part -> part.addQuads(owner, modelBuilder, bakery, spriteGetter, modelTransform, modelLocation));
|
||||
}
|
||||
|
||||
@Override
|
||||
default Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
default Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
Set<Material> combined = Sets.newHashSet();
|
||||
Set<RenderMaterial> combined = Sets.newHashSet();
|
||||
for (IModelGeometryPart part : getParts())
|
||||
combined.addAll(part.getTextures(owner, modelGetter, missingTextureErrors));
|
||||
return combined;
|
||||
|
||||
@@ -33,7 +33,7 @@ import java.util.function.Function;
|
||||
public interface ISimpleModelGeometry<T extends ISimpleModelGeometry<T>> extends IModelGeometry<T>
|
||||
{
|
||||
@Override
|
||||
default IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
default IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
|
||||
{
|
||||
TextureAtlasSprite particle = spriteGetter.apply(owner.resolveTexture("particle"));
|
||||
|
||||
@@ -44,8 +44,8 @@ public interface ISimpleModelGeometry<T extends ISimpleModelGeometry<T>> extends
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation);
|
||||
void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation);
|
||||
|
||||
@Override
|
||||
Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
|
||||
Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors);
|
||||
}
|
||||
@@ -21,7 +21,7 @@ package net.minecraftforge.client.model.obj;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import joptsimple.internal.Strings;
|
||||
import net.minecraft.client.renderer.Vector4f;
|
||||
import net.minecraft.util.math.vector.Vector4f;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
@@ -24,16 +24,16 @@ 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.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.Vector4f;
|
||||
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.Vec2f;
|
||||
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 net.minecraftforge.client.model.*;
|
||||
import net.minecraftforge.client.model.geometry.IModelGeometryPart;
|
||||
import net.minecraftforge.client.model.geometry.IMultipartModelGeometry;
|
||||
@@ -52,17 +52,17 @@ import java.util.stream.Collectors;
|
||||
public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
{
|
||||
private static Vector4f COLOR_WHITE = new Vector4f(1, 1, 1, 1);
|
||||
private static Vec2f[] DEFAULT_COORDS = {
|
||||
new Vec2f(0, 0),
|
||||
new Vec2f(0, 1),
|
||||
new Vec2f(1, 1),
|
||||
new Vec2f(1, 0),
|
||||
private static Vector2f[] DEFAULT_COORDS = {
|
||||
new Vector2f(0, 0),
|
||||
new Vector2f(0, 1),
|
||||
new Vector2f(1, 1),
|
||||
new Vector2f(1, 0),
|
||||
};
|
||||
|
||||
private final Map<String, ModelGroup> parts = Maps.newHashMap();
|
||||
|
||||
private final List<Vector3f> positions = Lists.newArrayList();
|
||||
private final List<Vec2f> texCoords = Lists.newArrayList();
|
||||
private final List<Vector2f> texCoords = Lists.newArrayList();
|
||||
private final List<Vector3f> normals = Lists.newArrayList();
|
||||
private final List<Vector4f> colors = Lists.newArrayList();
|
||||
|
||||
@@ -296,12 +296,12 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
}
|
||||
}
|
||||
|
||||
public static Vec2f parseVector2(String[] line)
|
||||
public static Vector2f parseVector2(String[] line)
|
||||
{
|
||||
switch (line.length) {
|
||||
case 1: return new Vec2f(0,0);
|
||||
case 2: return new Vec2f(Float.parseFloat(line[1]), 0);
|
||||
default: return new Vec2f(Float.parseFloat(line[1]), Float.parseFloat(line[2]));
|
||||
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]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -366,11 +366,11 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
|
||||
builder.setQuadTint(tintIndex);
|
||||
|
||||
Vec2f uv2 = new Vec2f(0, 0);
|
||||
Vector2f uv2 = new Vector2f(0, 0);
|
||||
if (ambientToFullbright)
|
||||
{
|
||||
int fakeLight = (int) ((ambientColor.getX() + ambientColor.getY() + ambientColor.getZ()) * 15 / 3.0f);
|
||||
uv2 = new Vec2f((fakeLight << 4) / 32767.0f, (fakeLight << 4) / 32767.0f);
|
||||
uv2 = new Vector2f((fakeLight << 4) / 32767.0f, (fakeLight << 4) / 32767.0f);
|
||||
builder.setApplyDiffuseLighting(fakeLight == 0);
|
||||
}
|
||||
else
|
||||
@@ -387,7 +387,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
int[] index = indices[Math.min(i,indices.length-1)];
|
||||
Vector3f pos0 = positions.get(index[0]);
|
||||
Vector4f position = new Vector4f(pos0);
|
||||
Vec2f texCoord = index.length >= 2 && texCoords.size() > 0 ? texCoords.get(index[1]) : DEFAULT_COORDS[i];
|
||||
Vector2f 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;
|
||||
@@ -465,7 +465,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
return Pair.of(builder.build(), cull);
|
||||
}
|
||||
|
||||
private void putVertexData(IVertexConsumer consumer, Vector4f position0, Vec2f texCoord0, Vector3f normal0, Vector4f color0, Vec2f uv2, TextureAtlasSprite texture)
|
||||
private void putVertexData(IVertexConsumer consumer, Vector4f position0, Vector2f texCoord0, Vector3f normal0, Vector4f color0, Vector2f uv2, TextureAtlasSprite texture)
|
||||
{
|
||||
ImmutableList<VertexFormatElement> elements = consumer.getVertexFormat().getElements();
|
||||
for(int j=0;j<elements.size();j++)
|
||||
@@ -524,7 +524,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
for(ModelMesh mesh : meshes)
|
||||
{
|
||||
@@ -547,7 +547,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
return meshes.stream().map(mesh -> ModelLoaderRegistry.resolveTexture(mesh.mat.diffuseColorMap, owner)).collect(Collectors.toSet());
|
||||
}
|
||||
@@ -568,7 +568,7 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
|
||||
{
|
||||
super.addQuads(owner, modelBuilder, bakery, spriteGetter, modelTransform, modelLocation);
|
||||
|
||||
@@ -577,9 +577,9 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<com.mojang.datafixers.util.Pair<String, String>> missingTextureErrors)
|
||||
{
|
||||
Set<Material> combined = Sets.newHashSet();
|
||||
Set<RenderMaterial> combined = Sets.newHashSet();
|
||||
combined.addAll(super.getTextures(owner, modelGetter, missingTextureErrors));
|
||||
for (IModelGeometryPart part : getParts())
|
||||
combined.addAll(part.getTextures(owner, modelGetter, missingTextureErrors));
|
||||
|
||||
@@ -27,16 +27,16 @@ 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.Vec3d;
|
||||
import net.minecraft.util.math.shapes.VoxelShapes;
|
||||
import net.minecraft.world.ILightReader;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.world.IBlockDisplayReader;
|
||||
|
||||
public class BlockInfo
|
||||
{
|
||||
private static final Direction[] SIDES = Direction.values();
|
||||
|
||||
private final BlockColors colors;
|
||||
private ILightReader world;
|
||||
private IBlockDisplayReader world;
|
||||
private BlockState state;
|
||||
private BlockPos blockPos;
|
||||
|
||||
@@ -71,13 +71,13 @@ public class BlockInfo
|
||||
|
||||
public void updateShift()
|
||||
{
|
||||
Vec3d offset = state.getOffset(world, blockPos);
|
||||
Vector3d offset = state.getOffset(world, blockPos);
|
||||
shx = (float) offset.x;
|
||||
shy = (float) offset.y;
|
||||
shz = (float) offset.z;
|
||||
}
|
||||
|
||||
public void setWorld(ILightReader world)
|
||||
public void setWorld(IBlockDisplayReader world)
|
||||
{
|
||||
this.world = world;
|
||||
cachedTint = -1;
|
||||
@@ -206,7 +206,7 @@ public class BlockInfo
|
||||
}
|
||||
}
|
||||
|
||||
public ILightReader getWorld()
|
||||
public IBlockDisplayReader getWorld()
|
||||
{
|
||||
return world;
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ 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.ILightReader;
|
||||
import net.minecraft.world.IBlockDisplayReader;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
import net.minecraftforge.common.ForgeConfig;
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderModelFlat(ILightReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
|
||||
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)
|
||||
{
|
||||
if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
|
||||
{
|
||||
@@ -71,7 +71,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderModelSmooth(ILightReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random rand, long seed, int combinedOverlayIn, IModelData modelData)
|
||||
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)
|
||||
{
|
||||
if(ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.get())
|
||||
{
|
||||
@@ -90,7 +90,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean render(VertexLighterFlat lighter, ILightReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, boolean checkSides, Random rand, long seed, IModelData 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)
|
||||
{
|
||||
lighter.setWorld(world);
|
||||
lighter.setState(state);
|
||||
|
||||
@@ -93,7 +93,7 @@ public class LightUtil
|
||||
{
|
||||
consumer.setQuadTint(quad.getTintIndex());
|
||||
}
|
||||
consumer.setApplyDiffuseLighting(quad.shouldApplyDiffuseLighting());
|
||||
consumer.setApplyDiffuseLighting(quad.func_239287_f_());
|
||||
float[] data = new float[4];
|
||||
VertexFormat formatFrom = consumer.getVertexFormat();
|
||||
VertexFormat formatTo = DefaultVertexFormats.BLOCK;
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
|
||||
package net.minecraftforge.client.model.pipeline;
|
||||
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.Vector4f;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraft.util.math.vector.Vector4f;
|
||||
|
||||
public class TRSRTransformer extends VertexTransformer
|
||||
{
|
||||
|
||||
@@ -24,9 +24,7 @@ import com.google.common.collect.Lists;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.renderer.GameRenderer;
|
||||
import net.minecraft.client.renderer.LightTexture;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.color.BlockColors;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
@@ -34,8 +32,9 @@ 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.world.ILightReader;
|
||||
import net.minecraft.world.IWorldReader;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraft.util.math.vector.Vector4f;
|
||||
import net.minecraft.world.IBlockDisplayReader;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@@ -222,7 +221,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
|
||||
switch(element.getUsage())
|
||||
{
|
||||
case POSITION:
|
||||
final net.minecraft.client.renderer.Vector4f pos = new net.minecraft.client.renderer.Vector4f(
|
||||
final Vector4f pos = new Vector4f(
|
||||
position[v][0], position[v][1], position[v][2], 1);
|
||||
pos.transform(pose.getMatrix());
|
||||
|
||||
@@ -232,7 +231,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
|
||||
parent.put(e, position[v]);
|
||||
break;
|
||||
case NORMAL:
|
||||
final net.minecraft.client.renderer.Vector3f norm = new net.minecraft.client.renderer.Vector3f(normal[v]);
|
||||
final Vector3f norm = new Vector3f(normal[v]);
|
||||
norm.transform(pose.getNormal());
|
||||
|
||||
normal[v][0] = norm.getX();
|
||||
@@ -306,7 +305,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
|
||||
this.diffuse = diffuse;
|
||||
}
|
||||
|
||||
public void setWorld(ILightReader world)
|
||||
public void setWorld(IBlockDisplayReader world)
|
||||
{
|
||||
blockInfo.setWorld(world);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user