diff --git a/lib/Botania r1.7-208-deobf.jar b/lib/Botania r1.7-208-deobf.jar new file mode 100644 index 0000000..f64cff4 Binary files /dev/null and b/lib/Botania r1.7-208-deobf.jar differ diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousText.java b/src/main/java/fox/spiteful/avaritia/LudicrousText.java index 9675646..f8b7b93 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousText.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousText.java @@ -2,22 +2,34 @@ package fox.spiteful.avaritia; import net.minecraft.client.Minecraft; import net.minecraft.util.EnumChatFormatting; +import static net.minecraft.util.EnumChatFormatting.*; public class LudicrousText { - private static final EnumChatFormatting[] fabulousness = new EnumChatFormatting[] {EnumChatFormatting.RED, EnumChatFormatting.GOLD, EnumChatFormatting.YELLOW, EnumChatFormatting.GREEN, EnumChatFormatting.AQUA, EnumChatFormatting.BLUE, EnumChatFormatting.LIGHT_PURPLE}; - + private static final EnumChatFormatting[] fabulousness = new EnumChatFormatting[] {RED, GOLD, YELLOW, GREEN, AQUA, BLUE, LIGHT_PURPLE}; public static String makeFabulous(String input) { + return ludicrousFormatting(input, fabulousness, 80.0, 1, 1); + } + + private static final EnumChatFormatting[] sanic = new EnumChatFormatting[] {BLUE, BLUE, BLUE, BLUE, WHITE, BLUE, WHITE, WHITE, BLUE, WHITE, WHITE, BLUE, RED, WHITE, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY}; + public static String makeSANIC(String input) { + return ludicrousFormatting(input, sanic, 50.0, 2,1); + } + + public static String ludicrousFormatting(String input, EnumChatFormatting[] colours, double delay, int step, int posstep) { StringBuilder sb = new StringBuilder(input.length()*3); + if (delay <= 0) { + delay = 0.001; + } - int offset = (int) Math.floor(Minecraft.getSystemTime() / 80.0) % fabulousness.length; + int offset = (int) Math.floor(Minecraft.getSystemTime() / delay) % colours.length; for (int i=0; i= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) + RenderHelper.renderTooltip(mx, my, Arrays.asList(StatCollector.translateToLocal("botaniamisc.shapeless"))); + + iconY += 20; + } + + render.bindTexture(craftingOverlay); + GL11.glEnable(GL11.GL_BLEND); + + if(oreDictRecipe) { + ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); + + if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) + RenderHelper.renderTooltip(mx, my, Arrays.asList(StatCollector.translateToLocal("botaniamisc.oredict"))); + } + GL11.glDisable(GL11.GL_BLEND); + } + + @Override + @SideOnly(Side.CLIENT) + public void updateScreen() { + /*if(ticksElapsed % 20 == 0) { + recipeAt++; + + if(recipeAt == recipes.size()) + recipeAt = 0; + }*/ + ++ticksElapsed; + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe recipe) { + if (recipe instanceof ExtremeShapedRecipe) { + ExtremeShapedRecipe shaped = (ExtremeShapedRecipe) recipe; + + for(int y = 0; y < shaped.recipeHeight; y++) + for(int x = 0; x < shaped.recipeWidth; x++) + renderItemAtLudicrousGridPos(gui, x, y, shaped.recipeItems[y * shaped.recipeWidth + x], true); + } else if (recipe instanceof ExtremeShapedOreRecipe) { + oreDictRecipe = true; + } else if (recipe instanceof ExtremeShapelessRecipe) { + shapelessRecipe = true; + } else if(recipe instanceof ShapelessOreRecipe) { + ShapelessOreRecipe shapeless = (ShapelessOreRecipe) recipe; + + drawGrid : { + for(int y = 0; y < 3; y++) + for(int x = 0; x < 3; x++) { + int index = y * 3 + x; + + if(index >= shapeless.getRecipeSize()) + break drawGrid; + + Object input = shapeless.getInput().get(index); + if(input != null) + renderItemAtLudicrousGridPos(gui, x, y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + } + } + + shapelessRecipe = true; + oreDictRecipe = true; + } + /*if(recipe instanceof ShapedRecipes) { + ShapedRecipes shaped = (ShapedRecipes)recipe; + + for(int y = 0; y < shaped.recipeHeight; y++) + for(int x = 0; x < shaped.recipeWidth; x++) + renderItemAtGridPos(gui, 1 + x, 1 + y, shaped.recipeItems[y * shaped.recipeWidth + x], true); + } else if(recipe instanceof ShapedOreRecipe) { + ShapedOreRecipe shaped = (ShapedOreRecipe) recipe; + int width = (Integer) ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 4); + int height = (Integer) ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 5); + + for(int y = 0; y < height; y++) + for(int x = 0; x < width; x++) { + Object input = shaped.getInput()[y * width + x]; + if(input != null) + renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + } + + oreDictRecipe = true; + } else if(recipe instanceof ShapelessRecipes) { + ShapelessRecipes shapeless = (ShapelessRecipes) recipe; + + drawGrid : { + for(int y = 0; y < 3; y++) + for(int x = 0; x < 3; x++) { + int index = y * 3 + x; + + if(index >= shapeless.recipeItems.size()) + break drawGrid; + + renderItemAtGridPos(gui, 1 + x, 1 + y, (ItemStack) shapeless.recipeItems.get(index), true); + } + } + + shapelessRecipe = true; + } else if(recipe instanceof ShapelessOreRecipe) { + ShapelessOreRecipe shapeless = (ShapelessOreRecipe) recipe; + + drawGrid : { + for(int y = 0; y < 3; y++) + for(int x = 0; x < 3; x++) { + int index = y * 3 + x; + + if(index >= shapeless.getRecipeSize()) + break drawGrid; + + Object input = shapeless.getInput().get(index); + if(input != null) + renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + } + } + + shapelessRecipe = true; + oreDictRecipe = true; + }*/ + + renderItemAtLudicrousGridPos(gui, 4, -1, recipe.getRecipeOutput(), false); + } + + @SideOnly(Side.CLIENT) + public void renderItemAtLudicrousGridPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack, boolean accountForContainer) { + if(stack == null || stack.getItem() == null) + return; + stack = stack.copy(); + + if(stack.getItemDamage() == Short.MAX_VALUE) + stack.setItemDamage(0); + + int xPos = gui.getLeft() + x * 13 + 13; + int yPos = gui.getTop() + y * 13 + 30 - (y==-1 ? 5 : 0); + ItemStack stack1 = stack.copy(); + if(stack1.getItemDamage() == -1) + stack1.setItemDamage(0); + + renderItem(gui, xPos, yPos, stack1, accountForContainer); + } +} 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 c4372ca..d6a707e 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; +import fox.spiteful.avaritia.crafting.ExtremeShapedRecipe; import fox.spiteful.avaritia.crafting.Grinder; import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.block.Block; @@ -14,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.api.BotaniaAPI; public class Tsundere { - + public static void baka() throws Compat.ItemNotFoundException { Item resource = Compat.getItem("Botania", "manaResource"); Block storage = Compat.getBlock("Botania", "storage"); @@ -55,7 +56,7 @@ public class Tsundere { Block potato = Compat.getBlock("Botania", "tinyPotato"); - ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousBlocks.infinitato), new Object[]{ + ExtremeShapedRecipe tatorecipe = ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousBlocks.infinitato), new Object[]{ "IIIIIIIII", "IIIIIIIII", "IIISISIII", @@ -68,6 +69,13 @@ public class Tsundere { 'I', new ItemStack(potato), 'X', new ItemStack(LudicrousItems.resource, 1, 5), 'S', new ItemStack(Items.diamond)}); + + BlockInfinitato.lexiconEntry = new LudicrousLexicon("infinitato", BotaniaAPI.categoryMisc); + BlockInfinitato.lexiconEntry.setLexiconPages( + BotaniaAPI.internalHandler.textPage("avaritia.lexicon.infinitato.0"), + new PageLudicrousRecipe("avaritia.lexicon.infinitato.1", tatorecipe) + ).setIcon(new ItemStack(LudicrousBlocks.infinitato)); + } private static ItemStack getFlower(String type) throws Compat.ItemNotFoundException { diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java b/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java index 55b0338..6d34ad2 100644 --- a/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java +++ b/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java @@ -53,6 +53,8 @@ public class EntityGapingVoid extends Entity { if (p.capabilities.isCreativeMode) { return false; } + } else if (ent instanceof EntityImmortalItem) { + return false; } return true; diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityImmortalItem.java b/src/main/java/fox/spiteful/avaritia/entity/EntityImmortalItem.java new file mode 100644 index 0000000..b9d4c6b --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/entity/EntityImmortalItem.java @@ -0,0 +1,159 @@ +package fox.spiteful.avaritia.entity; + +import java.util.Iterator; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class EntityImmortalItem extends EntityItem { + + public EntityImmortalItem(World world, Entity original, ItemStack stack) { + this(world, original.posX, original.posY, original.posZ, stack); + this.delayBeforeCanPickup = 20; + this.motionX = original.motionX; + this.motionY = original.motionY; + this.motionZ = original.motionZ; + this.setEntityItemStack(stack); + } + + public EntityImmortalItem(World world, double x, double y, double z, ItemStack stack) { + super(world, x, y, z); + this.setEntityItemStack(stack); + } + + public EntityImmortalItem(World world, double x, double y, double z) { + super(world, x, y, z); + this.isImmuneToFire = true; + } + + public EntityImmortalItem(World world) { + super(world); + this.isImmuneToFire = true; + } + + @Override + protected void dealFireDamage(int damage) {} + + @Override + public boolean attackEntityFrom(DamageSource source, float damage) + { + if (source.getDamageType().equals("outOfWorld")) { + return true; + } + return false; + } + + @Override + public void onUpdate() + { + ItemStack stack = this.getDataWatcher().getWatchableObjectItemStack(10); + if (stack != null && stack.getItem() != null) + { + if (stack.getItem().onEntityItemUpdate(this)) + { + return; + } + } + + if (this.getEntityItem() == null) + { + this.setDead(); + } + else + { + super.onUpdate(); + + if (this.delayBeforeCanPickup > 0) + { + --this.delayBeforeCanPickup; + } + + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + this.motionY -= 0.03999999910593033D; + this.noClip = this.func_145771_j(this.posX, (this.boundingBox.minY + this.boundingBox.maxY) / 2.0D, this.posZ); + this.moveEntity(this.motionX, this.motionY, this.motionZ); + boolean flag = (int)this.prevPosX != (int)this.posX || (int)this.prevPosY != (int)this.posY || (int)this.prevPosZ != (int)this.posZ; + + if (flag || this.ticksExisted % 25 == 0) + { + if (this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)).getMaterial() == Material.lava) + { + this.motionY = 0.20000000298023224D; + this.motionX = (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); + this.motionZ = (double)((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F); + this.playSound("random.fizz", 0.4F, 2.0F + this.rand.nextFloat() * 0.4F); + } + + if (!this.worldObj.isRemote) + { + this.searchForOtherItemsNearby2(); + } + } + + float f = 0.98F; + + if (this.onGround) + { + f = this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.boundingBox.minY) - 1, MathHelper.floor_double(this.posZ)).slipperiness * 0.98F; + } + + this.motionX *= (double)f; + this.motionY *= 0.9800000190734863D; + this.motionZ *= (double)f; + + if (this.onGround) + { + this.motionY *= -0.5D; + } + + ++this.age; + + ItemStack item = getDataWatcher().getWatchableObjectItemStack(10); + + if (!this.worldObj.isRemote && this.age >= lifespan) + { + if (item != null) + { + /*ItemExpireEvent event = new ItemExpireEvent(this, (item.getItem() == null ? 6000 : item.getItem().getEntityLifespan(item, worldObj))); + if (MinecraftForge.EVENT_BUS.post(event)) + { + lifespan += event.extraLife; + } + else + { + this.setDead(); + }*/ + } + else + { + this.setDead(); + } + } + + if (item != null && item.stackSize <= 0) + { + this.setDead(); + } + } + } + + // GODDAMNIT MOJANG + @SuppressWarnings("rawtypes") + private void searchForOtherItemsNearby2() + { + Iterator iterator = this.worldObj.getEntitiesWithinAABB(EntityItem.class, this.boundingBox.expand(0.5D, 0.0D, 0.5D)).iterator(); + + while (iterator.hasNext()) + { + EntityItem entityitem = (EntityItem)iterator.next(); + this.combineItems(entityitem); + } + } +} diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java index 5483082..517e47c 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java @@ -2,8 +2,10 @@ package fox.spiteful.avaritia.items; import com.google.common.collect.Multimap; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.LudicrousText; import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.compat.Compat; +import fox.spiteful.avaritia.entity.EntityImmortalItem; import fox.spiteful.avaritia.render.ICosmicRenderItem; import fox.spiteful.avaritia.render.ModelArmorInfinity; import net.minecraft.block.material.Material; @@ -168,6 +170,10 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I if (hasPhantomInk(stack)) list.add(StatCollector.translateToLocal("botaniamisc.hasPhantomInk").replaceAll("&", "\u00a7")); } + if (this.slot == 3) { + list.add(""); + list.add(EnumChatFormatting.BLUE+"+"+EnumChatFormatting.ITALIC+LudicrousText.makeSANIC("SANIC")+EnumChatFormatting.RESET+""+EnumChatFormatting.BLUE+"% Speed"); + } super.addInformation(stack, player, list, par4); } @@ -200,6 +206,18 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I public IIcon getMaskTexture(ItemStack stack) { return this.cosmicMask; } + + @Override + public boolean hasCustomEntity (ItemStack stack) + { + return true; + } + + @Override + public Entity createEntity (World world, Entity location, ItemStack itemstack) + { + return new EntityImmortalItem(world, location, itemstack); + } public static class abilityHandler { public static List playersWithHat = new ArrayList(); @@ -286,10 +304,10 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I if (player.onGround || flying || swimming) { boolean sneaking = player.isSneaking(); - float speed = 0.2f - * (flying ? 1.5f : 1.0f) - * (swimming ? 1.2f : 1.0f) - * (sneaking ? 0.3f : 1.0f); + float speed = 0.15f + * (flying ? 1.1f : 1.0f) + //* (swimming ? 1.2f : 1.0f) + * (sneaking ? 0.1f : 1.0f); if (player.moveForward > 0f) { player.moveFlying(0f, 1f, speed); diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index c0c94a5..2749901 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -1,7 +1,9 @@ package fox.spiteful.avaritia.items; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.entity.EntityImmortalItem; import fox.spiteful.avaritia.render.IHaloRenderItem; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -14,6 +16,7 @@ import net.minecraft.util.MathHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import java.util.List; @@ -148,4 +151,18 @@ public class ItemResource extends Item implements IHaloRenderItem { } return 0xFF000000; } + + @Override + public boolean hasCustomEntity (ItemStack stack) + { + int meta = stack.getItemDamage(); + return meta == 5 || meta == 6; + } + + @Override + public Entity createEntity (World world, Entity location, ItemStack itemstack) + { + int meta = itemstack.getItemDamage(); + return (meta == 5 || meta == 6) ? new EntityImmortalItem(world, location, itemstack) : null; + } } diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java index 10b98e4..3778919 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java @@ -3,6 +3,7 @@ package fox.spiteful.avaritia.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.entity.EntityImmortalItem; import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -10,6 +11,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -155,5 +157,17 @@ public class ItemPickaxeInfinity extends ItemPickaxe { ToolHelper.removeBlocksInIteration(player, stack, world, x, y, z, -range, doY ? -1 : -range, -range, range, doY ? range * 2 - 2 : range, range, null, MATERIALS, silk, fortune, false); } + + @Override + public boolean hasCustomEntity (ItemStack stack) + { + return true; + } + + @Override + public Entity createEntity (World world, Entity location, ItemStack itemstack) + { + return new EntityImmortalItem(world, location, itemstack); + } } diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java index 50a5a01..48d4e41 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java @@ -7,6 +7,7 @@ import fox.spiteful.avaritia.Avaritia; import fox.spiteful.avaritia.DamageSourceInfinitySword; import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.achievements.Achievements; +import fox.spiteful.avaritia.entity.EntityImmortalItem; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.render.ICosmicRenderItem; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,6 +20,7 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.IIcon; +import net.minecraft.world.World; import net.minecraftforge.common.util.EnumHelper; import org.apache.logging.log4j.Level; @@ -128,4 +130,15 @@ public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem { return true; } + @Override + public boolean hasCustomEntity (ItemStack stack) + { + return true; + } + + @Override + public Entity createEntity (World world, Entity location, ItemStack itemstack) + { + return new EntityImmortalItem(world, location, itemstack); + } } diff --git a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java index 6329c18..08a863d 100644 --- a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java @@ -12,6 +12,7 @@ import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; @@ -120,8 +121,12 @@ public class ModelArmorInfinity extends ModelBiped { Minecraft mc = Minecraft.getMinecraft(); boolean isFlying = entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isFlying && entity.isAirBorne; - super.render(entity, f, f1, f2, f3, f4, f5); + //copyBipedAngles(this, this.overlay); + //copyBipedAngles(this, this.invulnOverlay); + super.render(entity, f, f1, f2, f3, f4, f5); + + GL11.glColor4d(1, 1, 1, 1); CosmicRenderShenanigans.useShader(); CosmicRenderShenanigans.bindItemTexture(); GL11.glDisable(GL11.GL_ALPHA_TEST); @@ -133,7 +138,6 @@ public class ModelArmorInfinity extends ModelBiped { } this.overlay.render(entity, f, f1, f2, f3, f4, f5); - CosmicRenderShenanigans.releaseShader(); mc.renderEngine.bindTexture(eyeTex); @@ -166,7 +170,9 @@ public class ModelArmorInfinity extends ModelBiped { super.render(entity, f, f1, f2, f3, f4, f5); } - mc.entityRenderer.enableLightmap(0.0); + if (!CosmicRenderShenanigans.inventoryRender) { + mc.entityRenderer.enableLightmap(15.0); + } GL11.glEnable(GL11.GL_LIGHTING); GL11.glColor4d(1,1,1,1); @@ -198,10 +204,14 @@ public class ModelArmorInfinity extends ModelBiped { GL11.glDepthMask(true); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); - mc.entityRenderer.enableLightmap(0.0); + if (!CosmicRenderShenanigans.inventoryRender) { + mc.entityRenderer.enableLightmap(0.0); + } GL11.glEnable(GL11.GL_LIGHTING); GL11.glColor4d(1,1,1,1); + } + } public void update(EntityLivingBase entityLiving, ItemStack itemstack, int armorSlot) { @@ -263,6 +273,9 @@ public class ModelArmorInfinity extends ModelBiped { this.invulnOverlay.isRiding = entityLiving.isRiding(); this.invulnOverlay.isChild = entityLiving.isChild(); + this.overlay.onGround = this.onGround; + this.invulnOverlay.onGround = this.onGround; + this.heldItemRight = 0; this.aimedBow = false; @@ -305,9 +318,11 @@ public class ModelArmorInfinity extends ModelBiped { } @Override - public void setRotationAngles(float f1, float f2, float f3, float f4, float f5, float f6, Entity entity) + public void setRotationAngles(float f1, float speed, float ticks, float headYaw, float headPitch, float f6, Entity entity) { - super.setRotationAngles(f1, f2, f3, f4, f5, f6, entity); + super.setRotationAngles(f1, speed, ticks, headYaw, headPitch, f6, entity); + this.overlay.setRotationAngles(f1, speed, ticks, headYaw, headPitch, f6, entity); + this.invulnOverlay.setRotationAngles(f1, speed, ticks, headYaw, headPitch, f6, entity); if (RenderManager.instance.entityRenderMap.containsKey(entity.getClass())) { Render r = (Render) RenderManager.instance.entityRenderMap.get(entity.getClass()); @@ -466,6 +481,8 @@ public class ModelArmorInfinity extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + copyBipedAngles(this.parent, this); + super.render(entity, f, f1, f2, f3, f4, f5); } diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 0f41a70..823ab6c 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -92,6 +92,9 @@ avaritia.flower.asgardandelion.name=Asgardandelion tile.avaritia.flower.asgardandelion.lore=Watered with Vazkii's tears :c avaritia.lexicon.asgardandelion=Asgardandelion avaritia.lexicon.asgardandelion.0=Rumors abound about some kind of godlike flower that can produce a neverending torrent of mana. If such a mythical flower were to exist, it would probably require wealth and resources beyond mortal reasoning.
&oStill not a SAO reference.&r +avaritia.lexicon.infinitato=Infinitato +avaritia.lexicon.infinitato.0=Imprinting the essence of everything onto objects can have interesting results, and the Infinitato is no exception.
Somewhat larger than its tiny sibling, and infused with the can-do attitude of a whole crowd of &1Tiny Potatoes&0 plus an &1Infinity Catalyst&0, the &1Infinitato&0 believes that you can do all the things, forever. +avaritia.lexicon.infinitato.1=Trust me, &oit'll fit.&r # # Thaumcraft item.Wand.infinity.rod=Cosmic Neutronium diff --git a/src/main/resources/assets/avaritia/textures/gui/lexiconCraftingOverlay.png b/src/main/resources/assets/avaritia/textures/gui/lexiconCraftingOverlay.png new file mode 100644 index 0000000..357b0f0 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/gui/lexiconCraftingOverlay.png differ