Update mappings

Signed-off-by: cpw <[email protected]>
This commit is contained in:
cpw committed 2019-06-08 10:45:28 -04:00
1 parent fc04a65a0f
commit 9fa4641cb0
46 files changed
+149 -141

No files matched your search

@@ -394,14 +394,14 @@ public final class ModelLoader extends ModelBakery
{
if(model.getParentLocation().getPath().equals("builtin/generated"))
{
model.parent = MODEL_GENERATED;
model.field_178315_d = field_177606_o;
}
else
{
IUnbakedModel parent = ModelLoaderRegistry.getModelOrLogError(model.getParentLocation(), "Could not load vanilla model parent '" + model.getParentLocation() + "' for '" + model);
if(parent instanceof VanillaModelWrapper)
{
model.parent = ((VanillaModelWrapper) parent).model;
model.field_178315_d = ((VanillaModelWrapper) parent).model;
}
else
{
@@ -412,7 +412,7 @@ public final class ModelLoader extends ModelBakery
ImmutableSet.Builder<ResourceLocation> builder = ImmutableSet.builder();
if(model == ModelBakery.MODEL_GENERATED)
if(model == ModelBakery.field_177606_o)
{
for(String s : ItemModelGenerator.LAYERS)
{
@@ -463,12 +463,12 @@ public final class ModelLoader extends ModelBakery
tMap.putAll(PerspectiveMapWrapper.getTransforms(state));
IModelState perState = new SimpleModelState(ImmutableMap.copyOf(tMap), state.apply(Optional.empty()));
if(model == ModelBakery.MODEL_GENERATED)
if(model == ModelBakery.field_177606_o)
{
return new ItemLayerModel(bakery, model, format).bake(bakery, bakedTextureGetter, new BasicState(perState, uvlock), format);
}
TextureAtlasSprite textureatlassprite = bakedTextureGetter.apply(new ResourceLocation(model.resolveTextureName("particle")));
if(model == ModelBakery.MODEL_ENTITY) return new BuiltInModel(transforms, model.getOverrides(bakery, model, bakedTextureGetter, format), textureatlassprite);
if(model == ModelBakery.field_177616_r) return new BuiltInModel(transforms, model.getOverrides(bakery, model, bakedTextureGetter, format), textureatlassprite);
return bakeNormal(bakery, model, perState, state, newTransforms, format, bakedTextureGetter, uvlock);
}
@@ -496,13 +496,13 @@ public final class ModelLoader extends ModelBakery
{
TextureAtlasSprite textureatlassprite1 = bakedTextureGetter.apply(new ResourceLocation(model.resolveTextureName(e.getValue().texture)));
if (e.getValue().cullFace == null || !TRSRTransformation.isInteger(transformation.getMatrixVec()))
if (e.getValue().field_178244_b == null || !TRSRTransformation.isInteger(transformation.getMatrixVec()))
{
builder.addGeneralQuad(BlockModel.makeBakedQuad(part, e.getValue(), textureatlassprite1, e.getKey(), new BasicState(transformation, uvLocked)));
}
else
{
builder.addFaceQuad(baseState.rotate(e.getValue().cullFace), BlockModel.makeBakedQuad(part, e.getValue(), textureatlassprite1, e.getKey(), new BasicState(transformation, uvLocked)));
builder.addFaceQuad(baseState.rotate(e.getValue().field_178244_b), BlockModel.makeBakedQuad(part, e.getValue(), textureatlassprite1, e.getKey(), new BasicState(transformation, uvLocked)));
}
}
}
@@ -546,7 +546,7 @@ public final class ModelLoader extends ModelBakery
Maps.newHashMap(this.model.textures), this.model.isAmbientOcclusion(), this.model.isGui3d(), //New Textures man VERY IMPORTANT
model.getAllTransforms(), Lists.newArrayList(model.getOverrides()));
newModel.name = this.model.name;
newModel.parent = this.model.parent;
newModel.field_178315_d = this.model.field_178315_d;
Set<String> removed = Sets.newHashSet();
@@ -603,7 +603,7 @@ public final class ModelLoader extends ModelBakery
return this;
}
BlockModel newModel = new BlockModel(model.getParentLocation(), model.getElements(), model.textures, value, model.isGui3d(), model.getAllTransforms(), Lists.newArrayList(model.getOverrides()));
newModel.parent = model.parent;
newModel.field_178315_d = model.field_178315_d;
newModel.name = model.name;
return new VanillaModelWrapper(location, newModel, uvlock, animation);
}
@@ -616,7 +616,7 @@ public final class ModelLoader extends ModelBakery
return this;
}
BlockModel newModel = new BlockModel(model.getParentLocation(), model.getElements(), model.textures, model.ambientOcclusion, value, model.getAllTransforms(), Lists.newArrayList(model.getOverrides()));
newModel.parent = model.parent;
newModel.field_178315_d = model.field_178315_d;
newModel.name = model.name;
return new VanillaModelWrapper(location, newModel, uvlock, animation);
}
@@ -139,4 +139,4 @@ public class AnimationModelBase<T extends Entity> extends Model implements IEven
@Override
public void handleEvents(T instance, float time, Iterable<Event> pastEvents) {}
}
*/
*/
@@ -125,7 +125,7 @@ public class BlockInfo
BlockPos pos = blockPos.add(x - 1, y - 1, z - 1);
BlockState state = world.getBlockState(pos);
t[x][y][z] = state.getOpacity(world, pos) < 15;
int brightness = state.func_215684_a(world, pos);
int brightness = state.getPackedLightmapCoords(world, pos);
s[x][y][z] = (brightness >> 0x14) & 0xF;
b[x][y][z] = (brightness >> 0x04) & 0xF;
ao[x][y][z] = state.func_215703_d(world, pos);
@@ -187,12 +187,12 @@ public class BlockInfo
public void updateFlatLighting()
{
full = Block.isOpaque(state.getCollisionShape(world, blockPos));
packed[0] = state.func_215684_a(world, blockPos);
packed[0] = state.getPackedLightmapCoords(world, blockPos);
for (Direction side : SIDES)
{
int i = side.ordinal() + 1;
packed[i] = state.func_215684_a(world, blockPos.offset(side));
packed[i] = state.getPackedLightmapCoords(world, blockPos.offset(side));
}
}
@@ -36,7 +36,7 @@ public class VertexBufferConsumer implements IVertexConsumer
private BufferBuilder renderer;
private int[] quadData;
private int v = 0;
private BlockPos offset = BlockPos.ORIGIN;
private BlockPos offset = BlockPos.ZERO;
public VertexBufferConsumer() {}