From 1cc7e9a649b582a331f13f2befd690088ec465ab Mon Sep 17 00:00:00 2001 From: RCXcrafter Date: Wed, 9 Nov 2016 18:07:09 +0100 Subject: [PATCH] Wip combined singularity things --- .../item/CombinedSingularityItem.java | 124 ++++++++++++++++++ .../{ => item}/EternalSingularityItem.java | 2 +- .../eternalsingularity/proxy/ClientProxy.java | 7 +- .../eternalsingularity/proxy/CommonProxy.java | 4 +- .../assets/eternalsingularity/lang/en_US.lang | 84 +++++++++++- .../textures/items/combined_singularity.png | Bin 0 -> 1778 bytes .../items/combined_singularity.png.mcmeta | 5 + .../textures/items/combined_singularity2.png | Bin 0 -> 1508 bytes .../items/combined_singularity2.png.mcmeta | 5 + .../items/combined_singularity_mask.png | Bin 0 -> 215 bytes 10 files changed, 226 insertions(+), 5 deletions(-) create mode 100644 src/main/java/singulariteam/eternalsingularity/item/CombinedSingularityItem.java rename src/main/java/singulariteam/eternalsingularity/{ => item}/EternalSingularityItem.java (98%) create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/combined_singularity.png create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/combined_singularity.png.mcmeta create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/combined_singularity2.png create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/combined_singularity2.png.mcmeta create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_mask.png diff --git a/src/main/java/singulariteam/eternalsingularity/item/CombinedSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/item/CombinedSingularityItem.java new file mode 100644 index 0000000..81873a9 --- /dev/null +++ b/src/main/java/singulariteam/eternalsingularity/item/CombinedSingularityItem.java @@ -0,0 +1,124 @@ +package singulariteam.eternalsingularity.item; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.items.ItemResource; +import fox.spiteful.avaritia.items.LudicrousItems; +import fox.spiteful.avaritia.render.ICosmicRenderItem; +import fox.spiteful.avaritia.render.IHaloRenderItem; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +public class CombinedSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem +{ + public static final CombinedSingularityItem instance = new CombinedSingularityItem(); + + public static final int[] types = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 , 11, 12, 13, 14, 15}; + + private IIcon cosmicMask; + private IIcon foregroundIcon; + + private CombinedSingularityItem() + { + super(); + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(Avaritia.tab); + setTextureName("eternalsingularity:combined_singularity2"); + } + + public EnumRarity getRarity(ItemStack stack) + { + return EnumRarity.uncommon; + } + + @Override + public String getUnlocalizedName(final ItemStack stack) + { + int i = MathHelper.clamp_int(stack.getItemDamage(), 0, types.length); + return "item.combined.singularity." + types[i]; + } + + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) + { + for (int j = 0; j < types.length; j++) { + list.add(new ItemStack(item, 1, j)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getMaskTexture(ItemStack stack, EntityPlayer player) + { + return cosmicMask; + } + + @Override + @SideOnly(Side.CLIENT) + public float getMaskMultiplier(ItemStack stack, EntityPlayer player) + { + return 1.0f; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister ir) + { + super.registerIcons(ir); + this.cosmicMask = ir.registerIcon("eternalsingularity:combined_singularity_mask"); + this.foregroundIcon = ir.registerIcon("eternalsingularity:combined_singularity"); + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) + { + return pass == 1 ? foregroundIcon : super.getIcon(stack, pass); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean requiresMultipleRenderPasses() + { + return true; + } + + @SideOnly(Side.CLIENT) + public boolean drawHalo(ItemStack paramItemStack) + { + return true; + } + + @SideOnly(Side.CLIENT) + public IIcon getHaloTexture(ItemStack paramItemStack) + { + return ((ItemResource) LudicrousItems.resource).halo[0]; + } + + @SideOnly(Side.CLIENT) + public int getHaloSize(ItemStack paramItemStack) + { + return 4; + } + + @SideOnly(Side.CLIENT) + public boolean drawPulseEffect(ItemStack paramItemStack) + { + return false; + } + + @SideOnly(Side.CLIENT) + public int getHaloColour(ItemStack paramItemStack) + { + return -16777216; + } +} \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/item/EternalSingularityItem.java similarity index 98% rename from src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java rename to src/main/java/singulariteam/eternalsingularity/item/EternalSingularityItem.java index 098ddb9..a8a5c57 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java +++ b/src/main/java/singulariteam/eternalsingularity/item/EternalSingularityItem.java @@ -1,4 +1,4 @@ -package singulariteam.eternalsingularity; +package singulariteam.eternalsingularity.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java index 5a4c9eb..4350452 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java @@ -1,7 +1,8 @@ package singulariteam.eternalsingularity.proxy; import net.minecraftforge.client.MinecraftForgeClient; -import singulariteam.eternalsingularity.EternalSingularityItem; +import singulariteam.eternalsingularity.item.CombinedSingularityItem; +import singulariteam.eternalsingularity.item.EternalSingularityItem; import singulariteam.eternalsingularity.render.EternalItemRenderer; public final class ClientProxy extends CommonProxy @@ -9,6 +10,8 @@ public final class ClientProxy extends CommonProxy @Override public void init() { - MinecraftForgeClient.registerItemRenderer(EternalSingularityItem.instance, new EternalItemRenderer()); + EternalItemRenderer fancies = new EternalItemRenderer(); + MinecraftForgeClient.registerItemRenderer(EternalSingularityItem.instance, fancies); + MinecraftForgeClient.registerItemRenderer(CombinedSingularityItem.instance, fancies); } } diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java index 986de0c..af6f780 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -7,8 +7,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.oredict.ShapelessOreRecipe; -import singulariteam.eternalsingularity.EternalSingularityItem; import singulariteam.eternalsingularity.EternalSingularityMod; +import singulariteam.eternalsingularity.item.CombinedSingularityItem; +import singulariteam.eternalsingularity.item.EternalSingularityItem; import java.io.File; import java.util.*; @@ -41,6 +42,7 @@ public class CommonProxy } } GameRegistry.registerItem(EternalSingularityItem.instance, "eternal_singularity"); + GameRegistry.registerItem(CombinedSingularityItem.instance, "combined_singularity"); } public void init() {} diff --git a/src/main/resources/assets/eternalsingularity/lang/en_US.lang b/src/main/resources/assets/eternalsingularity/lang/en_US.lang index f99e9e9..0a60c80 100644 --- a/src/main/resources/assets/eternalsingularity/lang/en_US.lang +++ b/src/main/resources/assets/eternalsingularity/lang/en_US.lang @@ -5,4 +5,86 @@ //Eternal Singularity - OMG item.eternal.singularity.name=Eternal Singularity -//Eternal Singularity - OMG \ No newline at end of file +//Eternal Singularity - OMG + +item.combined.singularity.0.name=Combined Singularity +item.combined.singularity.1.name=Hyper Singularity +item.combined.singularity.2.name=Nitronic Singularity +item.combined.singularity.3.name=Scientific Singularity +item.combined.singularity.4.name=Quadratic Singularity +item.combined.singularity.5.name=Quantum Singularity +item.combined.singularity.6.name=Sonic Singularity +item.combined.singularity.7.name=Explodic Singularity +item.combined.singularity.8.name=Supercalifragilistic Singularity +item.combined.singularity.9.name=Idiotic Singularity +item.combined.singularity.10.name=Ridiculous Singularity +item.combined.singularity.11.name=Singular Singularity +item.combined.singularity.12.name=Bionic Singularity +item.combined.singularity.13.name=Humungous Singularity +item.combined.singularity.14.name=Delicious Singularity +item.combined.singularity.15.name=Baronic Singularity +item.combined.singularity.16.name=Psychotic Singularity +item.combined.singularity.17.name=Specific Singularity +item.combined.singularity.18.name=Awesome Singularity +item.combined.singularity.19.name=Gracious Singularity +item.combined.singularity.20.name=Natural Singularity +item.combined.singularity.21.name=Meteoric Singularity +item.combined.singularity.22.name=Historic Singularity +item.combined.singularity.23.name=Amazing Singularity +item.combined.singularity.24.name=Annual Singularity +item.combined.singularity.25.name=Pacific Singularity +item.combined.singularity.26.name=Aromatic Singularity +item.combined.singularity.27.name=Origamic Singularity +item.combined.singularity.28.name=Smelly Singularity +item.combined.singularity.29.name=Sphagettic Singularity +item.combined.singularity.30.name=Macaronic Singularity +item.combined.singularity.31.name=Robotic Singularity +item.combined.singularity.32.name=Rhubarbic Singularity +item.combined.singularity.33.name=Metric Singularity +item.combined.singularity.34.name=Magical Singularity +item.combined.singularity.35.name=Strategic Singularity +item.combined.singularity.36.name=Bananular Singularity +item.combined.singularity.37.name=Ironic Singularity +item.combined.singularity.38.name=Fantastic Singularity +item.combined.singularity.39.name=Archanic Singularity +item.combined.singularity.40.name=Pneumatic Singularity +item.combined.singularity.41.name=Electric Singularity +item.combined.singularity.42.name=Angelic Singularity +item.combined.singularity.43.name=Chronic Singularity +item.combined.singularity.44.name=Chemical Singularity +item.combined.singularity.45.name=Thermionic Singularity +item.combined.singularity.46.name=Protonic Singularity +item.combined.singularity.47.name=Velconic Singularity +item.combined.singularity.48.name=Cyanic Singularity +item.combined.singularity.49.name=Radial Singularity +item.combined.singularity.50.name=Implodic Singularity +item.combined.singularity.51.name=Platonic Singularity +item.combined.singularity.52.name=Hydrolic Singularity +item.combined.singularity.53.name=Prismatic Singularity +item.combined.singularity.54.name=Magnetic Singularity +item.combined.singularity.55.name=Traxonic Singularity +item.combined.singularity.56.name=Cyclonic Singularity +item.combined.singularity.57.name=Cubic Singularity +item.combined.singularity.58.name=Technical Singularity +item.combined.singularity.59.name=Astronomic Singularity +item.combined.singularity.60.name=Flambonic Singularity +item.combined.singularity.61.name=Gastronomic Singularity +item.combined.singularity.62.name=Galactic Singularity +item.combined.singularity.63.name=Cryptic Singularity +item.combined.singularity.64.name=Analytic Singularity +item.combined.singularity.65.name=Antique Singularity +item.combined.singularity.66.name=Chromatic Singularity +item.combined.singularity.67.name=Octagonal Singularity +item.combined.singularity.68.name=Majoric Singularity +item.combined.singularity.69.name=Terrific Singularity +item.combined.singularity.70.name=Intrinsic Singularity +item.combined.singularity.71.name=Celestial Singularity +item.combined.singularity.72.name=Automatic Singularity +item.combined.singularity.73.name=Tartaric Singularity +item.combined.singularity.74.name=Magnificent Singularity +item.combined.singularity.75.name=Mathematic Singularity +item.combined.singularity.76.name= Singularity +item.combined.singularity.77.name= Singularity +item.combined.singularity.78.name= Singularity +item.combined.singularity.79.name=Cosmic Singularity +item.combined.singularity.80.name=Impossible Singularity diff --git a/src/main/resources/assets/eternalsingularity/textures/items/combined_singularity.png b/src/main/resources/assets/eternalsingularity/textures/items/combined_singularity.png new file mode 100644 index 0000000000000000000000000000000000000000..a9175c51a08d1446ca5cab03eb03039fa1532958 GIT binary patch literal 1778 zcmeH{`7;~_9L3)rS@#hHX)1IynxyJXr&v+SitV^b;)qzYA#TbF6~~Hkgrq{;XCgt+ zXt0T6p^! z0XB)SOM-ne9IxYS3eKg%=?0u{!sRDiNQ2ugxTk}W0gu~YX5vy7ys~jQ2j02x&4XV) z{0k6Rh@c|;P>hfggx$rJQiR__WErB$5nX|p2Vhqst_leckyL}!THL5Z8V4CqaJvCn zjmU07PBZej$bX8078JFjxD9vOQQCpBE>!lSx(|o;^yqvtjHX3#&2fjPXG$H*H@yv3_!%&lVKFD$NMX&t;xtZZR*2W#)J{vLnxvAMh7 z!~gpD8u)61xdafvvbT2F`?v*%Z6U#KKqT10ITR3+**9TyCWbEv53^`aEQcU3R=7uq zCxShE0$Cb?o-CD98d@6KI;Ld5KL8??Zf4@BXH%Bx7d~n%o%k7}`byrRT>^{CQJh!P7NXqGBO}7t_qo^;Nfqzic>DVoBtW-zZdcV&J#pe7X?QaNr@sLT}gt@u~@ znC)EWR*o_IGV1Ul{ZiaWKznG!*D9GlgoD9HA1_RmyNQq1uKJ%g>N3*li#`6BAECE6 zCbTA!%1!LoEiaFfhIfb6@G@mGccVqqc<#rLHCp9RDDOdpnS{`+M+t>(MR#SKqe!L& z`Uw5*9=H63sEKN+7Hgd*J>Ij%D^lC$4(pKzpO5KpF43TU)lyD=n_xIcU`lb zw20Ss$>*a@+D>?G_QZ&HZ5BS)9DLF}Uvz-q?`#>aKCGpztK{FAz|e|_j#HhAS1=hC q{zh4*_lPOgu$B7x`f(1C^Fcz}CxvUNoLsU$L3En6S6Lo)-z&;LOB zB?CjL0RzLU1O^7H84L{K`IF+0x-l>?GX(gAxB~So5@lE<#;`$~VXp(j=?I1!g$ytH z*uJge{(n;N|7&ref>AIU0>d=~O20|xF)%PPlmz(&{~y_aA^1Bxu-staEbxddW?U0?ux|!X5g}2a@MAPw$tC2CO0_w*4}dFT-~!aF=X+CovXMuyr_C{ zPSl}$=AE|ly9AB>7YRjZ@+@8%A-*MUHq-T9?ngFCnvCCn&j`}LaA;z-+VdqPUd>Rf-?PxQY>8Nu?cC}r{rXRu z(-k;PPx1Y&Yr43!!>aTT!^s5(F7x&=H}~u_TEceO<*N--MrO%e{R=zy-ctQhEBnq~ X?dxJ~iI4HKKv~Pv)z4*}Q$iB}^fq~y;lFAE<6&0z3!^>bP0l+XkK D0Q)zX literal 0 HcmV?d00001