diff --git a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java index f9e30aa481..99bf62f023 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java @@ -104,8 +104,9 @@ public final class ItemLayerModel implements IModelGeometry 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(); diff --git a/src/test/resources/assets/new_model_loader_test/blockstates/obj_block.json b/src/test/resources/assets/new_model_loader_test/blockstates/obj_block.json deleted file mode 100644 index f09b752a5d..0000000000 --- a/src/test/resources/assets/new_model_loader_test/blockstates/obj_block.json +++ /dev/null @@ -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 } - } -} diff --git a/src/test/resources/assets/new_model_loader_test/models/block/obj_block.json b/src/test/resources/assets/new_model_loader_test/models/block/obj_block.json deleted file mode 100644 index 08465b0bad..0000000000 --- a/src/test/resources/assets/new_model_loader_test/models/block/obj_block.json +++ /dev/null @@ -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" - } -} diff --git a/src/test/resources/assets/new_model_loader_test/models/item/item_layers.json b/src/test/resources/assets/new_model_loader_test/models/item/item_layers.json deleted file mode 100644 index c052343d9b..0000000000 --- a/src/test/resources/assets/new_model_loader_test/models/item/item_layers.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "forge:item/default", - "loader": "forge:item-layers", - "textures": { - "layer0": "minecraft:item/coal", - "layer1": "minecraft:item/stick" - }, - "fullbright_layers": [ 1 ] -} \ No newline at end of file diff --git a/src/test/resources/assets/new_model_loader_test/models/item/separate_perspective.json b/src/test/resources/assets/new_model_loader_test/models/item/separate_perspective.json deleted file mode 100644 index df94f4e587..0000000000 --- a/src/test/resources/assets/new_model_loader_test/models/item/separate_perspective.json +++ /dev/null @@ -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" - } - } -} \ No newline at end of file diff --git a/src/test/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/test/resources/data/forge/loot_modifiers/global_loot_modifiers.json deleted file mode 100644 index 84c06361c2..0000000000 --- a/src/test/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "entries": [ - "global_loot_test:silk_touch_bamboo", - "global_loot_test:smelting", - "global_loot_test:wheat_harvest" - ] -} \ No newline at end of file diff --git a/src/test/resources/data/global_loot_test/loot_modifiers/smelting.json b/src/test/resources/data/global_loot_test/loot_modifiers/smelting.json deleted file mode 100644 index 09b17fd901..0000000000 --- a/src/test/resources/data/global_loot_test/loot_modifiers/smelting.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "global_loot_test:smelting", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "global_loot_test:smelt", - "levels": { - "min": 1 - } - } - ] - } - } - ] -} \ No newline at end of file diff --git a/src/test/resources/data/global_loot_test/loot_modifiers/wheat_harvest.json b/src/test/resources/data/global_loot_test/loot_modifiers/wheat_harvest.json deleted file mode 100644 index 4f2491ed2e..0000000000 --- a/src/test/resources/data/global_loot_test/loot_modifiers/wheat_harvest.json +++ /dev/null @@ -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" -} \ No newline at end of file