1.15.2 Initial Update

This commit is contained in:
LexManos committed 2020-01-22 13:44:03 -08:00
1 parent 0bcc2e3fbd
commit c4e000dbe7
44 files changed
+349 -299

No files matched your search

@@ -61,6 +61,7 @@ public class BakedItemModel implements IBakedModel
@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 particle; }
@Override public ItemOverrideList getOverrides() { return overrides; }
@@ -69,6 +69,12 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
return originalModel.isGui3d();
}
@Override
public boolean func_230044_c_()
{
return originalModel.func_230044_c_();
}
@Override
public boolean isBuiltInRenderer()
{
@@ -106,7 +106,7 @@ public class BlockModelConfiguration implements IModelConfiguration
@Override
public boolean isShadedInGui() {
return owner.isGui3d();
return owner.func_230176_c_() == BlockModel.GuiLight.SIDE;
}
@Override
@@ -89,6 +89,13 @@ public class CompositeModel implements IDynamicBakedModel
return isGui3d;
}
@Override
public boolean func_230044_c_()
{
// TODO: Forge: Auto-generated method stub
return false;
}
@Override
public boolean isBuiltInRenderer()
{
@@ -177,6 +177,9 @@ final class FancyMissingModel implements IUnbakedModel
@Override
public boolean isGui3d() { return false; }
@Override
public boolean func_230044_c_() { return false; } // TODO: Forge: Auto-generated method stub
@Override
public boolean isBuiltInRenderer() { return false; }
@@ -439,6 +439,13 @@ public final class FluidModel implements IModelGeometry<FluidModel>
return false;
}
@Override
public boolean func_230044_c_()
{
// TODO: Forge: Auto-generated method stub
return false;
}
@Override
public boolean isBuiltInRenderer()
{
@@ -211,28 +211,21 @@ public class ModelLoaderRegistry
}
}
public static IBakedModel bakeHelper(BlockModel blockModel, ModelBakery modelBakery, BlockModel otherModel, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public static IBakedModel bakeHelper(BlockModel blockModel, ModelBakery modelBakery, BlockModel otherModel, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation, boolean guiLight3d)
{
IBakedModel model;
IModelGeometry<?> customModel = blockModel.customData.getCustomGeometry();
IModelTransform customModelState = blockModel.customData.getCustomModelState();
if (customModelState != null)
{
modelTransform = new ModelTransformComposition(customModelState, modelTransform, modelTransform.isUvLock());
}
if (customModel != null)
{
model = customModel.bake(blockModel.customData, modelBakery, spriteGetter, modelTransform, blockModel.getOverrides(modelBakery, otherModel, spriteGetter), modelLocation);
}
else
{
model = blockModel.bakeVanilla(modelBakery, otherModel, spriteGetter, modelTransform, modelLocation);
}
model = blockModel.bakeVanilla(modelBakery, otherModel, spriteGetter, modelTransform, modelLocation, guiLight3d);
if (customModelState != null && !model.doesHandlePerspectives())
{
model = new PerspectiveMapWrapper(model, customModelState);
}
return model;
}
@@ -164,6 +164,13 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
return gui3d;
}
@Override
public boolean func_230044_c_()
{
// TODO: Forge: Auto-generated method stub
return false;
}
@Override
public boolean isBuiltInRenderer()
{
@@ -224,4 +231,4 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
return new MultiLayerModel(models);
}
}
}
}
@@ -127,6 +127,7 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
@Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); }
@Override public boolean isAmbientOcclusion(BlockState state) { return parent.isAmbientOcclusion(state); }
@Override public boolean isGui3d() { return parent.isGui3d(); }
@Override public boolean func_230044_c_() { return parent.func_230044_c_(); }
@Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
@Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); }
@SuppressWarnings("deprecation")
@@ -794,6 +794,13 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
return gui3d;
}
@Override
public boolean func_230044_c_()
{
// TODO: Forge: Auto-generated method stub
return false;
}
@Override
public boolean isBuiltInRenderer()
{