From 0f1ba9c124fd4c503320be80b8e0b232399bcb58 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Fri, 17 Oct 2014 23:08:20 -0700 Subject: [PATCH] Stuffy Stuff --- .../java/fox/spiteful/forbidden/Config.java | 10 +- .../spiteful/forbidden/FMEventHandler.java | 5 +- .../fox/spiteful/forbidden/Forbidden.java | 2 +- .../spiteful/forbidden/ForbiddenRecipes.java | 12 +- .../spiteful/forbidden/ForbiddenResearch.java | 13 +- .../forbidden/blocks/BlockResource.java | 19 +- .../fox/spiteful/forbidden/compat/Compat.java | 145 +++++++-------- .../forbidden/compat/DarkSignature.java | 35 ++++ .../forbidden/compat/ForbiddenLexicon.java | 25 +++ .../enchantments/DarkEnchantments.java | 13 +- .../enchantments/EnchantmentImpact.java | 41 +++++ .../enchantments/EnchantmentPigBane.java | 47 ----- ...tmentEternal.java => EnchantmentVoid.java} | 15 +- .../enchantments/EnchantmentWrath.java | 61 +++++++ .../forbidden/items/ItemDivineOrb.java | 7 +- .../forbidden/items/ItemMorphAxe.java | 25 ++- .../forbidden/items/ItemMorphPickaxe.java | 169 +++++++++++++++++- .../forbidden/items/ItemMorphShovel.java | 141 ++++++++++++++- .../forbidden/items/ItemMorphSword.java | 26 ++- .../forbidden/items/wands/ItemWandCores.java | 10 +- .../forbidden/items/wands/ManaWandUpdate.java | 8 +- .../forbidden/tiles/SubTileEuclidaisy.java | 72 ++++++++ .../assets/forbidden/lang/en_US.lang | 30 ++-- .../forbidden/textures/blocks/euclidaisy.png | Bin 0 -> 555 bytes .../forbidden/textures/misc/eternal.png | Bin 516 -> 0 bytes .../assets/forbidden/textures/misc/impact.png | Bin 0 -> 2329 bytes .../forbidden/textures/misc/pigbane.png | Bin 1399 -> 0 bytes .../forbidden/textures/misc/voidtouched.png | Bin 0 -> 2478 bytes .../assets/forbidden/textures/misc/wrath.png | Bin 0 -> 2538 bytes 29 files changed, 721 insertions(+), 210 deletions(-) create mode 100644 src/main/java/fox/spiteful/forbidden/compat/DarkSignature.java create mode 100644 src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java create mode 100644 src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java delete mode 100644 src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentPigBane.java rename src/main/java/fox/spiteful/forbidden/enchantments/{EnchantmentEternal.java => EnchantmentVoid.java} (70%) create mode 100644 src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentWrath.java create mode 100644 src/main/java/fox/spiteful/forbidden/tiles/SubTileEuclidaisy.java create mode 100644 src/main/resources/assets/forbidden/textures/blocks/euclidaisy.png delete mode 100644 src/main/resources/assets/forbidden/textures/misc/eternal.png create mode 100644 src/main/resources/assets/forbidden/textures/misc/impact.png delete mode 100644 src/main/resources/assets/forbidden/textures/misc/pigbane.png create mode 100644 src/main/resources/assets/forbidden/textures/misc/voidtouched.png create mode 100644 src/main/resources/assets/forbidden/textures/misc/wrath.png diff --git a/src/main/java/fox/spiteful/forbidden/Config.java b/src/main/java/fox/spiteful/forbidden/Config.java index ee1e549..ed9ed82 100644 --- a/src/main/java/fox/spiteful/forbidden/Config.java +++ b/src/main/java/fox/spiteful/forbidden/Config.java @@ -17,12 +17,13 @@ public class Config { public static HashMap spawnerMobs = new HashMap(); public static int clusterEnchID; - public static int pigBaneEnchID; + public static int wrathEnchID; public static int greedyEnchID; public static int consumingEnchID; public static int educationalEnchID; public static int corruptingEnchID; - public static int eternalEnchID; + public static int voidEnchID; + public static int impactEnchID; public static int bloodSealPotionID = 70; @@ -53,12 +54,13 @@ public class Config { int enchCount = 66; clusterEnchID = conf.get("enchantments", "Fiery Core", enchCount++).getInt(); - pigBaneEnchID = conf.get("enchantments", "Porcivore", enchCount++).getInt(); + wrathEnchID = conf.get("enchantments", "Wrath", enchCount++).getInt(); greedyEnchID = conf.get("enchantments", "Capitalist", enchCount++).getInt(); consumingEnchID = conf.get("enchantments", "Consuming", enchCount++).getInt(); educationalEnchID = conf.get("enchantments", "Educational", enchCount++).getInt(); corruptingEnchID = conf.get("enchantments", "Corrupting", enchCount++).getInt(); - eternalEnchID = conf.get("enchantments", "Eternal", enchCount++).getInt(); + voidEnchID = conf.get("enchantments", "Voidtouched", enchCount++).getInt(); + impactEnchID = conf.get("enchantments", "Impact", enchCount++).getInt(); noLust = conf.get("general", "No Lust", noLust, "Enable to remove Luxuria aspect and related items.").getBoolean(false); silverfishEmeralds = conf.get("general", "Silverfish Drop Emerald Nuggets", silverfishEmeralds, "Disable to prevent Silverfish from dropping emerald nuggets.").getBoolean(true); diff --git a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java index 24495e2..53ac9f6 100644 --- a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java +++ b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java @@ -7,6 +7,7 @@ import fox.spiteful.forbidden.blocks.BlockBlackFlower; import fox.spiteful.forbidden.compat.Compat; import fox.spiteful.forbidden.items.ItemTaintPickaxe; import fox.spiteful.forbidden.potions.DarkPotions; +import fox.spiteful.forbidden.tiles.SubTileEuclidaisy; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -38,10 +39,10 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.event.entity.player.BonemealEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; @@ -51,7 +52,7 @@ import org.apache.logging.log4j.Level; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.entities.ITaintedMob; import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.lib.Utils; +import thaumcraft.common.lib.utils.Utils; import com.google.common.collect.Multimap; import fox.spiteful.forbidden.blocks.ForbiddenBlocks; diff --git a/src/main/java/fox/spiteful/forbidden/Forbidden.java b/src/main/java/fox/spiteful/forbidden/Forbidden.java index a346107..1b5ba36 100644 --- a/src/main/java/fox/spiteful/forbidden/Forbidden.java +++ b/src/main/java/fox/spiteful/forbidden/Forbidden.java @@ -18,7 +18,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -@Mod(modid = "ForbiddenMagic", name = "Forbidden Magic", dependencies = "required-after:Thaumcraft;after:ThaumicTinkerer;after:AWWayofTime") +@Mod(modid = "ForbiddenMagic", name = "Forbidden Magic", dependencies = "required-after:Thaumcraft;after:ThaumicTinkerer;after:AWWayofTime;after:Botania") public class Forbidden { @Instance("ForbiddenMagic") public static Forbidden instance; diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java index 187723e..32a8170 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java @@ -2,6 +2,7 @@ package fox.spiteful.forbidden; import java.util.Iterator; +import fox.spiteful.forbidden.compat.Compat; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -44,14 +45,17 @@ public class ForbiddenRecipes { ForbiddenResearch.recipes.put("Crystalwell", ThaumcraftApi.addShapelessArcaneCraftingRecipe("CRYSTALWELL", new ItemStack(ForbiddenItems.crystalwell, 1, 0), (new AspectList()).add(Aspect.EARTH, 2).add(Aspect.FIRE, 2).add(Aspect.AIR, 2).add(Aspect.WATER, 2).add(Aspect.ORDER, 2).add(Aspect.ENTROPY, 2), new Object[] { ItemApi.getItem("itemInkwell", 32767), "dyeBlack", ItemApi.getItem("itemShard", 32767), ItemApi.getItem("itemShard", 32767) })); - ForbiddenResearch.recipes.put("Cluster", ThaumcraftApi.addInfusionEnchantmentRecipe("CLUSTER", DarkEnchantments.cluster, 3, (new AspectList()).add(Aspect.FIRE, 4).add(Aspect.METAL, 4).add(Aspect.GREED, 4), new ItemStack[] { ItemApi.getItem("itemPickElemental", 0), ItemApi.getItem("itemResource", 14) })); if (Config.greedyEnch) ForbiddenResearch.recipes.put("Greedy", ThaumcraftApi.addInfusionEnchantmentRecipe("GREEDY", DarkEnchantments.greedy, 4, (new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.WEAPON, 8).add(Aspect.GREED, 16), new ItemStack[] { new ItemStack(Items.golden_sword), new ItemStack(Items.diamond), new ItemStack(Blocks.gold_block), ItemApi.getItem("itemResource", 14) })); ForbiddenResearch.recipes.put("Consuming", ThaumcraftApi.addInfusionEnchantmentRecipe("CONSUMING", DarkEnchantments.consuming, 3, (new AspectList()).add(Aspect.VOID, 8).add(Aspect.TOOL, 8).add(Aspect.HUNGER, 8), new ItemStack[] { new ItemStack(Items.iron_pickaxe), new ItemStack(Items.lava_bucket), ItemApi.getItem("itemResource", 14) })); - ForbiddenResearch.recipes.put("Pigbane", ThaumcraftApi.addInfusionEnchantmentRecipe("PIGBANE", DarkEnchantments.pigBane, 1, (new AspectList()).add(Aspect.HUNGER, 4).add(Aspect.WEAPON, 4).add(Aspect.BEAST, 4), new ItemStack[] { new ItemStack(Items.iron_sword), new ItemStack(Items.porkchop), ItemApi.getItem("itemResource", 14) })); - ForbiddenResearch.recipes.put("Educational", ThaumcraftApi.addInfusionEnchantmentRecipe("EDUCATIONAL", DarkEnchantments.educational, 3, (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 4).add(Aspect.MIND, 8), new ItemStack[] { ItemApi.getItem("itemResource", 5), new ItemStack(Items.book), ItemApi.getItem("itemResource", 14) })); + ForbiddenResearch.recipes.put("Wrath", ThaumcraftApi.addInfusionEnchantmentRecipe("WRATH", DarkEnchantments.wrath, 8, (new AspectList()).add(DarkAspects.WRATH, 16).add(Aspect.WEAPON, 16).add(DarkAspects.NETHER, 8), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(Items.diamond_sword, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0) })); + ForbiddenResearch.recipes.put("Educational", ThaumcraftApi.addInfusionEnchantmentRecipe("EDUCATIONAL", DarkEnchantments.educational, 3, (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 4).add(Aspect.MIND, 8), new ItemStack[] { ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.book), ItemApi.getItem("itemResource", 14) })); ForbiddenResearch.recipes.put("Corrupting", ThaumcraftApi.addInfusionEnchantmentRecipe("CORRUPTING", DarkEnchantments.corrupting, 4, (new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.EXCHANGE, 16).add(Aspect.CRYSTAL, 8), new ItemStack[] { new ItemStack(Items.nether_wart), new ItemStack(Blocks.soul_sand), ItemApi.getItem("itemResource", 14) })); - ForbiddenResearch.recipes.put("Eternal", ThaumcraftApi.addInfusionEnchantmentRecipe("ETERNAL", DarkEnchantments.eternal, 12, (new AspectList()).add(Aspect.CRAFT, 32).add(Aspect.TOOL, 64).add(DarkAspects.ENVY, 76).add(Aspect.MAGIC, 64), new ItemStack[] { new ItemStack(Items.nether_star), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1) })); + + ForbiddenResearch.recipes.put("Cluster", ThaumcraftApi.addInfusionEnchantmentRecipe("CLUSTER", DarkEnchantments.cluster, 3, (new AspectList()).add(Aspect.FIRE, 4).add(Aspect.METAL, 4).add(Aspect.GREED, 4), new ItemStack[] { ItemApi.getItem("itemPickElemental", 0), ItemApi.getItem("itemResource", 14) })); + if(!Compat.tc) + ForbiddenResearch.recipes.put("Impact", ThaumcraftApi.addInfusionEnchantmentRecipe("IMPACT", DarkEnchantments.impact, 4, (new AspectList()).add(Aspect.ENTROPY, 16).add(Aspect.MINE, 16), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(Blocks.tnt, 1), new ItemStack(Items.stone_pickaxe, 1, 0), new ItemStack(Items.stone_pickaxe, 1, 0) })); + ForbiddenResearch.recipes.put("Voidtouched", ThaumcraftApi.addInfusionEnchantmentRecipe("VOIDTOUCHED", DarkEnchantments.voidtouched, 8, (new AspectList()).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 16).add(DarkAspects.ENVY, 24).add(Aspect.ELDRITCH, 16), new ItemStack[] { ItemApi.getItem("itemResource", 14), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1) })); CraftingManager.getInstance().addRecipe(new ItemStack(Items.emerald, 1, 0), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 0) }); CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 0), new Object[] { "#", Character.valueOf('#'), new ItemStack(Items.emerald, 1, 0) }); diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java index f600bcc..03325e6 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java @@ -3,6 +3,7 @@ package fox.spiteful.forbidden; import java.util.HashMap; import fox.spiteful.forbidden.blocks.ForbiddenBlocks; +import fox.spiteful.forbidden.compat.Compat; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -42,7 +43,6 @@ public class ForbiddenResearch { (new DarkResearchItem("CRYSTALWELL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 3).add(Aspect.CRYSTAL, 2).add(Aspect.MAGIC, 1), -9, 4, 1, new ItemStack(ForbiddenItems.crystalwell, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CRYSTALWELL.1"), new ResearchPage((IArcaneRecipe) recipes.get("Crystalwell")) }).setParents(new String[] { "RESEARCH" }).setAspectTriggers(new Aspect[] { Aspect.MIND }).setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("CRYSTALWELL", 1); (new DarkResearchItem("CONSUMING", "FORBIDDEN", (new AspectList()).add(Aspect.VOID, 4).add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 2), -1, 2, 2, new ResourceLocation("forbidden", "textures/misc/consuming.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CONSUMING.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Consuming")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem(); - (new DarkResearchItem("PIGBANE", "FORBIDDEN", (new AspectList()).add(Aspect.HUNGER, 3).add(Aspect.WEAPON, 4).add(Aspect.MAGIC, 2), -1, 3, 1, new ResourceLocation("forbidden", "textures/misc/pigbane.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.PIGBANE.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Pigbane")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem(); (new DarkResearchItem("EDUCATIONAL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 5).add(Aspect.WEAPON, 1).add(Aspect.MAGIC, 3), -1, 4, 2, new ResourceLocation("forbidden", "textures/misc/educational.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.EDUCATIONAL.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Educational")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem(); } @@ -63,13 +63,18 @@ public class ForbiddenResearch { ThaumcraftApi.addWarpToResearch("MORPHTOOLS", 4); (new DarkResearchItem("ROD_infernal", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 4).add(Aspect.FIRE, 3).add(Aspect.TOOL, 1), -6, -3, 4, new ItemStack(ForbiddenItems.wandCore, 1, 1))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_infernal.1"), new ResearchPage((InfusionRecipe) recipes.get("WandRodInfernal")), new ResearchPage("forbidden.research_page.ROD_infernal.2") }).setParents(new String[] { "ROD_silverwood", "INFAUXSION" }).setConcealed().registerResearchItem(); ThaumcraftApi.addWarpToResearch("ROD_infernal", 2); - (new DarkResearchItem("CLUSTER", "FORBIDDEN", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.FIRE, 4).add(DarkAspects.ENVY, 3), -7, 7, 3, new ResourceLocation("forbidden", "textures/misc/lucrative.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CLUSTER.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Cluster")) }).setParents(new String[] { "MORPHTOOLS", "ELEMENTALPICK" }).setSecondary().setConcealed().registerResearchItem(); + + (new DarkResearchItem("WRATH", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 16).add(Aspect.WEAPON, 20).add(Aspect.MAGIC, 10), -1, 3, 5, new ResourceLocation("forbidden", "textures/misc/wrath.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.WRATH.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Wrath")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setConcealed().registerResearchItem(); + ThaumcraftApi.addWarpToResearch("WRATH", 3); if (Config.greedyEnch) (new DarkResearchItem("GREEDY", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 2).add(Aspect.WEAPON, 1).add(Aspect.GREED, 3), -1, 5, 4, new ResourceLocation("forbidden", "textures/misc/greedy.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.GREEDY.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Greedy")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setConcealed().registerResearchItem(); (new DarkResearchItem("CORRUPTING", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 5).add(Aspect.CRYSTAL, 2).add(Aspect.EXCHANGE, 1), -1, 6, 3, new ResourceLocation("forbidden", "textures/misc/corrupting.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CORRUPTING.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Corrupting")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setConcealed().registerResearchItem(); - (new DarkResearchItem("ETERNAL", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TOOL, 10).add(Aspect.CRAFT, 8).add(DarkAspects.ENVY, 32), -5, 7, 6, new ResourceLocation("forbidden", "textures/misc/eternal.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ETERNAL.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Eternal")) }).setParents(new String[] { "MORPHTOOLS", "ICHOR_TOOLS" }).setConcealed().registerResearchItem(); - ThaumcraftApi.addWarpToResearch("ETERNAL", 5); + (new DarkResearchItem("CLUSTER", "FORBIDDEN", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.FIRE, 4).add(DarkAspects.ENVY, 3), -7, 7, 3, new ResourceLocation("forbidden", "textures/misc/lucrative.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CLUSTER.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Cluster")) }).setParents(new String[] { "MORPHTOOLS", "ELEMENTALPICK" }).setSecondary().setConcealed().registerResearchItem(); + if(!Compat.tc) + (new DarkResearchItem("IMPACT", "FORBIDDEN", (new AspectList()).add(Aspect.ENTROPY, 8).add(Aspect.TOOL, 10).add(Aspect.MINE, 16).add(DarkAspects.ENVY, 10), -6, 7, 4, new ResourceLocation("forbidden", "textures/misc/impact.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.IMPACT.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Impact")) }).setParents(new String[] { "MORPHTOOLS" }).setConcealed().registerResearchItem(); + (new DarkResearchItem("VOIDTOUCHED", "FORBIDDEN", (new AspectList()).add(Aspect.ELDRITCH, 16).add(Aspect.TOOL, 10).add(Aspect.CRAFT, 8).add(DarkAspects.ENVY, 32), -5, 7, 4, new ResourceLocation("forbidden", "textures/misc/voidtouched.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.VOIDTOUCHED.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Voidtouched")) }).setParents(new String[] { "MORPHTOOLS", "VOIDMETAL" }).setConcealed().registerResearchItem(); + ThaumcraftApi.addWarpToResearch("VOIDTOUCHED", 3); if (Config.wrathCage) { if (Config.wrathCost > 0) diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockResource.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockResource.java index 3635868..751da72 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockResource.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockResource.java @@ -6,13 +6,16 @@ import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; public class BlockResource extends Block { - public BlockResource() { - super(Material.iron); - this.setCreativeTab(Forbidden.tab); - } + public BlockResource() { + + super(Material.iron); + this.setCreativeTab(Forbidden.tab); + } + + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + + return true; + } - @Override - public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { - return true; - } } diff --git a/src/main/java/fox/spiteful/forbidden/compat/Compat.java b/src/main/java/fox/spiteful/forbidden/compat/Compat.java index 6c20527..b55f123 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/Compat.java +++ b/src/main/java/fox/spiteful/forbidden/compat/Compat.java @@ -1,11 +1,14 @@ package fox.spiteful.forbidden.compat; -import fox.spiteful.forbidden.DarkAspects; -import fox.spiteful.forbidden.LogHandler; +import fox.spiteful.forbidden.*; +import fox.spiteful.forbidden.tiles.SubTileEuclidaisy; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; @@ -13,21 +16,25 @@ import org.apache.logging.log4j.Level; import thaumcraft.api.ItemApi; import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.IArcaneRecipe; import thaumcraft.api.crafting.InfusionEnchantmentRecipe; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchPage; +import thaumcraft.common.config.ConfigItems; import vazkii.botania.api.BotaniaAPI; -import fox.spiteful.forbidden.DarkResearchItem; import fox.spiteful.forbidden.enchantments.DarkEnchantments; import fox.spiteful.forbidden.items.ForbiddenItems; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import vazkii.botania.api.lexicon.LexiconCategory; +import vazkii.botania.api.lexicon.LexiconPage; + +import java.lang.reflect.Constructor; +import java.util.List; public class Compat { public static boolean tt = false; @@ -38,7 +45,7 @@ public class Compat { public static boolean bm = false; public static boolean am2 = false; public static boolean botan = false; - public static boolean totes = false; + public static boolean tc = false; public static void initiate() { if (Loader.isModLoaded("ThaumicTinkerer")) @@ -57,6 +64,8 @@ public class Compat { am2 = true; if (Loader.isModLoaded("Botania")) botan = true; + if (Loader.isModLoaded("TConstruct")) + tc = true; } public static void compatify() { @@ -80,13 +89,24 @@ public class Compat { ThaumcraftApi.registerObjectTag(new ItemStack(kamiResource, 1, 7), list); } catch (Exception e) { - LogHandler.log(Level.INFO, e, "We don't have Thaumic Tinkerer's nose."); + LogHandler.log(Level.INFO, e, "Forbidden Magic doesn't have Thaumic Tinkerer's nose."); } } } - if (natura) { + if(tc){ + try { + Item hammerHead = GameRegistry.findItem("TConstruct", "hammerHead"); + InfusionEnchantmentRecipe impact = ThaumcraftApi.addInfusionEnchantmentRecipe("IMPACT", DarkEnchantments.impact, 4, (new AspectList()).add(Aspect.ENTROPY, 16).add(Aspect.MINE, 16), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(Blocks.tnt, 1), new ItemStack(hammerHead, 1, 1), new ItemStack(hammerHead, 1, 1) }); + (new DarkResearchItem("IMPACT", "FORBIDDEN", (new AspectList()).add(Aspect.ENTROPY, 8).add(Aspect.TOOL, 10).add(Aspect.MINE, 16).add(DarkAspects.ENVY, 10), -6, 7, 4, new ResourceLocation("forbidden", "textures/misc/impact.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.IMPACT.1"), new ResearchPage(impact) }).setParents(new String[] { "MORPHTOOLS" }).setConcealed().registerResearchItem(); + } catch (Exception e) { + LogHandler.log(Level.INFO, e, "Forbidden Magic fell into Tinkers Construct's smeltery."); + tc = false; + } + } + + if (natura) { try { list = (new AspectList()).add(Aspect.BEAST, 2).add(DarkAspects.NETHER, 4).add(DarkAspects.SLOTH, 2); ThaumcraftApi.registerEntityTag("Natura.Imp", list); @@ -184,76 +204,36 @@ public class Compat { BloodMagic.stab(); } - // TODO: Readd ArsMagica2 Support when it's updated - /* - * if (am2) { try { Class amItems = - * Class.forName("am2.items.ItemsCommonProxy"); Class amBlocks = - * Class.forName("am2.blocks.BlocksCommonProxy"); Item essence = (Item) - * (amItems.getField("essence").get(null)); Item amOre = (Item) - * (amItems.getField("itemOre").get(null)); Block witchwood = (Block) - * (amBlocks.getField("witchwoodLog").get(null)); - * - * InfusionRecipe witchwood_recipe = - * ThaumcraftApi.addInfusionCraftingRecipe("ROD_witchwood", new - * ItemStack(ForbiddenItems.wandCore, 1, 4), 5, (new - * AspectList()).add(Aspect.MAGIC, 16).add(Aspect.EARTH, - * 9).add(Aspect.WATER, 9).add(Aspect.FIRE, 9).add(Aspect.AIR, 9), new - * ItemStack(witchwood), new ItemStack[] { new ItemStack(essence, 1, 0), - * new ItemStack(amOre, 1, 3), new ItemStack(essence, 1, 1), new - * ItemStack(essence, 1, 2), new ItemStack(essence, 1, 3), new - * ItemStack(essence, 1, 4), new ItemStack(amOre, 1, 6), new - * ItemStack(amOre, 1, 7), new ItemStack(amOre, 1, 2) }); (new - * DarkResearchItem("ROD_witchwood", "FORBIDDEN", "[AM2]", (new - * AspectList()).add(Aspect.MAGIC, 6).add(Aspect.TREE, - * 5).add(Aspect.MIND, 4), -4, -3, 3, new - * ItemStack(ForbiddenItems.wandCore, 1, 4))).setPages(new - * ResearchPage[] { new - * ResearchPage("forbidden.research_page.ROD_witchwood.1"), new - * ResearchPage(witchwood_recipe) }).setParents(new String[] { - * "ROD_silverwood", "INFAUXSION" - * }).setConcealed().registerResearchItem(); - * - * InfusionRecipe vinteum_recipe = - * ThaumcraftApi.addInfusionCraftingRecipe("CAP_vinteum", new - * ItemStack(ForbiddenItems.wandCap, 1, 1), 5, (new - * AspectList()).add(Aspect.ENERGY, 12).add(Aspect.MAGIC, 6), - * ItemApi.getItem("itemWandCap", 6), new ItemStack[] { new - * ItemStack(amOre, 1, 0), new ItemStack(amOre, 1, 0), new - * ItemStack(amOre, 1, 0) }); (new DarkResearchItem("CAP_vinteum", - * "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, - * 4).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 2), -4, -5, 1, new - * ItemStack(ForbiddenItems.wandCap, 1, 1))).setPages(new ResearchPage[] - * { new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new - * ResearchPage(vinteum_recipe) }).setParents(new String[] { - * "ROD_witchwood", "CAP_thaumium" - * }).setSecondary().setConcealed().registerResearchItem(); - * - * IArcaneRecipe witchwood_staff = - * ThaumcraftApi.addArcaneCraftingRecipe("ROD_witchwood_staff", new - * ItemStack(ForbiddenItems.wandCore, 1, 10), (new - * AspectList()).add(Aspect.ENTROPY, 26).add(Aspect.FIRE, - * 26).add(Aspect.WATER, 26).add(Aspect.AIR, 26).add(Aspect.EARTH, - * 26).add(Aspect.ORDER, 26), new Object[] { "__D", "_B_", "B__", - * Character.valueOf('B'), new ItemStack(ForbiddenItems.wandCore, 1, 4), - * Character.valueOf('D'), new ItemStack(essence, 1, 10) }); (new - * DarkResearchItem("ROD_witchwood_staff", "FORBIDDEN", "[AM2]", (new - * AspectList()).add(Aspect.MAGIC, 8).add(Aspect.MIND, - * 7).add(Aspect.TOOL, 6), -4, -7, 5, new - * ItemStack(ForbiddenItems.wandCore, 1, 10))).setPages(new - * ResearchPage[] { new - * ResearchPage("forbidden.research_page.ROD_witchwood_staff.1"), new - * ResearchPage(witchwood_staff) }).setParents(new String[] { - * "ROD_silverwood_staff", "ROD_witchwood" - * }).setSpecial().setConcealed().registerResearchItem(); } catch - * (Exception e) { LogHandler.log(Level.INFO, e, - * "Forbidden Magic was slain by a Hecate."); am2 = false; } } - */ + if (am2) { + try { + Class amItems = Class.forName("am2.items.ItemsCommonProxy"); + Class amBlocks = Class.forName("am2.blocks.BlocksCommonProxy"); + Item essence = (Item)(amItems.getField("essence").get(null)); + Item amOre = (Item)(amItems.getField("itemOre").get(null)); + Block witchwood = (Block)(amBlocks.getField("witchwoodLog").get(null)); + + InfusionRecipe witchwood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_witchwood", new ItemStack(ForbiddenItems.wandCore, 1, 4), 5, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.EARTH, 9).add(Aspect.WATER, 9).add(Aspect.FIRE, 9).add(Aspect.AIR, 9), new ItemStack(witchwood), new ItemStack[]{new ItemStack(essence, 1, 0), new ItemStack(amOre, 1, 3), new ItemStack(essence, 1, 1), new ItemStack(essence, 1, 2), new ItemStack(essence, 1, 3), new ItemStack(essence, 1, 4), new ItemStack(amOre, 1, 6), new ItemStack(amOre, 1, 7), new ItemStack(amOre, 1, 2)}); + (new DarkResearchItem("ROD_witchwood", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 6).add(Aspect.TREE, 5).add(Aspect.MIND, 4), -4, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 4))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_witchwood.1"), new ResearchPage(witchwood_recipe)}).setParents(new String[]{ "ROD_silverwood", "INFAUXSION" }).setConcealed().registerResearchItem(); + + InfusionRecipe vinteum_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_vinteum", new ItemStack(ForbiddenItems.wandCap, 1, 1), 5, (new AspectList()).add(Aspect.ENERGY, 12).add(Aspect.MAGIC, 6), ItemApi.getItem("itemWandCap", 6), new ItemStack[]{new ItemStack(amOre, 1, 0), new ItemStack(amOre, 1, 0), new ItemStack(amOre, 1, 0)}); + (new DarkResearchItem("CAP_vinteum", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 2), -4, -5, 1, new ItemStack(ForbiddenItems.wandCap, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new ResearchPage(vinteum_recipe)}).setParents(new String[]{"ROD_witchwood", "CAP_thaumium"}).setSecondary().setConcealed().registerResearchItem(); + + IArcaneRecipe witchwood_staff = ThaumcraftApi.addArcaneCraftingRecipe("ROD_witchwood_staff", new ItemStack(ForbiddenItems.wandCore, 1, 10), (new AspectList()).add(Aspect.ENTROPY, 26).add(Aspect.FIRE, 26).add(Aspect.WATER, 26).add(Aspect.AIR, 26).add(Aspect.EARTH, 26).add(Aspect.ORDER, 26), new Object[]{"__D", "_B_", "B__", Character.valueOf('B'), new ItemStack(ForbiddenItems.wandCore, 1, 4), Character.valueOf('D'), new ItemStack(essence, 1, 10)}); + (new DarkResearchItem("ROD_witchwood_staff", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 8).add(Aspect.MIND, 7).add(Aspect.TOOL, 6), -4, -7, 5, new ItemStack(ForbiddenItems.wandCore, 1, 10))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_witchwood_staff.1"), new ResearchPage(witchwood_staff)}).setParents(new String[]{"ROD_silverwood_staff", "ROD_witchwood"}).setSpecial().setConcealed().registerResearchItem(); + } catch (Exception e) { + LogHandler.log(Level.INFO, e, "Forbidden Magic was slain by a Hecate."); + am2 = false; + } + } if (botan) { try { Item rune = GameRegistry.findItem("Botania", "rune"); Item resource = GameRegistry.findItem("Botania", "manaResource"); Item livingLog = GameRegistry.findItem("Botania", "livingwood"); + Item flower = GameRegistry.findItem("Botania", "flower"); + Item specialFlower = GameRegistry.findItem("Botania", "specialFlower"); + Item manaPetal = GameRegistry.findItem("Botania", "manaPetal"); CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 0), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 2) }); CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 2), new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 0) }); @@ -266,6 +246,29 @@ public class Compat { IArcaneRecipe manasteel_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_manasteel", new ItemStack(ForbiddenItems.wandCap, 1, 4), (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6).add(Aspect.WATER, 6).add(Aspect.AIR, 6).add(Aspect.EARTH, 6).add(Aspect.ORDER, 6), new Object[] { "NNN", "N N", Character.valueOf('N'), new ItemStack(ForbiddenItems.resource, 1, 2) }); (new DarkResearchItem("CAP_manasteel", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.ELDRITCH, 3).add(Aspect.MAGIC, 2).add(Aspect.ENTROPY, 4), -1, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 3))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CAP_manasteel.1"), new ResearchPage(manasteel_cap) }).setParents(new String[] { "ROD_livingwood" }).setSecondary().setConcealed().registerResearchItem(); BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCap, 1, 3), new ItemStack(ForbiddenItems.wandCap, 1, 4), 1000); + + BotaniaAPI.registerSubTile("euclidaisy", SubTileEuclidaisy.class); + BotaniaAPI.registerSubTileSignature(SubTileEuclidaisy.class, new DarkSignature("euclidaisy")); + BotaniaAPI.addSubTileToCreativeMenu("euclidaisy"); + + List cats = BotaniaAPI.getAllCategories(); + LexiconCategory functional = null; + for(LexiconCategory cat : cats){ + if(cat.getUnlocalizedName().equals("botania.category.functionalFlowers")) + functional = cat; + } + SubTileEuclidaisy.lexicon = new ForbiddenLexicon("euclidaisy", functional); + + SubTileEuclidaisy.lexicon.addPage(BotaniaAPI.internalHandler.textPage("forbidden.lexicon.euclidaisy.0")); + + ItemStack euclidaisy = new ItemStack(specialFlower, 1, 0); + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("type", "euclidaisy"); + euclidaisy.setTagCompound(tag); + + InfusionRecipe euclid = ThaumcraftApi.addInfusionCraftingRecipe("EUCLIDAISY", euclidaisy, 8, (new AspectList()).add(Aspect.AURA, 8).add(Aspect.ELDRITCH, 10).add(Aspect.MAGIC, 8), new ItemStack(flower, 1, 6), new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(resource, 1, 8), new ItemStack(resource, 1, 6), new ItemStack(manaPetal, 1, 6), new ItemStack(manaPetal, 1, 6), new ItemStack(rune, 1, 12), new ItemStack(rune, 1, 11) }); + (new DarkResearchItem("EUCLIDAISY", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.PLANT, 8).add(Aspect.MAGIC, 4).add(Aspect.AURA, 12), -7, 5, 3, euclidaisy)).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.EUCLIDAISY.1"), new ResearchPage(euclid) }).setParents(new String[] { "INFAUXSION" }).setConcealed().registerResearchItem(); + } catch (Throwable e) { LogHandler.log(Level.INFO, e, "Forbidden Magic: Botania? Do you wanna build a snowman?"); botan = false; diff --git a/src/main/java/fox/spiteful/forbidden/compat/DarkSignature.java b/src/main/java/fox/spiteful/forbidden/compat/DarkSignature.java new file mode 100644 index 0000000..1874da9 --- /dev/null +++ b/src/main/java/fox/spiteful/forbidden/compat/DarkSignature.java @@ -0,0 +1,35 @@ +package fox.spiteful.forbidden.compat; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import vazkii.botania.api.subtile.signature.SubTileSignature; + +public class DarkSignature extends SubTileSignature { + String name; + IIcon icon; + + public DarkSignature(String nombre){ + name = nombre; + } + + @Override + public void registerIcons(IIconRegister reg){ + icon = reg.registerIcon("forbidden:" + name); + } + + @Override + public IIcon getIconForStack(ItemStack item){ + return icon; + } + + @Override + public String getUnlocalizedNameForStack(ItemStack item){ + return "tile.darkflower." + name + ".name"; + } + + @Override + public String getUnlocalizedLoreTextForStack(ItemStack item){ + return "tile.darkflower." + name + ".lore"; + } +} diff --git a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java new file mode 100644 index 0000000..575bdf9 --- /dev/null +++ b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java @@ -0,0 +1,25 @@ +package fox.spiteful.forbidden.compat; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.IAddonEntry; +import vazkii.botania.api.lexicon.LexiconCategory; +import vazkii.botania.api.lexicon.LexiconEntry; + +public class ForbiddenLexicon extends LexiconEntry implements IAddonEntry { + + + public ForbiddenLexicon(String name, LexiconCategory category){ + super(name, category); + BotaniaAPI.addEntry(this, category); + } + + @Override + public String getSubtitle(){ + return "[Forbidden Magic]"; + } + + @Override + public String getUnlocalizedName() { + return "forbidden.lexicon." + super.getUnlocalizedName(); + } +} diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java b/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java index 8e94c33..a446c2c 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java +++ b/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java @@ -10,30 +10,33 @@ import fox.spiteful.forbidden.Config; public class DarkEnchantments { public static Enchantment cluster; - public static Enchantment pigBane; + public static Enchantment wrath; public static Enchantment greedy; public static Enchantment consuming; public static Enchantment educational; public static Enchantment corrupting; - public static Enchantment eternal; + public static Enchantment voidtouched; + public static Enchantment impact; public static void hex() { cluster = new EnchantmentCluster(Config.clusterEnchID); - pigBane = new EnchantmentPigBane(Config.pigBaneEnchID); + wrath = new EnchantmentWrath(Config.wrathEnchID); greedy = new EnchantmentGreedy(Config.greedyEnchID); consuming = new EnchantmentConsuming(Config.consumingEnchID); educational = new EnchantmentEducational(Config.educationalEnchID); corrupting = new EnchantmentCorrupting(Config.corruptingEnchID); - eternal = new EnchantmentEternal(Config.eternalEnchID); + voidtouched = new EnchantmentVoid(Config.voidEnchID); + impact = new EnchantmentImpact(Config.impactEnchID); if (Compat.tt) { try { - EnchantmentManager.registerExponentialCostData(pigBane, "forbidden:textures/misc/pigbane.png", false, (new AspectList()).add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1), "PIGBANE"); + EnchantmentManager.registerExponentialCostData(wrath, "forbidden:textures/misc/pigbane.png", false, (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6), "WRATH"); EnchantmentManager.registerExponentialCostData(cluster, "forbidden:textures/misc/lucrative.png", false, (new AspectList()).add(Aspect.FIRE, 5).add(Aspect.EARTH, 5).add(Aspect.ORDER, 5), "CLUSTER"); EnchantmentManager.registerExponentialCostData(greedy, "forbidden:textures/misc/greedy.png", false, (new AspectList()).add(Aspect.ENTROPY, 50).add(Aspect.EARTH, 30).add(Aspect.ORDER, 20), "GREEDY"); EnchantmentManager.registerExponentialCostData(educational, "forbidden:textures/misc/educational.png", false, new AspectList().add(Aspect.AIR, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 15).add(Aspect.ENTROPY, 15), "EDUCATIONAL"); EnchantmentManager.registerExponentialCostData(consuming, "forbidden:textures/misc/consuming.png", false, (new AspectList()).add(Aspect.ENTROPY, 10), "CONSUMING"); EnchantmentManager.registerExponentialCostData(corrupting, "forbidden:textures/misc/corrupting.png", false, (new AspectList()).add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 15).add(Aspect.EARTH, 10), "CORRUPTING"); + EnchantmentManager.registerExponentialCostData(voidtouched, "forbidden:textures/misc/voidtouched.png", false, (new AspectList()).add(Aspect.ENTROPY, 70), "VOIDTOUCHED"); } catch (Throwable e) { } } diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java new file mode 100644 index 0000000..9b72c78 --- /dev/null +++ b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java @@ -0,0 +1,41 @@ +package fox.spiteful.forbidden.enchantments; + +import fox.spiteful.forbidden.items.ItemMorphAxe; +import fox.spiteful.forbidden.items.ItemMorphPickaxe; +import fox.spiteful.forbidden.items.ItemMorphShovel; +import fox.spiteful.forbidden.items.ItemMorphSword; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnumEnchantmentType; +import net.minecraft.item.ItemStack; + +public class EnchantmentImpact extends Enchantment { + public EnchantmentImpact(int id) { + super(id, 0, EnumEnchantmentType.digger); + setName("impact"); + } + + @Override + public int getMaxLevel() { + return 1; + } + + @Override + public int getMinEnchantability(int par1) { + return 30; + } + + @Override + public int getMaxEnchantability(int par1) { + return super.getMinEnchantability(par1) + 10; + } + + @Override + public boolean canApply(ItemStack item) { + return (item.getItem() instanceof ItemMorphPickaxe || item.getItem() instanceof ItemMorphShovel); + } + + @Override + public boolean canApplyAtEnchantingTable(ItemStack stack) { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentPigBane.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentPigBane.java deleted file mode 100644 index 998a785..0000000 --- a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentPigBane.java +++ /dev/null @@ -1,47 +0,0 @@ -package fox.spiteful.forbidden.enchantments; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnumEnchantmentType; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.entity.passive.EntityPig; -import net.minecraft.item.ItemStack; - -public class EnchantmentPigBane extends Enchantment { - public EnchantmentPigBane(int id) { - super(id, 0, EnumEnchantmentType.weapon); - setName("pigbane"); - } - - @Override - public int getMaxLevel() { - return 5; - } - - @Override - public int getMinEnchantability(int par1) { - return 1 + (par1 - 1) * 8; - } - - @Override - public int getMaxEnchantability(int par1) { - return this.getMinEnchantability(par1) + 20; - } - - @Override - public boolean canApplyTogether(Enchantment ench) { - return super.canApplyTogether(ench) && ench.effectId != Enchantment.sharpness.effectId && ench.effectId != Enchantment.smite.effectId && ench.effectId != Enchantment.baneOfArthropods.effectId; - } - - public float calcModifierLiving(int level, EntityLivingBase victim) { - if (victim instanceof EntityPig || victim instanceof EntityPigZombie) - return (float) level * 4.0F; - else - return 0.0F; - } - - @Override - public boolean canApplyAtEnchantingTable(ItemStack stack) { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentEternal.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentVoid.java similarity index 70% rename from src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentEternal.java rename to src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentVoid.java index 0e656f4..1ac4ed9 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentEternal.java +++ b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentVoid.java @@ -9,10 +9,10 @@ import net.minecraft.item.ItemStack; import fox.spiteful.forbidden.items.ItemMorphShovel; -public class EnchantmentEternal extends Enchantment { - public EnchantmentEternal(int id) { +public class EnchantmentVoid extends Enchantment { + public EnchantmentVoid(int id) { super(id, 0, EnumEnchantmentType.digger); - setName("eternal"); + setName("voidtouched"); } @Override @@ -22,17 +22,12 @@ public class EnchantmentEternal extends Enchantment { @Override public int getMinEnchantability(int par1) { - return 70; + return 30; } @Override public int getMaxEnchantability(int par1) { - return super.getMinEnchantability(par1) + 50; - } - - @Override - public boolean canApplyTogether(Enchantment ench) { - return super.canApplyTogether(ench) && ench.effectId != Enchantment.unbreaking.effectId && ench.effectId != DarkEnchantments.educational.effectId; + return super.getMinEnchantability(par1) + 30; } @Override diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentWrath.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentWrath.java new file mode 100644 index 0000000..13d0bad --- /dev/null +++ b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentWrath.java @@ -0,0 +1,61 @@ +package fox.spiteful.forbidden.enchantments; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnumEnchantmentType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.item.ItemAxe; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; + +public class EnchantmentWrath extends Enchantment +{ + public EnchantmentWrath(int id) + { + super(id, 0, EnumEnchantmentType.weapon); + setName("wrath"); + } + + /** + * Returns the minimal value of enchantability needed on the enchantment level passed. + */ + public int getMinEnchantability(int level) + { + return 5 + (level - 1) * 11; + } + + /** + * Returns the maximum value of enchantability nedded on the enchantment level passed. + */ + public int getMaxEnchantability(int level) + { + return this.getMinEnchantability(level) + 20; + } + + /** + * Returns the maximum level that the enchantment can have. + */ + public int getMaxLevel() + { + return 5; + } + + //Amount of bonus damage added by the enchant on hit + public float func_152376_a(int level, EnumCreatureAttribute target) + { + return (float)level * 1.25F; + } + + public boolean canApply(ItemStack stack) + { + return stack.getItem() instanceof ItemAxe ? true : super.canApply(stack); + } + + //Effect that enchant does on hit + public void func_151368_a(EntityLivingBase wut, Entity who, int level) + { + + } +} \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java index 1f3fef7..c8e520c 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java @@ -17,8 +17,9 @@ import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.IWarpingGear; -public class ItemDivineOrb extends Item implements IBloodOrb, IBindable { +public class ItemDivineOrb extends Item implements IBloodOrb, IBindable, IWarpingGear { public ItemDivineOrb() { setCreativeTab(Forbidden.tab); AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(this), 5, 140); @@ -76,4 +77,8 @@ public class ItemDivineOrb extends Item implements IBloodOrb, IBindable { public int getOrbLevel() { return 5; } + + public int getWarp(ItemStack itemstack, EntityPlayer player) { + return 5; + } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphAxe.java b/src/main/java/fox/spiteful/forbidden/items/ItemMorphAxe.java index 2476dd2..e3bb336 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphAxe.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemMorphAxe.java @@ -3,6 +3,8 @@ package fox.spiteful.forbidden.items; import fox.spiteful.forbidden.Forbidden; import net.minecraft.client.renderer.texture.IIconRegister; 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; import net.minecraft.item.ItemAxe; @@ -17,8 +19,9 @@ import fox.spiteful.forbidden.enchantments.DarkEnchantments; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.IWarpingGear; -public class ItemMorphAxe extends ItemAxe implements IRepairable { +public class ItemMorphAxe extends ItemAxe implements IRepairable, IWarpingGear { public IIcon[] icon; public ItemMorphAxe(ToolMaterial enumtoolmaterial) { @@ -112,11 +115,19 @@ public class ItemMorphAxe extends ItemAxe implements IRepairable { return true; } - public void setDamage(ItemStack stack, int damage) { - if (EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) - super.setDamage(stack, 0); - else - super.setDamage(stack, damage); - } + public void onUpdate(ItemStack stack, World world, Entity entity, int fuckObfuscation, boolean fuckObfuscation2) { + super.onUpdate(stack, world, entity, fuckObfuscation, fuckObfuscation2); + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, stack) > 0 && stack.isItemDamaged() && entity != null && entity.ticksExisted % 10 == 0 && entity instanceof EntityLivingBase) { + stack.damageItem(-1, (EntityLivingBase)entity); + } + + } + + public int getWarp(ItemStack itemstack, EntityPlayer player) { + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, itemstack) > 0) + return 1; + else + return 0; + } } diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphPickaxe.java b/src/main/java/fox/spiteful/forbidden/items/ItemMorphPickaxe.java index d261ac7..ab1862f 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphPickaxe.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemMorphPickaxe.java @@ -1,15 +1,27 @@ package fox.spiteful.forbidden.items; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.play.client.C07PacketPlayerDigging; +import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import thaumcraft.api.IRepairable; import fox.spiteful.forbidden.Forbidden; @@ -17,8 +29,9 @@ import fox.spiteful.forbidden.enchantments.DarkEnchantments; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.IWarpingGear; -public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable { +public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpingGear { public IIcon[] icon; public ItemMorphPickaxe(ToolMaterial enumtoolmaterial) { @@ -117,11 +130,151 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable { return true; } - @Override - public void setDamage(ItemStack stack, int damage) { - if (EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) - super.setDamage(stack, 0); - else - super.setDamage(stack, damage); - } + public void onUpdate(ItemStack stack, World world, Entity entity, int fuckObfuscation, boolean fuckObfuscation2) { + super.onUpdate(stack, world, entity, fuckObfuscation, fuckObfuscation2); + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, stack) > 0 && stack.isItemDamaged() && entity != null && entity.ticksExisted % 10 == 0 && entity instanceof EntityLivingBase) { + stack.damageItem(-1, (EntityLivingBase)entity); + } + + } + + public int getWarp(ItemStack itemstack, EntityPlayer player) { + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, itemstack) > 0) + return 1; + else + return 0; + } + + //Public Domain AOE code courtesy of Tinkers Construct's authors + + @Override + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + // only effective materials matter. We don't want to aoe when beraking dirt with a hammer. + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.impact.effectId, stack) <= 0) + return super.onBlockStartBreak(stack, x, y, z, player); + Block block = player.worldObj.getBlock(x,y,z); + int meta = player.worldObj.getBlockMetadata(x,y,z); + if(block == null || !ForgeHooks.isToolEffective(stack, block, meta)) + return super.onBlockStartBreak(stack, x,y,z, player); + MovingObjectPosition mop = raytraceFromEntity(player.worldObj, player, false, 4.5d); + if(mop == null) + return super.onBlockStartBreak(stack, x,y,z, player); + int sideHit = mop.sideHit; + //int sideHit = Minecraft.getMinecraft().objectMouseOver.sideHit; + // we successfully destroyed a block. time to do AOE! + int xRange = 1; + int yRange = 1; + int zRange = 0; + switch (sideHit) { + case 0: + case 1: + yRange = 0; + zRange = 1; + break; + case 2: + case 3: + xRange = 1; + zRange = 0; + break; + case 4: + case 5: + xRange = 0; + zRange = 1; + break; + } + for (int xPos = x - xRange; xPos <= x + xRange; xPos++) + for (int yPos = y - yRange; yPos <= y + yRange; yPos++) + for (int zPos = z - zRange; zPos <= z + zRange; zPos++) { + // don't break the originally already broken block, duh + if (xPos == x && yPos == y && zPos == z) + continue; + breakExtraBlock(player.worldObj, stack, xPos, yPos, zPos, sideHit, player, x,y,z); + } + return super.onBlockStartBreak(stack, x, y, z, player); + } + + public static MovingObjectPosition raytraceFromEntity (World world, Entity player, boolean par3, double range) + { + float f = 1.0F; + float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f; + float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; + double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; + double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f; + if (!world.isRemote && player instanceof EntityPlayer) + d1 += 1.62D; + double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; + Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); + float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); + float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); + float f5 = -MathHelper.cos(-f1 * 0.017453292F); + float f6 = MathHelper.sin(-f1 * 0.017453292F); + float f7 = f4 * f5; + float f8 = f3 * f5; + double d3 = range; + if (player instanceof EntityPlayerMP) + { + d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance(); + } + Vec3 vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3); + return world.func_147447_a(vec3, vec31, par3, !par3, par3); + } + + protected void breakExtraBlock(World world, ItemStack stack, int x, int y, int z, int sidehit, EntityPlayer player, int refX, int refY, int refZ) { + // prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events + if (world.isAirBlock(x, y, z)) + return; + // check if the block can be broken, since extra block breaks shouldn't instantly break stuff like obsidian + // or precious ores you can't harvest while mining stone + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + // only effective materials + if (!ForgeHooks.isToolEffective(stack, block, meta)) + return; + Block refBlock = world.getBlock(refX, refY, refZ); + float refStrength = ForgeHooks.blockStrength(refBlock, player, world, refX, refY, refZ); + float strength = ForgeHooks.blockStrength(block, player, world, x,y,z); + // only harvestable blocks that aren't impossibly slow to harvest + if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f) + return; + if (player.capabilities.isCreativeMode) { + block.onBlockHarvested(world, x, y, z, meta, player); + if (block.removedByPlayer(world, player, x, y, z, false)) + block.onBlockDestroyedByPlayer(world, x, y, z, meta); + // send update to client + if (!world.isRemote) { + ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); + } + return; + } + // server sided handling + if (!world.isRemote) { + // serverside we reproduce ItemInWorldManager.tryHarvestBlock + // ItemInWorldManager.removeBlock + block.onBlockHarvested(world, x,y,z, meta, player); + if(block.removedByPlayer(world, player, x,y,z, true)) // boolean is if block can be harvested, checked above + { + block.onBlockDestroyedByPlayer( world, x,y,z, meta); + block.harvestBlock(world, player, x,y,z, meta); + } + // always send block update to client + EntityPlayerMP mpPlayer = (EntityPlayerMP) player; + mpPlayer.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); + } + // client sided handling + else { + PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController; + // clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send any new packets + // the code above, executed on the server, sends a block-updates that give us the correct state of the block we destroy. + // following code can be found in PlayerControllerMP.onPlayerDestroyBlock + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + if(block.removedByPlayer(world, player, x,y,z)) + { + block.onBlockDestroyedByPlayer(world, x,y,z, meta); + } + pcmp.onPlayerDestroyBlock(x, y, z, sidehit); + // send an update to the server, so we get an update back + //if(PHConstruct.extraBlockUpdates) + Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x,y,z, Minecraft.getMinecraft().objectMouseOver.sideHit)); + } + } } diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphShovel.java b/src/main/java/fox/spiteful/forbidden/items/ItemMorphShovel.java index 9546dbf..a83d6d6 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphShovel.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemMorphShovel.java @@ -2,22 +2,33 @@ package fox.spiteful.forbidden.items; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.enchantments.DarkEnchantments; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.play.client.C07PacketPlayerDigging; +import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import thaumcraft.api.IRepairable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.IWarpingGear; -public class ItemMorphShovel extends ItemSpade implements IRepairable { +public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingGear { public IIcon[] icon; public ItemMorphShovel(ToolMaterial enumtoolmaterial) { @@ -111,12 +122,126 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable { return true; } - @Override - public void setDamage(ItemStack stack, int damage) { - if (EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) - super.setDamage(stack, 0); - else - super.setDamage(stack, damage); - } + public void onUpdate(ItemStack stack, World world, Entity entity, int fuckObfuscation, boolean fuckObfuscation2) { + super.onUpdate(stack, world, entity, fuckObfuscation, fuckObfuscation2); + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, stack) > 0 && stack.isItemDamaged() && entity != null && entity.ticksExisted % 10 == 0 && entity instanceof EntityLivingBase) { + stack.damageItem(-1, (EntityLivingBase)entity); + } + + } + + public int getWarp(ItemStack itemstack, EntityPlayer player) { + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, itemstack) > 0) + return 1; + else + return 0; + } + + //Public Domain AOE code courtesy of Tinkers Construct's authors + + @Override + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + // only effective materials matter. We don't want to aoe when beraking dirt with a hammer. + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.impact.effectId, stack) <= 0) + return super.onBlockStartBreak(stack, x, y, z, player); + Block block = player.worldObj.getBlock(x,y,z); + int meta = player.worldObj.getBlockMetadata(x,y,z); + if(block == null || !ForgeHooks.isToolEffective(stack, block, meta)) + return super.onBlockStartBreak(stack, x,y,z, player); + MovingObjectPosition mop = ItemMorphPickaxe.raytraceFromEntity(player.worldObj, player, false, 4.5d); + if(mop == null) + return super.onBlockStartBreak(stack, x,y,z, player); + int sideHit = mop.sideHit; + //int sideHit = Minecraft.getMinecraft().objectMouseOver.sideHit; + // we successfully destroyed a block. time to do AOE! + int xRange = 1; + int yRange = 1; + int zRange = 0; + switch (sideHit) { + case 0: + case 1: + yRange = 0; + zRange = 1; + break; + case 2: + case 3: + xRange = 1; + zRange = 0; + break; + case 4: + case 5: + xRange = 0; + zRange = 1; + break; + } + for (int xPos = x - xRange; xPos <= x + xRange; xPos++) + for (int yPos = y - yRange; yPos <= y + yRange; yPos++) + for (int zPos = z - zRange; zPos <= z + zRange; zPos++) { + // don't break the originally already broken block, duh + if (xPos == x && yPos == y && zPos == z) + continue; + breakExtraBlock(player.worldObj, stack, xPos, yPos, zPos, sideHit, player, x,y,z); + } + return super.onBlockStartBreak(stack, x, y, z, player); + } + + protected void breakExtraBlock(World world, ItemStack stack, int x, int y, int z, int sidehit, EntityPlayer player, int refX, int refY, int refZ) { + // prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events + if (world.isAirBlock(x, y, z)) + return; + // check if the block can be broken, since extra block breaks shouldn't instantly break stuff like obsidian + // or precious ores you can't harvest while mining stone + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + // only effective materials + if (!ForgeHooks.isToolEffective(stack, block, meta)) + return; + Block refBlock = world.getBlock(refX, refY, refZ); + float refStrength = ForgeHooks.blockStrength(refBlock, player, world, refX, refY, refZ); + float strength = ForgeHooks.blockStrength(block, player, world, x,y,z); + // only harvestable blocks that aren't impossibly slow to harvest + if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f) + return; + if (player.capabilities.isCreativeMode) { + block.onBlockHarvested(world, x, y, z, meta, player); + if (block.removedByPlayer(world, player, x, y, z, false)) + block.onBlockDestroyedByPlayer(world, x, y, z, meta); + // send update to client + if (!world.isRemote) { + ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); + } + return; + } + // server sided handling + if (!world.isRemote) { + // serverside we reproduce ItemInWorldManager.tryHarvestBlock + // ItemInWorldManager.removeBlock + block.onBlockHarvested(world, x,y,z, meta, player); + if(block.removedByPlayer(world, player, x,y,z, true)) // boolean is if block can be harvested, checked above + { + block.onBlockDestroyedByPlayer( world, x,y,z, meta); + block.harvestBlock(world, player, x,y,z, meta); + } + // always send block update to client + EntityPlayerMP mpPlayer = (EntityPlayerMP) player; + mpPlayer.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); + } + // client sided handling + else { + PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController; + // clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send any new packets + // the code above, executed on the server, sends a block-updates that give us the correct state of the block we destroy. + // following code can be found in PlayerControllerMP.onPlayerDestroyBlock + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + if(block.removedByPlayer(world, player, x,y,z)) + { + block.onBlockDestroyedByPlayer(world, x,y,z, meta); + } + pcmp.onPlayerDestroyBlock(x, y, z, sidehit); + // send an update to the server, so we get an update back + //if(PHConstruct.extraBlockUpdates) + Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x,y,z, Minecraft.getMinecraft().objectMouseOver.sideHit)); + } + } } diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphSword.java b/src/main/java/fox/spiteful/forbidden/items/ItemMorphSword.java index 142e230..a0301ef 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphSword.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemMorphSword.java @@ -3,6 +3,8 @@ package fox.spiteful.forbidden.items; import fox.spiteful.forbidden.Forbidden; import net.minecraft.client.renderer.texture.IIconRegister; 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; import net.minecraft.item.ItemStack; @@ -17,8 +19,9 @@ import fox.spiteful.forbidden.enchantments.DarkEnchantments; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.IWarpingGear; -public class ItemMorphSword extends ItemSword implements IRepairable { +public class ItemMorphSword extends ItemSword implements IRepairable, IWarpingGear { public IIcon[] icon; public ItemMorphSword(ToolMaterial enumtoolmaterial) { @@ -113,11 +116,18 @@ public class ItemMorphSword extends ItemSword implements IRepairable { return true; } - @Override - public void setDamage(ItemStack stack, int damage) { - if (EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) - super.setDamage(stack, 0); - else - super.setDamage(stack, damage); - } + public void onUpdate(ItemStack stack, World world, Entity entity, int fuckObfuscation, boolean fuckObfuscation2) { + super.onUpdate(stack, world, entity, fuckObfuscation, fuckObfuscation2); + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, stack) > 0 && stack.isItemDamaged() && entity != null && entity.ticksExisted % 10 == 0 && entity instanceof EntityLivingBase) { + stack.damageItem(-1, (EntityLivingBase)entity); + } + + } + + public int getWarp(ItemStack itemstack, EntityPlayer player) { + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.voidtouched.effectId, itemstack) > 0) + return 1; + else + return 0; + } } diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java index 1feda27..8a1a9c1 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java @@ -67,12 +67,12 @@ public class ItemWandCores extends Item { ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("orichalcum")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("neutronium_staff")); list.add(wand); - if (Compat.pb) { + /*if (Compat.pb) { wand = ItemApi.getItem("itemWandCasting", 84); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("soul")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("soul")); list.add(wand); - } + }*/ if (Compat.bm) { wand = ItemApi.getItem("itemWandCasting", 84); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("alchemical")); @@ -93,12 +93,6 @@ public class ItemWandCores extends Item { ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("witchwood_staff")); list.add(wand); } - if (Compat.totes) { - wand = ItemApi.getItem("itemWandCasting", 24); - ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("thaumium")); - ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("totem")); - list.add(wand); - } if (Compat.botan) { wand = ItemApi.getItem("itemWandCasting", 84); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("manasteel")); diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java index 6f1d710..daf452a 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java @@ -1,11 +1,14 @@ package fox.spiteful.forbidden.items.wands; +import am2.api.ArsMagicaApi; +import am2.api.IExtendedProperties; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.wands.IWandRodOnUpdate; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.common.items.wands.ItemWandCasting; public class ManaWandUpdate implements IWandRodOnUpdate { @@ -18,8 +21,7 @@ public class ManaWandUpdate implements IWandRodOnUpdate { try { - //TODO: Readd Ars Magica - /* IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player); + IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player); float cost; if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("vinteum")) @@ -39,7 +41,7 @@ public class ManaWandUpdate implements IWandRodOnUpdate { ((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true); } } - } */ + } } catch(Throwable e){} } diff --git a/src/main/java/fox/spiteful/forbidden/tiles/SubTileEuclidaisy.java b/src/main/java/fox/spiteful/forbidden/tiles/SubTileEuclidaisy.java new file mode 100644 index 0000000..162c93d --- /dev/null +++ b/src/main/java/fox/spiteful/forbidden/tiles/SubTileEuclidaisy.java @@ -0,0 +1,72 @@ +package fox.spiteful.forbidden.tiles; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.config.ConfigItems; +import thaumcraft.common.items.ItemWispEssence; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.SubTileFunctional; + +public class SubTileEuclidaisy extends SubTileFunctional { + private static final int cost = 9000; + public static LexiconEntry lexicon; + + @Override + public void onUpdate(){ + super.onUpdate(); + + if(redstoneSignal > 0) + return; + + if(mana >= cost && !supertile.getWorldObj().isRemote && supertile.getWorldObj().getTotalWorldTime() % 400 == 0) { + Thaumcraft.proxy.burst(supertile.getWorldObj(), (double)supertile.xCoord + 0.5D, (double)supertile.yCoord + 0.5D, (double)supertile.zCoord + 0.5D, 1.0F); + AspectList aspect; + if(supertile.getWorldObj().rand.nextInt(10) < 4) + aspect = (new AspectList()).add(Aspect.AURA, 2); + else { + Aspect[] aspects = Aspect.aspects.values().toArray(new Aspect[0]); + aspect = (new AspectList()).add(aspects[supertile.getWorldObj().rand.nextInt(aspects.length)], 2); + } + ItemStack ess = new ItemStack(ConfigItems.itemWispEssence); + ((ItemWispEssence)ess.getItem()).setAspects(ess, aspect); + dropItem(supertile.getWorldObj(), supertile.xCoord, supertile.yCoord, supertile.zCoord, ess); + mana -= cost; + sync(); + } + } + + public void dropItem(World world, int x, int y, int z, ItemStack item){ + float f = 0.7F; + double d0 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, (double)x + d0, (double)y + d1, (double)z + d2, item); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } + + @Override + public int getColor(){ + return 0xFF8CFF; + } + + @Override + public int getMaxMana() { + return cost; + } + + @Override + public boolean acceptsRedstone() { + return true; + } + + @Override + public LexiconEntry getEntry(){ + return lexicon; + } +} diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang index f28a4f8..bd3a9fa 100644 --- a/src/main/resources/assets/forbidden/lang/en_US.lang +++ b/src/main/resources/assets/forbidden/lang/en_US.lang @@ -80,15 +80,17 @@ tile.InkFlower.name=Umbral Rose tile.WrathCage.name=Wrath Cage tile.StarBlock.name=Nether Star Block tile.blackRoseBush.name=Umbral Rose Bush +tile.darkflower.euclidaisy.name=Euclidaisy # # Enchantments enchantment.cluster=Fiery Core -enchantment.pigbane=Porcivore +enchantment.wrath=Wrath enchantment.greedy=Capitalist enchantment.consuming=Consuming enchantment.educational=Educational enchantment.corrupting=Corrupting -enchantment.eternal=Eternal +enchantment.voidtouched=Voidtouched +enchantment.impact=Impact # # Potions potion.blood_seal=Blood Seal @@ -97,6 +99,8 @@ potion.blood_seal=Blood Seal itemGroup.forbidden=Forbidden Magic itemGroup.mobcrystal=Imprinting Crystals tc.research_category.FORBIDDEN=Apocrypha +forbidden.lexicon.euclidaisy=Euclidaisy +forbidden.lexicon.euclidaisy.0=The eerie, pink &1Euclidaisy&0 is an oddity. It uses large amounts of mana to conjure some sort of ethereal substance that only seems useful to thaumaturges.
The method of creating one doesn't appear to be common knowledge. Try consulting a Thaumonomicon? # # Research forbidden.research_name.NETHERSHARDS=Nether Shards @@ -204,6 +208,10 @@ forbidden.research_name.CLUSTER=Enchantment: Fiery Core forbidden.research_text.CLUSTER=Chameleon of the Core forbidden.research_page.CLUSTER.1=You've discovered an enchantment to allow the Chameleon Pickaxe to imitate the effects of the Pickaxe of the Core. A Chameleon Pickaxe with the Fiery Core enchantment has a chance of dropping clusters when mining certain ores. Clusters are a lot purer than raw ore and can be smelted for two of the ore's normal smelting result. Higher levels of Fiery Core increase the chance of dropping clusters. # +forbidden.research_name.IMPACT=Enchantment: Impact +forbidden.research_text.IMPACT=Someday that wall is gonna fall. +forbidden.research_page.IMPACT.1=Some other tools have a much broader area of effect when mining. With the Impact enchantment, so can your Chameleon Pickaxe and Shovel.

A Chameleon Tool with the Impact enchantment mines a 3 x 3 area of blocks instead of just one, making exploratory mining and flattening areas much easier. +# forbidden.research_name.GREEDY=Enchantment: Capitalist forbidden.research_text.GREEDY=Unregulated enchanting forbidden.research_page.GREEDY.1=You've discovered a weapon enchantment that allows you to profit from taking lives. Every time a Capitalist weapon slays a hostile creature, there's a chance to drop an Emerald Fragment. If a Capitalist Weapon is used to kill a villager, it will instead drop one of the villager's emeralds. @@ -212,9 +220,9 @@ forbidden.research_name.CONSUMING=Enchantment: Consuming forbidden.research_text.CONSUMING=Garbage Disposal forbidden.research_page.CONSUMING.1=Sick of having to empty your pack of worthless junk, you've devised an enchantment that will automatically destroy common, unwanted materials. Any Cobblestone, Dirt, Gravel, or Netherrack mined by a Consuming tool will be destroyed instead of falling to the ground. # -forbidden.research_name.PIGBANE=Enchantment: Porcivore -forbidden.research_text.PIGBANE=Show those Zombie Pigmen who's at the top of the food chain! -forbidden.research_page.PIGBANE.1=Zombie Pigmen think they're so great. They're always stomping around the Nether ganging up on innocent travelers. It's time someone put a stop to them.

Weapons with the Porcivore enchantment will do excessive amounts of damage to Pigs and Zombie Pigmen. +forbidden.research_name.WRATH=Enchantment: Wrath +forbidden.research_text.WRATH=When every problem is a nail, all you want is a bigger hammer. +forbidden.research_page.WRATH.1=Ugh. You need more excessively violent weapons to kill things with. Enchanting is a good start, but there's only so much Sharpness you can squeeze into a typical sword before it starts to liquefy and sprout daisies instead. Your weapons just aren't killing things hard enough.

To amend this, you've created a special enchantment to force even more violence and death into a weapon. The Wrath enchantment increases the offensive power of a weapon, but is still compatible with Sharpness, Bane of Arthropods, and Smite. # forbidden.research_name.EDUCATIONAL=Enchantment: Educational forbidden.research_text.EDUCATIONAL=You will LEARN! @@ -224,9 +232,9 @@ forbidden.research_name.CORRUPTING=Enchantment: Corrupting forbidden.research_text.CORRUPTING=A bad influence on shards forbidden.research_page.CORRUPTING.1=The Nether is great and all, but it's also kind of a... Hell Hole.

The Corrupting enchant allows you to harvest Nether Shards without having to be in the Nether. A pickaxe enchanted with Corrupting will randomly corrupt harvested elemental shards, changing them into nether shards. The shards only seem susceptible while they are encased in infused stone, so corrupting a shard cluster will have no effect. # -forbidden.research_name.ETERNAL=Enchantment: Eternal -forbidden.research_text.ETERNAL=Chameleon Gods -forbidden.research_page.ETERNAL.1=Ichorium Tools are really great. You sure wish your Chameleon Tools could be more like them. Maybe they can...

The Eternal enchant gives a Chameleon Tool the same unbreakable quality as Ichorium Tools. +forbidden.research_name.VOIDTOUCHED=Enchantment: Voidtouched +forbidden.research_text.VOIDTOUCHED=Colour Out of Space +forbidden.research_page.VOIDTOUCHED.1=Voidmetal's ability to flow back into place after being damaged is fascinating. You sure wish your Chameleon Tools had the same properties...

The Voidtouched enchant gives a Chameleon Tool the same regenerating quality as Void Tools.

Chameleon Tools affected by the enchantment appear to be made of living scaled flesh which morphs back into shape when hurt. Just looking at it is disturbing for your sanity. # forbidden.research_name.TAINTBASICS=Tainted Lands forbidden.research_text.TAINTBASICS=Deep Purple @@ -257,7 +265,7 @@ forbidden.research_name.HELLFIRE=Lord of Hellfire forbidden.research_text.HELLFIRE=Never get stranded again forbidden.research_page.HELLFIRE.1=Getting stranded in the Nether is the worst. You go through all the trouble of grabbing what you need, but before you can go home, some stupid ghast decides to rain on your parade by blasting the portal shut. Sure, this can be amended by carrying a flint and steel around, but who actually walks around with those things?

You've discovered a way to use vis in your wand to light fires on certain materials. Right click with a focus-less wand in your hand on the top of netherrack or obsidian to light a flame using some Ignis from your wand. # -forbidden.research_name.DIVINEWELL=Scribing Tools of Thoth -forbidden.research_text.DIVINEWELL=Mightier Than The Sword -forbidden.research_page.DIVINEWELL.1=After researching every last shred of knowledge in the entire cosmos, you've finally uncovered the secret to never refilling your inkwell.

The Scribing Tools of Thoth will never run out of ink.

You sure wish you could've discovered this earlier... +forbidden.research_name.EUCLIDAISY=Euclidaisy +forbidden.research_text.EUCLIDAISY=Mai waifu's power level is over 9000 in the name of the moon! Believe it! +forbidden.research_page.EUCLIDAISY.1=Ethereal Essences are extremely useful sources of essentia and are a very important ingredient in Thaumaturge's Salt. Unfortunately, it can be very difficult to come by. Wisps aren't exactly common, and no self-respecting thaumaturge wants to stoop to smashing open a node.

By combining thaumaturgy and hedge magic, you've created a flower that can use mana to rip open the fabric of reality. The rip isn't stable enough to form a node, but it does stay open long enough to drop a single wispy strand of essence. Applying a redstone signal to the flower causes it to stop. # \ No newline at end of file diff --git a/src/main/resources/assets/forbidden/textures/blocks/euclidaisy.png b/src/main/resources/assets/forbidden/textures/blocks/euclidaisy.png new file mode 100644 index 0000000000000000000000000000000000000000..1fabf6d4ec1361f1eaf8496db50cb384a34bf2cd GIT binary patch literal 555 zcmV+`0@VG9P)N2bPDNB8 zb~7$DE-^7j^FlWO00E~-L_t(IPmNQ{P69y?oWC%h`~nYtfPdgc(L@t(UW6bb0ZqI} zq6ZK93x1#{gUCF#XUggsc3F``56$-MbXQk(Ee3$mh*jcKOwzMd1_Qq3Io}C`&y-*) z&pYN)F=t&qX!wwF5kffw(MZoTO)M5hX;d(X6hPKA0K&pNeF;!WFloe=i89dv-q@MT zOm(^f>-z?vW&+Zza~TQn$XT}qq;8U^xw4QIK=K7q!^UXbg+sjL>6tNP5X5`xj#|eU z^S8}l@#UHcVH9%1!N)t!xw$i0APy^_ParnNF7H)xv~3BITcy@3(tZJs!yKn@n6l)= z&2i{vz*BKn_b}L{@V_ACtJA@uZ)}GLd^F4jNdl0U~jse8&VYw zdd%)A%>`;+IaLE~1jy3~5Y#rE$j$4yYFYg!fU*euDx)p`2VJVSWbq#fTBHEFi}i+o t188Bh%(ba)kc~U2o0Ww|y^~FBz5(o?{%OVvwrl_Z002ovPDHLkV1lRo>mC3A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forbidden/textures/misc/eternal.png b/src/main/resources/assets/forbidden/textures/misc/eternal.png deleted file mode 100644 index 8dfa207ed4c168667214cde3dc930dae225a670e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forbidden/textures/misc/pigbane.png b/src/main/resources/assets/forbidden/textures/misc/pigbane.png deleted file mode 100644 index 05c9e00c900895057c0a09cad6780d5763782d95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1399 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 A2LJ#7 literal 0 HcmV?d00001