diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java index 094e04a54..7c335c214 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import javax.annotation.Nullable; @@ -23,6 +24,8 @@ public class ItemSecurityCard extends ItemBase { super("security_card"); setMaxStackSize(1); + + addPropertyOverride(new ResourceLocation("active"), (stack, world, entity) -> (entity != null && isValid(stack)) ? 1.0f : 0.0f); } @Override @@ -66,6 +69,10 @@ public class ItemSecurityCard extends ItemBase { stack.getTagCompound().setBoolean(String.format(NBT_PERMISSION, permission.getId()), state); } + public static boolean isValid(ItemStack stack) { + return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_OWNER); + } + @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); diff --git a/src/main/resources/assets/refinedstorage/models/item/security_card.json b/src/main/resources/assets/refinedstorage/models/item/security_card.json index 6cc78ce4a..8d4957b37 100755 --- a/src/main/resources/assets/refinedstorage/models/item/security_card.json +++ b/src/main/resources/assets/refinedstorage/models/item/security_card.json @@ -1,6 +1,21 @@ + { "parent": "item/generated", "textures": { - "layer0": "refinedstorage:items/security_card" - } + "layer0": "refinedstorage:items/security_card_inactive" + }, + "overrides": [ + { + "predicate": { + "active": 0 + }, + "model": "refinedstorage:item/security_card_inactive" + }, + { + "predicate": { + "active": 1 + }, + "model": "refinedstorage:item/security_card_active" + } + ] } diff --git a/src/main/resources/assets/refinedstorage/models/item/security_card_active.json b/src/main/resources/assets/refinedstorage/models/item/security_card_active.json new file mode 100644 index 000000000..cda273956 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/security_card_active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/security_card_active" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/security_card_inactive.json b/src/main/resources/assets/refinedstorage/models/item/security_card_inactive.json new file mode 100644 index 000000000..105b9ed39 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/security_card_inactive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/security_card_inactive" + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected.png index 3a7899010..99fa21aa3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180.png index 87709d925..f9168e6dc 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270.png index cce7fd60f..36c15bc35 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90.png index 6d919ab48..8750b1ab8 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_alt.png deleted file mode 100755 index 4df9cbdc6..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_alt.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected_alt.png deleted file mode 100755 index a91a54811..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected_alt.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_alt.png deleted file mode 100755 index eb1e92759..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_alt.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png b/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png index 02b15cbae..b5b208878 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png and b/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png index 6843018c5..bd9fe3393 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png and b/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/security_card.png b/src/main/resources/assets/refinedstorage/textures/items/security_card.png deleted file mode 100755 index 7e6a6297a..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/items/security_card.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/security_card_active.png b/src/main/resources/assets/refinedstorage/textures/items/security_card_active.png new file mode 100644 index 000000000..2e5f4df53 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/security_card_active.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/security_card_inactive.png b/src/main/resources/assets/refinedstorage/textures/items/security_card_inactive.png new file mode 100644 index 000000000..9685e127e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/security_card_inactive.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_connected.png index 2e89d47c9..b81925a53 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_connected.png and b/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_disconnected.png index bf0e4cadb..37f4251fd 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/items/wireless_fluid_grid_disconnected.png differ