From 3716a65f8d021d016bca9022937295372fe2b074 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Tue, 18 Aug 2015 04:18:11 -0700 Subject: [PATCH] Fabulous Infinitato --- .../compat/botania/ItemInfinitatoCostume.java | 44 ++++++++++++++++++ .../compat/botania/RenderTileInfinitato.java | 41 +++++++++++++++- .../avaritia/compat/botania/Tsundere.java | 12 +++++ .../avaritia/compat/nei/NotEnough.java | 5 ++ .../textures/items/costume_armstrong.png | Bin 0 -> 265 bytes .../textures/items/costume_egbert.png | Bin 0 -> 327 bytes .../avaritia/textures/items/costume_moon.png | Bin 0 -> 3006 bytes 7 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/ItemInfinitatoCostume.java create mode 100644 src/main/resources/assets/avaritia/textures/items/costume_armstrong.png create mode 100644 src/main/resources/assets/avaritia/textures/items/costume_egbert.png create mode 100644 src/main/resources/assets/avaritia/textures/items/costume_moon.png diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/ItemInfinitatoCostume.java b/src/main/java/fox/spiteful/avaritia/compat/botania/ItemInfinitatoCostume.java new file mode 100644 index 0000000..87b3a32 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/ItemInfinitatoCostume.java @@ -0,0 +1,44 @@ +package fox.spiteful.avaritia.compat.botania; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.Avaritia; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import java.util.List; + +public class ItemInfinitatoCostume extends Item { + + private static final String[] types = new String[]{"armstrong", "moon", "egbert"}; + + @SideOnly(Side.CLIENT) + public IIcon[] icons; + + public ItemInfinitatoCostume(){ + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ir) { + icons = new IIcon[types.length]; + + for (int x = 0; x < types.length; x++) { + icons[x] = ir.registerIcon("avaritia:" + "costume_" + types[x]); + } + + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) {} + + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int dam) { + return this.icons[dam % icons.length]; + } +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/RenderTileInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/botania/RenderTileInfinitato.java index 6187077..c6b75cc 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/RenderTileInfinitato.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/RenderTileInfinitato.java @@ -1,5 +1,8 @@ package fox.spiteful.avaritia.compat.botania; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -108,6 +111,34 @@ public class RenderTileInfinitato extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(texture); model.render(); + GL11.glPushMatrix(); + String name = potato.name.toLowerCase(); + mc.renderEngine.bindTexture(TextureMap.locationItemsTexture); + float scale = 1F / 4F; + GL11.glTranslatef(0F, 1F, 0F); + GL11.glScalef(scale, scale, scale); + if(name.equals("armstrong")) { + GL11.glScalef(1.75F, 1.75F, 1.25F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glTranslatef(-0.5F, -0.55F, -0.8F); + renderIcon(Tsundere.costumes.getIconFromDamage(0)); + } + else if(name.startsWith("moo") && name.endsWith("oon")) { + GL11.glScalef(1.75F, 1.75F, 1.25F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glTranslatef(-0.5F, -0.6F, -0.8F); + renderIcon(Tsundere.costumes.getIconFromDamage(1)); + } + else if(name.equals("egbert")) { + GL11.glScalef(1.25F, 1.25F, 1.25F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glTranslatef(-0.5F, -1.4F, -0.8F); + renderIcon(Tsundere.costumes.getIconFromDamage(2)); + } + + GL11.glPopMatrix(); + + GL11.glRotatef(-rotZ, 0F, 0F, 1F); GL11.glRotatef(-rotY, 0F, 1F, 0F); GL11.glColor3f(1F, 1F, 1F); @@ -116,7 +147,7 @@ public class RenderTileInfinitato extends TileEntitySpecialRenderer { MovingObjectPosition pos = mc.objectMouseOver; if(!potato.name.isEmpty() && pos != null && pos.blockX == potato.xCoord && pos.blockY == potato.yCoord && pos.blockZ == potato.zCoord) { GL11.glPushMatrix(); - GL11.glTranslatef(0F, -0.6F, 0F); + GL11.glTranslatef(0F, -0.4F, 0F); GL11.glRotatef(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); GL11.glRotatef(RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); float f = 1.6F; @@ -148,4 +179,12 @@ public class RenderTileInfinitato extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } + + public void renderIcon(IIcon icon) { + float f = icon.getMinU(); + float f1 = icon.getMaxU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxV(); + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + } } diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java index d6a707e..824167b 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java @@ -3,6 +3,7 @@ package fox.spiteful.avaritia.compat.botania; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; +import fox.spiteful.avaritia.compat.nei.NotEnough; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import fox.spiteful.avaritia.crafting.ExtremeShapedRecipe; import fox.spiteful.avaritia.crafting.Grinder; @@ -12,10 +13,13 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; public class Tsundere { + public static Item costumes; + public static void baka() throws Compat.ItemNotFoundException { Item resource = Compat.getItem("Botania", "manaResource"); Block storage = Compat.getBlock("Botania", "storage"); @@ -53,6 +57,14 @@ public class Tsundere { LudicrousBlocks.infinitato = GameRegistry.registerBlock(new BlockInfinitato(), "infinitato"); GameRegistry.registerTileEntity(TileInfinitato.class, "Avaritia_Infinitato"); + costumes = new ItemInfinitatoCostume(); + GameRegistry.registerItem(costumes, "costumes"); + if(Compat.nei){ + try{ + NotEnough.hide(new ItemStack(costumes, 1, OreDictionary.WILDCARD_VALUE)); + } + catch(Throwable e){} + } Block potato = Compat.getBlock("Botania", "tinyPotato"); diff --git a/src/main/java/fox/spiteful/avaritia/compat/nei/NotEnough.java b/src/main/java/fox/spiteful/avaritia/compat/nei/NotEnough.java index ce08ee0..048e862 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/nei/NotEnough.java +++ b/src/main/java/fox/spiteful/avaritia/compat/nei/NotEnough.java @@ -1,6 +1,7 @@ package fox.spiteful.avaritia.compat.nei; import codechicken.nei.api.API; +import net.minecraft.item.ItemStack; public class NotEnough { @@ -15,4 +16,8 @@ public class NotEnough { API.registerUsageHandler(shapeless); API.registerUsageHandler(compress); } + + public static void hide(ItemStack stack){ + API.hideItem(stack); + } } diff --git a/src/main/resources/assets/avaritia/textures/items/costume_armstrong.png b/src/main/resources/assets/avaritia/textures/items/costume_armstrong.png new file mode 100644 index 0000000000000000000000000000000000000000..8520011af863c272dfee69291c8979ed0c357e6d GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DERL74IIKMh8pAbW|YuPggqWu%iacE$LoEE4PGsb2FyLYS{$Kpp>|G+^o23?pK6EQKbuO53 zQ~UElL-)PxK}`B`^7<>LHBMPj)j6d*K0d(p6kkx;giVKSe|U7yoVlmllI8EFsX)5t z@x}#8lTY7fl?#%L+`0Df!K0y%#HV)0ip4Hjll+(^vTXB{8rh0cpzREvu6{1-oD!M< D2ryd8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/avaritia/textures/items/costume_egbert.png b/src/main/resources/assets/avaritia/textures/items/costume_egbert.png new file mode 100644 index 0000000000000000000000000000000000000000..503c39ffa4c1b221114a06dbcb27af7fca819142 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DERK$uZ*=c%VaLG}_)Usv|K%z`2cY7?)!b^wK>N?apKg7ec#$`gxH83GbB^Gfvm zTtgJfjP*?Q3=Q2sJDCGjZSZt)46*Q^J29KD*?_0n@<832f75UG8S;9iwJ({mHA8!% z-9!t&c%QT|#|N8__TTv%m-UcoiOJljrxxyT3YS@^-M2x#%g9cbUYe#JeLmR;UiQR#8*=No>q{wX}D zyk%0Y=|0Bw2lVBq?3}kqZ^0W*CN{q3d0)$o0zOOaV^|#dKr6PeW!(>Zvs#9H_hX*+ T4-ztfZfEdx^>bP0l+XkKAufDM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/avaritia/textures/items/costume_moon.png b/src/main/resources/assets/avaritia/textures/items/costume_moon.png new file mode 100644 index 0000000000000000000000000000000000000000..ee145bc4e4cf7479a4f317366c006860d75d57b6 GIT binary patch literal 3006 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