diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java index ae857c3..d28616a 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java @@ -25,6 +25,7 @@ public class EternalSingularityItem extends Item implements IHaloRenderItem, ICo { private IIcon cosmicMask; private IIcon foregroundIcon; + private IIcon haloIcon; public EternalSingularityItem() { @@ -70,6 +71,7 @@ public class EternalSingularityItem extends Item implements IHaloRenderItem, ICo this.cosmicMask = ir.registerIcon("eternalsingularity:eternal_singularity_mask"); this.foregroundIcon = ir.registerIcon("eternalsingularity:eternal_singularity"); + this.haloIcon = ir.registerIcon("eternalsingularity:halofire"); } @Override @@ -99,12 +101,12 @@ public class EternalSingularityItem extends Item implements IHaloRenderItem, ICo @SideOnly(Side.CLIENT) public IIcon getHaloTexture(ItemStack paramItemStack) { - return ((ItemResource)LudicrousItems.resource).halo[0]; + return haloIcon; } @SideOnly(Side.CLIENT) public int getHaloSize(ItemStack paramItemStack) { - return 30; + return 20; } @SideOnly(Side.CLIENT) @@ -114,6 +116,6 @@ public class EternalSingularityItem extends Item implements IHaloRenderItem, ICo @SideOnly(Side.CLIENT) public int getHaloColour(ItemStack paramItemStack) { - return 0xFF20DB9A; + return 0xFFFFFFFF; } } \ No newline at end of file diff --git a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png index 8829d4d..267e3c7 100644 Binary files a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png and b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png differ diff --git a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png index 0202754..debe55c 100644 Binary files a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png and b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png differ diff --git a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png index c5ebce7..a905973 100644 Binary files a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png and b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png differ diff --git a/src/main/resources/assets/eternalsingularity/textures/items/halo.png b/src/main/resources/assets/eternalsingularity/textures/items/halo.png new file mode 100644 index 0000000..5c6f1c5 Binary files /dev/null and b/src/main/resources/assets/eternalsingularity/textures/items/halo.png differ diff --git a/src/main/resources/assets/eternalsingularity/textures/items/halofire.png b/src/main/resources/assets/eternalsingularity/textures/items/halofire.png new file mode 100644 index 0000000..71e6492 Binary files /dev/null and b/src/main/resources/assets/eternalsingularity/textures/items/halofire.png differ diff --git a/src/main/resources/assets/eternalsingularity/textures/items/halofire.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/halofire.png.mcmeta new file mode 100644 index 0000000..dd1bedb --- /dev/null +++ b/src/main/resources/assets/eternalsingularity/textures/items/halofire.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +}