keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix incorrect check for missing texture in DynamicBucketModel

Browse source
This commit is contained in:
tterrag 2020-01-04 23:50:17 -05:00
parent 90035ab084
commit 7c99b756f9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java
View file

@ -98,25 +98,25 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
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<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation)
{ {
Material particleLocation = owner.resolveTexture("particle"); Material particleLocation = owner.resolveTexture("particle");
if (MissingTextureSprite.getLocation().toString().equals(particleLocation)) if (MissingTextureSprite.getLocation().equals(particleLocation.func_229313_b_()))
{ {
particleLocation = null; particleLocation = null;
} }
Material baseLocation = owner.resolveTexture("base"); Material baseLocation = owner.resolveTexture("base");
if (MissingTextureSprite.getLocation().toString().equals(baseLocation)) if (MissingTextureSprite.getLocation().equals(baseLocation.func_229313_b_()))
{ {
baseLocation = null; baseLocation = null;
} }
Material fluidMaskLocation = owner.resolveTexture("fluid"); Material fluidMaskLocation = owner.resolveTexture("fluid");
if (MissingTextureSprite.getLocation().toString().equals(fluidMaskLocation)) if (MissingTextureSprite.getLocation().equals(fluidMaskLocation.func_229313_b_()))
{ {
fluidMaskLocation = null; fluidMaskLocation = null;
} }
Material coverLocation = owner.resolveTexture("cover"); Material coverLocation = owner.resolveTexture("cover");
if (!MissingTextureSprite.getLocation().toString().equals(coverLocation)) if (!MissingTextureSprite.getLocation().equals(coverLocation.func_229313_b_()))
{ {
// cover (the actual item around the other two) // cover (the actual item around the other two)
coverLocation = null; coverLocation = null;