From bb138326dfeac74253ff5d91046f220e4dfa87b8 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sat, 25 May 2019 09:28:15 +0100 Subject: [PATCH] Use correct model for blinking pocket computers Fixes #211211211211211211211211211211211211211211211211211211211211211 --- .../models/item/pocket_computer_colour.json | 12 +----------- .../models/item/pocket_computer_normal.json | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json index dac87f7af..a0fb13727 100644 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json @@ -3,15 +3,5 @@ "textures": { "layer0": "computercraft:item/pocket_computer_frame", "layer1": "computercraft:item/pocket_computer_colour" - }, - "overrides": [ - { - "predicate": { "computercraft:computer_state": 1 }, - "model": "computercraft:item/pocket_computer_colour_on" - }, - { - "predicate": { "computercraft:computer_state": 2 }, - "model": "computercraft:item/pocket_computer_colour_blinking" - } - ] + } } diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_normal.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal.json index 10e5e132b..3e4c8b864 100644 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer_normal.json +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal.json @@ -14,7 +14,7 @@ "predicate": { "computercraft:state": 1, "computercraft:coloured": 0 } }, { - "model": "computercraft:item/pocket_computer_advanced_blinking", + "model": "computercraft:item/pocket_computer_normal_blinking", "predicate": { "computercraft:state": 2, "computercraft:coloured": 0 } },