diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java index d7a92e9..fbc7550 100644 --- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java +++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java @@ -78,6 +78,7 @@ public class FamiliarHandlerClient { if(!ownerName.equals(player.getCommandSenderName())) continue; ItemStack stack = BaublesApi.getBaubles(player).getStackInSlot(0); + if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return; if(((ItemFamiliar) stack.getItem()).hasAspect(stack)) { ENTITY_WISP.setType(((ItemFamiliar) stack.getItem()).getAspect(stack).getTag()); ENTITY_WISP.ticksExisted = fam.dummyEntity.ticksExisted; diff --git a/src/main/resources/assets/gadomancy/textures/misc/Attack1.png b/src/main/resources/assets/gadomancy/textures/misc/Attack1.png new file mode 100644 index 0000000..ffa5b0c Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Attack1.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Attack2.png b/src/main/resources/assets/gadomancy/textures/misc/Attack2.png new file mode 100644 index 0000000..72ae4a2 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Attack2.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Attack3.png b/src/main/resources/assets/gadomancy/textures/misc/Attack3.png new file mode 100644 index 0000000..cd15a71 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Attack3.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Cooldown1.png b/src/main/resources/assets/gadomancy/textures/misc/Cooldown1.png new file mode 100644 index 0000000..b0f66b2 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Cooldown1.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Range1.png b/src/main/resources/assets/gadomancy/textures/misc/Range1.png new file mode 100644 index 0000000..93c8a5e Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Range1.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/category_icon.png b/src/main/resources/assets/gadomancy/textures/misc/category_icon.png new file mode 100644 index 0000000..702dd82 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/category_icon.png differ