[1.16.x] Fix all layers of ItemLayerModel being fullbright (#8040)

* Fix all layers of ItemLayerModel being fullbright

Backport of #8039

* Remove duplicate test resources

These resources have corresponding equivalents in the generated tests
resources folder.
This commit is contained in:
sciwhiz12 authored and GitHub committed 2021-08-31 17:34:46 +02:00
1 parent a2bd95ca39
commit c5725d1c61
8 files changed
+3 -88

No files matched your search

@@ -104,8 +104,9 @@ public final class ItemLayerModel implements IModelGeometry<ItemLayerModel>
for(int i = 0; i < textures.size(); i++)
{
TextureAtlasSprite tas = spriteGetter.apply(textures.get(i));
RenderType rt = getLayerRenderType(fullbrightLayers.contains(i));
builder.addQuads(rt, getQuadsForSprite(i, tas, transform, true));
boolean fullbright = fullbrightLayers.contains(i);
RenderType rt = getLayerRenderType(fullbright);
builder.addQuads(rt, getQuadsForSprite(i, tas, transform, fullbright));
}
return builder.build();
@@ -1,8 +0,0 @@
{
"variants": {
"facing=east": { "model": "new_model_loader_test:block/obj_block", "y": 90 },
"facing=west": { "model": "new_model_loader_test:block/obj_block", "y": 270 },
"facing=north": { "model": "new_model_loader_test:block/obj_block", "y": 0 },
"facing=south": { "model": "new_model_loader_test:block/obj_block", "y": 180 }
}
}
@@ -1,10 +0,0 @@
{
"parent": "forge:item/default",
"loader": "forge:obj",
"model": "new_model_loader_test:models/item/sugar_glider.obj",
"ambientToFullbright": true,
"textures": {
"qr": "minecraft:block/oak_planks",
"particle": "block/oak_planks"
}
}
@@ -1,9 +0,0 @@
{
"parent": "forge:item/default",
"loader": "forge:item-layers",
"textures": {
"layer0": "minecraft:item/coal",
"layer1": "minecraft:item/stick"
},
"fullbright_layers": [ 1 ]
}
@@ -1,15 +0,0 @@
{
"parent":"forge:item/default",
"loader":"forge:separate-perspective",
"base": {
"parent": "minecraft:item/coal"
},
"perspectives": {
"gui": {
"parent": "minecraft:item/snowball"
},
"first_person_left_hand": {
"parent": "minecraft:item/bone"
}
}
}
@@ -1,8 +0,0 @@
{
"replace": false,
"entries": [
"global_loot_test:silk_touch_bamboo",
"global_loot_test:smelting",
"global_loot_test:wheat_harvest"
]
}
@@ -1,18 +0,0 @@
{
"type": "global_loot_test:smelting",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "global_loot_test:smelt",
"levels": {
"min": 1
}
}
]
}
}
]
}
@@ -1,18 +0,0 @@
{
"type": "global_loot_test:wheat_harvest",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "block_state_property",
"block":"minecraft:wheat"
}
],
"seedItem": "minecraft:wheat_seeds",
"numSeeds": 3,
"replacement": "minecraft:wheat"
}