diff --git a/build.gradle b/build.gradle index 19a09e5..2f6659c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,18 +15,49 @@ buildscript { } } +repositories { + maven { + name 'DVS1 Maven FS' + url 'http://dvs1.progwml6.com/files/maven' + } + maven { + name 'CB Maven FS' + url "http://chickenbones.net/maven/" + } + ivy { + name "MineTweaker3" + artifactPattern "http://minetweaker3.powerofbytes.com/download/[module]-([classifier]-)[revision].[ext]" + } +} + apply plugin: 'forge' -version = "0.2" -group= "fox.spiteful.avaritia" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "Avaritia" +ext.configFile = file "build.properties" +configFile.withReader { + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +version = config.mc_version + "-" + config.mod_version + "-" + config.build_number +group= config.package_group +archivesBaseName = config.mod_name minecraft { - version = "1.7.10-10.13.3.1408-1.7.10" + version = config.mc_version + "-" + config.forge_version runDir = "eclipse" } dependencies { + compile name: "NotEnoughItems" , group: "codechicken", version: config.mc_version + "-" + config.nei_version, classifier: "dev" + runtime name: "CodeChickenLib" , group: "codechicken", version: config.mc_version + "-" + config.ccl_version, classifier: "dev" + runtime name: "CodeChickenCore" , group: "codechicken", version: config.mc_version + "-" + config.ccc_version, classifier: "dev" + compile name: "MineTweaker3" , group: "minetweaker", version: config.mc_version + "-" + config.minetweaker_version, classifier: "Dev" + + + compile "tconstruct:TConstruct:" + config.mc_version + "-" + config.tconstruct_version + ":deobf" + compile "mantle:Mantle:" + config.mc_version + "-" + config.mantle_version + ":deobf" + compile fileTree(dir: 'lib', include: '*.jar') } diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..347a586 --- /dev/null +++ b/build.properties @@ -0,0 +1,12 @@ +mod_name = Avaritia +package_group = fox.spiteful.avaritia +forge_version = 10.13.4.1448-1.7.10 +nei_version = 1.0.4.107 +ccc_version = 1.0.6.43 +ccl_version = 1.1.3.140 +mod_version = 0.2 +build_number = 1 +mc_version = 1.7.10 +minetweaker_version = 3.0.9C +tconstruct_version = 1.8.7.build979 +mantle_version = 0.3.2.jenkins188 \ No newline at end of file diff --git a/lib/Baubles-deobf-1.7.10-1.0.1.10.jar b/lib/Baubles-deobf-1.7.10-1.0.1.10.jar new file mode 100644 index 0000000..8585569 Binary files /dev/null and b/lib/Baubles-deobf-1.7.10-1.0.1.10.jar differ diff --git a/lib/BloodMagic-dev.jar b/lib/BloodMagic-1.7.10-1.3.3-14-deobf.jar similarity index 81% rename from lib/BloodMagic-dev.jar rename to lib/BloodMagic-1.7.10-1.3.3-14-deobf.jar index 39e5ff9..1dba384 100644 Binary files a/lib/BloodMagic-dev.jar and b/lib/BloodMagic-1.7.10-1.3.3-14-deobf.jar differ diff --git a/lib/Botania r1.7-208-deobf.jar b/lib/Botania r1.7-218-deobf.jar similarity index 90% rename from lib/Botania r1.7-208-deobf.jar rename to lib/Botania r1.7-218-deobf.jar index f64cff4..2b7b8a8 100644 Binary files a/lib/Botania r1.7-208-deobf.jar and b/lib/Botania r1.7-218-deobf.jar differ diff --git a/lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar b/lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar deleted file mode 100644 index 40a38e3..0000000 Binary files a/lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar and /dev/null differ diff --git a/lib/CodeChickenLib-1.7.10-1.1.1.99-universal.jar b/lib/CodeChickenLib-1.7.10-1.1.1.99-universal.jar deleted file mode 100644 index ea57760..0000000 Binary files a/lib/CodeChickenLib-1.7.10-1.1.1.99-universal.jar and /dev/null differ diff --git a/lib/Forbidden Magic-1.7.10-0.53-deobf.jar b/lib/Forbidden Magic-1.7.10-0.562-deobf.jar similarity index 50% rename from lib/Forbidden Magic-1.7.10-0.53-deobf.jar rename to lib/Forbidden Magic-1.7.10-0.562-deobf.jar index 93b303d..2d5b629 100644 Binary files a/lib/Forbidden Magic-1.7.10-0.53-deobf.jar and b/lib/Forbidden Magic-1.7.10-0.562-deobf.jar differ diff --git a/lib/Mantle-1.7.10-0.3.2-deobf.jar b/lib/Mantle-1.7.10-0.3.2-deobf.jar deleted file mode 100644 index c0cd8cd..0000000 Binary files a/lib/Mantle-1.7.10-0.3.2-deobf.jar and /dev/null differ diff --git a/lib/MineTweaker3-Dev-1.7.10-3.0.9C.jar b/lib/MineTweaker3-Dev-1.7.10-3.0.9C.jar deleted file mode 100644 index 7f5b529..0000000 Binary files a/lib/MineTweaker3-Dev-1.7.10-3.0.9C.jar and /dev/null differ diff --git a/lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar b/lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar deleted file mode 100644 index 59aa81f..0000000 Binary files a/lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar and /dev/null differ diff --git a/lib/TConstruct-1.7.10-1.8.5-deobf.jar b/lib/TConstruct-1.7.10-1.8.5-deobf.jar deleted file mode 100644 index c673f1d..0000000 Binary files a/lib/TConstruct-1.7.10-1.8.5-deobf.jar and /dev/null differ diff --git a/lib/Thaumcraft-deobf-1.7.10-4.2.1.4.jar b/lib/Thaumcraft-deobf-1.7.10-4.2.3.5.jar similarity index 75% rename from lib/Thaumcraft-deobf-1.7.10-4.2.1.4.jar rename to lib/Thaumcraft-deobf-1.7.10-4.2.3.5.jar index 51c38bf..e11a630 100644 Binary files a/lib/Thaumcraft-deobf-1.7.10-4.2.1.4.jar and b/lib/Thaumcraft-deobf-1.7.10-4.2.3.5.jar differ diff --git a/src/api/java/vazkii/botania/api/BotaniaAPI.java b/src/api/java/vazkii/botania/BotaniaAPI.java similarity index 97% rename from src/api/java/vazkii/botania/api/BotaniaAPI.java rename to src/api/java/vazkii/botania/BotaniaAPI.java index db7f494..b994afc 100644 --- a/src/api/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/api/java/vazkii/botania/BotaniaAPI.java @@ -94,9 +94,15 @@ public final class BotaniaAPI { public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); + public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", 5, new int[] { 1, 2, 2, 1 }, 18); + public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic"); - public static KnowledgeType basicKnowledge, elvenKnowledge; + public static KnowledgeType basicKnowledge; + public static KnowledgeType elvenKnowledge; + + // This is here for completeness sake, but you shouldn't use it + public static KnowledgeType relicKnowledge; // All of these categories are initialized during botania's PreInit stage. public static LexiconCategory categoryBasics; @@ -117,6 +123,7 @@ public final class BotaniaAPI { basicKnowledge = registerKnowledgeType("minecraft", EnumChatFormatting.RESET, true); elvenKnowledge = registerKnowledgeType("alfheim", EnumChatFormatting.DARK_GREEN, false); + relicKnowledge = registerKnowledgeType("relic", EnumChatFormatting.DARK_PURPLE, false); addOreWeight("oreAluminum", 3940); // Tinkers' Construct addOreWeight("oreAmber", 2075); // Thaumcraft @@ -128,7 +135,8 @@ public final class BotaniaAPI { addOreWeight("oreCoal", 46525); // Vanilla addOreWeight("oreCopper", 8325); // IC2, Thermal Expansion, Tinkers' Construct, etc. addOreWeight("oreDark", 1350); // EvilCraft - addOreWeight("oreDarkIron", 1700); // Factorization + addOreWeight("oreDarkIron", 1700); // Factorization (older versions) + addOreWeight("oreFzDarkIron", 1700); // Factorization (newer versions) addOreWeight("oreDiamond", 1265); // Vanilla addOreWeight("oreEmerald", 780); // Vanilla addOreWeight("oreGalena", 1000); // Factorization @@ -143,8 +151,10 @@ public final class BotaniaAPI { addOreWeight("oreLapis", 1285); // Vanilla addOreWeight("oreLead", 7985); // IC2, Thermal Expansion, Factorization, etc. addOreWeight("oreMCropsEssence", 3085); // Magical Crops + addOreWeight("oreMithril", 8); // Thermal Expansion addOreWeight("oreNickel", 2275); // Thermal Expansion addOreWeight("oreOlivine", 1100); // Project RED + addOreWeight("orePlatinum", 365); // Thermal Expansion addOreWeight("oreRedstone", 6885); // Vanilla addOreWeight("oreRuby", 1100); // Project RED addOreWeight("oreSapphire", 1100); // Project RED diff --git a/src/api/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/api/java/vazkii/botania/boss/IBotaniaBoss.java similarity index 94% rename from src/api/java/vazkii/botania/api/boss/IBotaniaBoss.java rename to src/api/java/vazkii/botania/boss/IBotaniaBoss.java index bc218f6..d337e6a 100644 --- a/src/api/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/api/java/vazkii/botania/boss/IBotaniaBoss.java @@ -12,6 +12,7 @@ package vazkii.botania.api.boss; import java.awt.Rectangle; +import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; @@ -57,5 +58,5 @@ public interface IBotaniaBoss extends IBossDisplayData { * here if needed. */ @SideOnly(Side.CLIENT) - public void bossBarRenderCallback(); + public void bossBarRenderCallback(ScaledResolution res, int x, int y); } diff --git a/src/api/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/api/java/vazkii/botania/boss/IBotaniaBossWithShader.java similarity index 100% rename from src/api/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java rename to src/api/java/vazkii/botania/boss/IBotaniaBossWithShader.java diff --git a/src/api/java/vazkii/botania/api/brew/Brew.java b/src/api/java/vazkii/botania/brew/Brew.java similarity index 100% rename from src/api/java/vazkii/botania/api/brew/Brew.java rename to src/api/java/vazkii/botania/brew/Brew.java diff --git a/src/api/java/vazkii/botania/api/brew/IBrewContainer.java b/src/api/java/vazkii/botania/brew/IBrewContainer.java similarity index 100% rename from src/api/java/vazkii/botania/api/brew/IBrewContainer.java rename to src/api/java/vazkii/botania/brew/IBrewContainer.java diff --git a/src/api/java/vazkii/botania/api/brew/IBrewItem.java b/src/api/java/vazkii/botania/brew/IBrewItem.java similarity index 100% rename from src/api/java/vazkii/botania/api/brew/IBrewItem.java rename to src/api/java/vazkii/botania/brew/IBrewItem.java diff --git a/src/api/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/api/java/vazkii/botania/corporea/CorporeaHelper.java similarity index 97% rename from src/api/java/vazkii/botania/api/corporea/CorporeaHelper.java rename to src/api/java/vazkii/botania/corporea/CorporeaHelper.java index 28c3817..a1e7726 100644 --- a/src/api/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/api/java/vazkii/botania/corporea/CorporeaHelper.java @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.WeakHashMap; +import java.util.regex.Pattern; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -31,6 +32,8 @@ public final class CorporeaHelper { private static final WeakHashMap, List> cachedNetworks = new WeakHashMap(); private static final List autoCompleteControllers = new ArrayList(); + private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); + public static final String[] WILDCARD_STRINGS = new String[] { "...", "~", "+", "?" , "*" }; @@ -291,7 +294,7 @@ public final class CorporeaHelper { } - String name = stack.getDisplayName().toLowerCase().trim(); + String name = stripControlCodes(stack.getDisplayName().toLowerCase().trim()); return equalOrContain(name, s, contains) || equalOrContain(name + "s", s, contains) || equalOrContain(name + "es", s, contains) || name.endsWith("y") && equalOrContain(name.substring(0, name.length() - 1) + "ies", s, contains); } @@ -337,4 +340,9 @@ public final class CorporeaHelper { return true; return false; } + + // Copy from StringUtils + public static String stripControlCodes(String str) { + return patternControlCode.matcher(str).replaceAll(""); + } } diff --git a/src/api/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java b/src/api/java/vazkii/botania/corporea/CorporeaRequestEvent.java similarity index 100% rename from src/api/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java rename to src/api/java/vazkii/botania/corporea/CorporeaRequestEvent.java diff --git a/src/api/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/api/java/vazkii/botania/corporea/ICorporeaAutoCompleteController.java similarity index 100% rename from src/api/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java rename to src/api/java/vazkii/botania/corporea/ICorporeaAutoCompleteController.java diff --git a/src/api/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java b/src/api/java/vazkii/botania/corporea/ICorporeaInterceptor.java similarity index 100% rename from src/api/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java rename to src/api/java/vazkii/botania/corporea/ICorporeaInterceptor.java diff --git a/src/api/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/api/java/vazkii/botania/corporea/ICorporeaSpark.java similarity index 100% rename from src/api/java/vazkii/botania/api/corporea/ICorporeaSpark.java rename to src/api/java/vazkii/botania/corporea/ICorporeaSpark.java diff --git a/src/api/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/api/java/vazkii/botania/internal/DummyManaNetwork.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/DummyManaNetwork.java rename to src/api/java/vazkii/botania/internal/DummyManaNetwork.java diff --git a/src/api/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/api/java/vazkii/botania/internal/DummyMethodHandler.java similarity index 91% rename from src/api/java/vazkii/botania/api/internal/DummyMethodHandler.java rename to src/api/java/vazkii/botania/internal/DummyMethodHandler.java index 869d185..d8eb343 100644 --- a/src/api/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/api/java/vazkii/botania/internal/DummyMethodHandler.java @@ -32,6 +32,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.subtile.SubTileEntity; public class DummyMethodHandler implements IInternalMethodHandler { @@ -149,6 +150,16 @@ public class DummyMethodHandler implements IInternalMethodHandler { // NO-OP } + @Override + public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) { + // NO-OP + } + + @Override + public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { + return new ItemStack(Blocks.stone, 0, 0); + } + @Override public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) { // NO-OP @@ -205,4 +216,9 @@ public class DummyMethodHandler implements IInternalMethodHandler { return false; } + @Override + public void sendBaubleUpdatePacket(EntityPlayer player, int slot) { + // NO-OP + } + } diff --git a/src/api/java/vazkii/botania/api/internal/DummyPage.java b/src/api/java/vazkii/botania/internal/DummyPage.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/DummyPage.java rename to src/api/java/vazkii/botania/internal/DummyPage.java diff --git a/src/api/java/vazkii/botania/api/internal/DummySubTile.java b/src/api/java/vazkii/botania/internal/DummySubTile.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/DummySubTile.java rename to src/api/java/vazkii/botania/internal/DummySubTile.java diff --git a/src/api/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/api/java/vazkii/botania/internal/IGuiLexiconEntry.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/IGuiLexiconEntry.java rename to src/api/java/vazkii/botania/internal/IGuiLexiconEntry.java diff --git a/src/api/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/api/java/vazkii/botania/internal/IInternalMethodHandler.java similarity index 91% rename from src/api/java/vazkii/botania/api/internal/IInternalMethodHandler.java rename to src/api/java/vazkii/botania/internal/IInternalMethodHandler.java index 5364bc9..9061812 100644 --- a/src/api/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/api/java/vazkii/botania/internal/IInternalMethodHandler.java @@ -31,6 +31,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.subtile.SubTileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -96,6 +97,12 @@ public interface IInternalMethodHandler { @SideOnly(Side.CLIENT) public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res); + @SideOnly(Side.CLIENT) + public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound); + + @SideOnly(Side.CLIENT) + public ItemStack getBindDisplayForFlowerType(SubTileEntity e); + @SideOnly(Side.CLIENT) public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText); @@ -113,4 +120,6 @@ public interface IInternalMethodHandler { public boolean isBotaniaFlower(World world, int x, int y, int z); + public void sendBaubleUpdatePacket(EntityPlayer player, int slot); + } diff --git a/src/api/java/vazkii/botania/api/internal/IManaBurst.java b/src/api/java/vazkii/botania/internal/IManaBurst.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/IManaBurst.java rename to src/api/java/vazkii/botania/internal/IManaBurst.java diff --git a/src/api/java/vazkii/botania/api/internal/IManaNetwork.java b/src/api/java/vazkii/botania/internal/IManaNetwork.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/IManaNetwork.java rename to src/api/java/vazkii/botania/internal/IManaNetwork.java diff --git a/src/api/java/vazkii/botania/api/internal/ShaderCallback.java b/src/api/java/vazkii/botania/internal/ShaderCallback.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/ShaderCallback.java rename to src/api/java/vazkii/botania/internal/ShaderCallback.java diff --git a/src/api/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/api/java/vazkii/botania/internal/VanillaPacketDispatcher.java similarity index 100% rename from src/api/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java rename to src/api/java/vazkii/botania/internal/VanillaPacketDispatcher.java diff --git a/src/api/java/vazkii/botania/api/item/IAncientWillContainer.java b/src/api/java/vazkii/botania/item/IAncientWillContainer.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IAncientWillContainer.java rename to src/api/java/vazkii/botania/item/IAncientWillContainer.java diff --git a/src/api/java/vazkii/botania/api/item/IBaubleRender.java b/src/api/java/vazkii/botania/item/IBaubleRender.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IBaubleRender.java rename to src/api/java/vazkii/botania/item/IBaubleRender.java diff --git a/src/api/java/vazkii/botania/item/IBlockProvider.java b/src/api/java/vazkii/botania/item/IBlockProvider.java new file mode 100644 index 0000000..42f2e3f --- /dev/null +++ b/src/api/java/vazkii/botania/item/IBlockProvider.java @@ -0,0 +1,40 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 20, 2015, 10:31:54 PM (GMT)] + */ +package vazkii.botania.api.item; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * An Item that implements this can provide blocks to other items that use them. + * For example, the Black Hole Talisman implements this in order to allow for + * the Rod of the Shifting Crust to pull blocks from it. + */ +public interface IBlockProvider { + + /** + * Provides the requested item. The doit paremeter specifies whether this is + * just a test (false) or if the item should actually be removed (true). + * If you need to use calls to ManaItemHandler.requestMana[Exact], use + * the requestor as the ItemStack passed in. + */ + public boolean provideBlock(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta, boolean doit); + + /** + * Gets the amount of blocks of the type passed stored in this item. You must + * check for the block passed in to not give the counter for a wrong block. Returning + * -1 states that the item can provide infinite of the item passed in (for example, + * the Rod of the Lands would return -1 if the block is dirt). + */ + public int getBlockCount(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta); + +} diff --git a/src/api/java/vazkii/botania/api/item/IBurstViewerBauble.java b/src/api/java/vazkii/botania/item/IBurstViewerBauble.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IBurstViewerBauble.java rename to src/api/java/vazkii/botania/item/IBurstViewerBauble.java diff --git a/src/api/java/vazkii/botania/api/item/ICosmeticAttachable.java b/src/api/java/vazkii/botania/item/ICosmeticAttachable.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/ICosmeticAttachable.java rename to src/api/java/vazkii/botania/item/ICosmeticAttachable.java diff --git a/src/api/java/vazkii/botania/api/item/ICosmeticBauble.java b/src/api/java/vazkii/botania/item/ICosmeticBauble.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/ICosmeticBauble.java rename to src/api/java/vazkii/botania/item/ICosmeticBauble.java diff --git a/src/api/java/vazkii/botania/api/item/IDyablePool.java b/src/api/java/vazkii/botania/item/IDyablePool.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IDyablePool.java rename to src/api/java/vazkii/botania/item/IDyablePool.java diff --git a/src/api/java/vazkii/botania/api/item/IExoflameHeatable.java b/src/api/java/vazkii/botania/item/IExoflameHeatable.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IExoflameHeatable.java rename to src/api/java/vazkii/botania/item/IExoflameHeatable.java diff --git a/src/api/java/vazkii/botania/api/item/IExtendedPlayerController.java b/src/api/java/vazkii/botania/item/IExtendedPlayerController.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IExtendedPlayerController.java rename to src/api/java/vazkii/botania/item/IExtendedPlayerController.java diff --git a/src/api/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java b/src/api/java/vazkii/botania/item/IExtendedWireframeCoordinateListProvider.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java rename to src/api/java/vazkii/botania/item/IExtendedWireframeCoordinateListProvider.java diff --git a/src/api/java/vazkii/botania/api/item/IFlowerlessBiome.java b/src/api/java/vazkii/botania/item/IFlowerlessBiome.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IFlowerlessBiome.java rename to src/api/java/vazkii/botania/item/IFlowerlessBiome.java diff --git a/src/api/java/vazkii/botania/api/item/IFlowerlessWorld.java b/src/api/java/vazkii/botania/item/IFlowerlessWorld.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IFlowerlessWorld.java rename to src/api/java/vazkii/botania/item/IFlowerlessWorld.java diff --git a/src/api/java/vazkii/botania/api/item/IGrassHornExcempt.java b/src/api/java/vazkii/botania/item/IGrassHornExcempt.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IGrassHornExcempt.java rename to src/api/java/vazkii/botania/item/IGrassHornExcempt.java diff --git a/src/api/java/vazkii/botania/api/item/IManaDissolvable.java b/src/api/java/vazkii/botania/item/IManaDissolvable.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IManaDissolvable.java rename to src/api/java/vazkii/botania/item/IManaDissolvable.java diff --git a/src/api/java/vazkii/botania/item/IManaProficiencyArmor.java b/src/api/java/vazkii/botania/item/IManaProficiencyArmor.java new file mode 100644 index 0000000..595e800 --- /dev/null +++ b/src/api/java/vazkii/botania/item/IManaProficiencyArmor.java @@ -0,0 +1,44 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 28, 2015, 9:04:53 PM (GMT)] + */ +package vazkii.botania.api.item; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +/** + * An armor item that implements this gives the player wearing it mana proficiency, by + * which it makes Rods the player use have a stronger effect. This is a boolean, and only + * one armor piece with this returning true is required for the player to be considered + * to be having proficiency, by which it's suggested that this is used alongside an + * armor set, where only one piece implements it. + */ +public interface IManaProficiencyArmor { + + public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player); + + public final static class Helper { + + public static boolean hasProficiency(EntityPlayer player) { + for(int i = 0; i < 4; i++) { + ItemStack armor = player.getCurrentArmor(i); + if(armor != null) { + Item item = armor.getItem(); + if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, i, player)) + return true; + } + } + return false; + } + + } + +} diff --git a/src/api/java/vazkii/botania/api/item/IPetalApothecary.java b/src/api/java/vazkii/botania/item/IPetalApothecary.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IPetalApothecary.java rename to src/api/java/vazkii/botania/item/IPetalApothecary.java diff --git a/src/api/java/vazkii/botania/api/item/IPhantomInkable.java b/src/api/java/vazkii/botania/item/IPhantomInkable.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IPhantomInkable.java rename to src/api/java/vazkii/botania/item/IPhantomInkable.java diff --git a/src/api/java/vazkii/botania/api/item/IPixieSpawner.java b/src/api/java/vazkii/botania/item/IPixieSpawner.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IPixieSpawner.java rename to src/api/java/vazkii/botania/item/IPixieSpawner.java diff --git a/src/api/java/vazkii/botania/api/item/IRelic.java b/src/api/java/vazkii/botania/item/IRelic.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/IRelic.java rename to src/api/java/vazkii/botania/item/IRelic.java diff --git a/src/api/java/vazkii/botania/api/item/ISequentialBreaker.java b/src/api/java/vazkii/botania/item/ISequentialBreaker.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/ISequentialBreaker.java rename to src/api/java/vazkii/botania/item/ISequentialBreaker.java diff --git a/src/api/java/vazkii/botania/api/item/ISortableTool.java b/src/api/java/vazkii/botania/item/ISortableTool.java similarity index 100% rename from src/api/java/vazkii/botania/api/item/ISortableTool.java rename to src/api/java/vazkii/botania/item/ISortableTool.java diff --git a/src/api/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/api/java/vazkii/botania/item/IWireframeCoordinateListProvider.java similarity index 90% rename from src/api/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java rename to src/api/java/vazkii/botania/item/IWireframeCoordinateListProvider.java index d419c99..ae0863c 100644 --- a/src/api/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/api/java/vazkii/botania/item/IWireframeCoordinateListProvider.java @@ -15,6 +15,8 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * An item that implements this will allow for various wireframes to be drawn @@ -27,6 +29,7 @@ public interface IWireframeCoordinateListProvider { * Returns a list of ChunkCoordinates for the wireframes to draw. * Can be null. */ + @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack); } diff --git a/src/api/java/vazkii/botania/item/TinyPotatoRenderEvent.java b/src/api/java/vazkii/botania/item/TinyPotatoRenderEvent.java new file mode 100644 index 0000000..8b51c26 --- /dev/null +++ b/src/api/java/vazkii/botania/item/TinyPotatoRenderEvent.java @@ -0,0 +1,38 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 25, 2015, 8:02:41 PM (GMT)] + */ +package vazkii.botania.api.item; + +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Why would you ever want this ._. + */ +@SideOnly(Side.CLIENT) +public class TinyPotatoRenderEvent extends Event { + + public final TileEntity tile; + public final String name; + public final double x, y, z; + public final float partTicks; + + public TinyPotatoRenderEvent(TileEntity tile, String name, double x, double y, double z, float partTicks) { + this.tile = tile; + this.name = name; + this.x = x; + this.y = y; + this.z = z; + this.partTicks = partTicks; + } + +} diff --git a/src/api/java/vazkii/botania/api/lexicon/IAddonEntry.java b/src/api/java/vazkii/botania/lexicon/IAddonEntry.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/IAddonEntry.java rename to src/api/java/vazkii/botania/lexicon/IAddonEntry.java diff --git a/src/api/java/vazkii/botania/api/lexicon/ILexicon.java b/src/api/java/vazkii/botania/lexicon/ILexicon.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/ILexicon.java rename to src/api/java/vazkii/botania/lexicon/ILexicon.java diff --git a/src/api/java/vazkii/botania/api/lexicon/ILexiconable.java b/src/api/java/vazkii/botania/lexicon/ILexiconable.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/ILexiconable.java rename to src/api/java/vazkii/botania/lexicon/ILexiconable.java diff --git a/src/api/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java b/src/api/java/vazkii/botania/lexicon/IRecipeKeyProvider.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java rename to src/api/java/vazkii/botania/lexicon/IRecipeKeyProvider.java diff --git a/src/api/java/vazkii/botania/api/lexicon/ITwoNamedPage.java b/src/api/java/vazkii/botania/lexicon/ITwoNamedPage.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/ITwoNamedPage.java rename to src/api/java/vazkii/botania/lexicon/ITwoNamedPage.java diff --git a/src/api/java/vazkii/botania/api/lexicon/KnowledgeType.java b/src/api/java/vazkii/botania/lexicon/KnowledgeType.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/KnowledgeType.java rename to src/api/java/vazkii/botania/lexicon/KnowledgeType.java diff --git a/src/api/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/api/java/vazkii/botania/lexicon/LexiconCategory.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/LexiconCategory.java rename to src/api/java/vazkii/botania/lexicon/LexiconCategory.java diff --git a/src/api/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/api/java/vazkii/botania/lexicon/LexiconEntry.java similarity index 95% rename from src/api/java/vazkii/botania/api/lexicon/LexiconEntry.java rename to src/api/java/vazkii/botania/lexicon/LexiconEntry.java index e3ba9b3..e09ebfc 100644 --- a/src/api/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/api/java/vazkii/botania/lexicon/LexiconEntry.java @@ -17,6 +17,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class LexiconEntry implements Comparable { @@ -77,6 +79,11 @@ public class LexiconEntry implements Comparable { return unlocalizedName; } + @SideOnly(Side.CLIENT) + public boolean isVisible() { + return true; + } + /** * Sets what pages you want this entry to have. */ diff --git a/src/api/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/api/java/vazkii/botania/lexicon/LexiconPage.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/LexiconPage.java rename to src/api/java/vazkii/botania/lexicon/LexiconPage.java diff --git a/src/api/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/api/java/vazkii/botania/lexicon/LexiconRecipeMappings.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java rename to src/api/java/vazkii/botania/lexicon/LexiconRecipeMappings.java diff --git a/src/api/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/api/java/vazkii/botania/lexicon/multiblock/IMultiblockRenderHook.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java rename to src/api/java/vazkii/botania/lexicon/multiblock/IMultiblockRenderHook.java diff --git a/src/api/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/api/java/vazkii/botania/lexicon/multiblock/Multiblock.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java rename to src/api/java/vazkii/botania/lexicon/multiblock/Multiblock.java diff --git a/src/api/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java b/src/api/java/vazkii/botania/lexicon/multiblock/MultiblockSet.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java rename to src/api/java/vazkii/botania/lexicon/multiblock/MultiblockSet.java diff --git a/src/api/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/api/java/vazkii/botania/lexicon/multiblock/component/ColorSwitchingComponent.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java rename to src/api/java/vazkii/botania/lexicon/multiblock/component/ColorSwitchingComponent.java diff --git a/src/api/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/api/java/vazkii/botania/lexicon/multiblock/component/FlowerComponent.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java rename to src/api/java/vazkii/botania/lexicon/multiblock/component/FlowerComponent.java diff --git a/src/api/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/api/java/vazkii/botania/lexicon/multiblock/component/MultiblockComponent.java similarity index 100% rename from src/api/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java rename to src/api/java/vazkii/botania/lexicon/multiblock/component/MultiblockComponent.java diff --git a/src/api/java/vazkii/botania/api/mana/BurstProperties.java b/src/api/java/vazkii/botania/mana/BurstProperties.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/BurstProperties.java rename to src/api/java/vazkii/botania/mana/BurstProperties.java diff --git a/src/api/java/vazkii/botania/api/mana/IClientManaHandler.java b/src/api/java/vazkii/botania/mana/IClientManaHandler.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IClientManaHandler.java rename to src/api/java/vazkii/botania/mana/IClientManaHandler.java diff --git a/src/api/java/vazkii/botania/api/mana/ICreativeManaProvider.java b/src/api/java/vazkii/botania/mana/ICreativeManaProvider.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/ICreativeManaProvider.java rename to src/api/java/vazkii/botania/mana/ICreativeManaProvider.java diff --git a/src/api/java/vazkii/botania/api/mana/IIdentifiable.java b/src/api/java/vazkii/botania/mana/IIdentifiable.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IIdentifiable.java rename to src/api/java/vazkii/botania/mana/IIdentifiable.java diff --git a/src/api/java/vazkii/botania/api/mana/IKeyLocked.java b/src/api/java/vazkii/botania/mana/IKeyLocked.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IKeyLocked.java rename to src/api/java/vazkii/botania/mana/IKeyLocked.java diff --git a/src/api/java/vazkii/botania/api/mana/ILaputaImmobile.java b/src/api/java/vazkii/botania/mana/ILaputaImmobile.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/ILaputaImmobile.java rename to src/api/java/vazkii/botania/mana/ILaputaImmobile.java diff --git a/src/api/java/vazkii/botania/api/mana/ILens.java b/src/api/java/vazkii/botania/mana/ILens.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/ILens.java rename to src/api/java/vazkii/botania/mana/ILens.java diff --git a/src/api/java/vazkii/botania/api/mana/ILensEffect.java b/src/api/java/vazkii/botania/mana/ILensEffect.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/ILensEffect.java rename to src/api/java/vazkii/botania/mana/ILensEffect.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaBlock.java b/src/api/java/vazkii/botania/mana/IManaBlock.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaBlock.java rename to src/api/java/vazkii/botania/mana/IManaBlock.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaCollector.java b/src/api/java/vazkii/botania/mana/IManaCollector.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaCollector.java rename to src/api/java/vazkii/botania/mana/IManaCollector.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaCollisionGhost.java b/src/api/java/vazkii/botania/mana/IManaCollisionGhost.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaCollisionGhost.java rename to src/api/java/vazkii/botania/mana/IManaCollisionGhost.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaDiscountArmor.java b/src/api/java/vazkii/botania/mana/IManaDiscountArmor.java similarity index 96% rename from src/api/java/vazkii/botania/api/mana/IManaDiscountArmor.java rename to src/api/java/vazkii/botania/mana/IManaDiscountArmor.java index e580939..56a9683 100644 --- a/src/api/java/vazkii/botania/api/mana/IManaDiscountArmor.java +++ b/src/api/java/vazkii/botania/mana/IManaDiscountArmor.java @@ -15,7 +15,8 @@ import net.minecraft.item.ItemStack; /** * An armor item that implements this can provide a mana discount for mana tools. - * Mana tools are the ones on the main toolset (Pick, Shovel, Axe, Sword and Shovel). + * Mana tools are the ones on the main toolset (Pick, Shovel, Axe, Sword and Shovel) + * as well as Rods. */ public interface IManaDiscountArmor { diff --git a/src/api/java/vazkii/botania/api/mana/IManaItem.java b/src/api/java/vazkii/botania/mana/IManaItem.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaItem.java rename to src/api/java/vazkii/botania/mana/IManaItem.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaPool.java b/src/api/java/vazkii/botania/mana/IManaPool.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaPool.java rename to src/api/java/vazkii/botania/mana/IManaPool.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaReceiver.java b/src/api/java/vazkii/botania/mana/IManaReceiver.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaReceiver.java rename to src/api/java/vazkii/botania/mana/IManaReceiver.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaSpreader.java b/src/api/java/vazkii/botania/mana/IManaSpreader.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaSpreader.java rename to src/api/java/vazkii/botania/mana/IManaSpreader.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaTrigger.java b/src/api/java/vazkii/botania/mana/IManaTrigger.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaTrigger.java rename to src/api/java/vazkii/botania/mana/IManaTrigger.java diff --git a/src/api/java/vazkii/botania/api/mana/IManaUsingItem.java b/src/api/java/vazkii/botania/mana/IManaUsingItem.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IManaUsingItem.java rename to src/api/java/vazkii/botania/mana/IManaUsingItem.java diff --git a/src/api/java/vazkii/botania/api/mana/IPingable.java b/src/api/java/vazkii/botania/mana/IPingable.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IPingable.java rename to src/api/java/vazkii/botania/mana/IPingable.java diff --git a/src/api/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/api/java/vazkii/botania/mana/IPoolOverlayProvider.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IPoolOverlayProvider.java rename to src/api/java/vazkii/botania/mana/IPoolOverlayProvider.java diff --git a/src/api/java/vazkii/botania/api/mana/IThrottledPacket.java b/src/api/java/vazkii/botania/mana/IThrottledPacket.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/IThrottledPacket.java rename to src/api/java/vazkii/botania/mana/IThrottledPacket.java diff --git a/src/api/java/vazkii/botania/api/mana/ITinyPlanetExcempt.java b/src/api/java/vazkii/botania/mana/ITinyPlanetExcempt.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/ITinyPlanetExcempt.java rename to src/api/java/vazkii/botania/mana/ITinyPlanetExcempt.java diff --git a/src/api/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/api/java/vazkii/botania/mana/ManaItemHandler.java similarity index 92% rename from src/api/java/vazkii/botania/api/mana/ManaItemHandler.java rename to src/api/java/vazkii/botania/mana/ManaItemHandler.java index e05be50..d261d55 100644 --- a/src/api/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/api/java/vazkii/botania/mana/ManaItemHandler.java @@ -39,7 +39,8 @@ public final class ManaItemHandler { for(int i = 0; i < size; i++) { boolean useBaubles = i >= invSize; IInventory inv = useBaubles ? baublesInv : mainInv; - ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); + int slot = i - (useBaubles ? invSize : 0); + ItemStack stackInSlot = inv.getStackInSlot(slot); if(stackInSlot == stack) continue; @@ -53,6 +54,8 @@ public final class ManaItemHandler { if(remove) manaItem.addMana(stackInSlot, -mana); + if(useBaubles) + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); return mana; } @@ -84,7 +87,8 @@ public final class ManaItemHandler { for(int i = 0; i < size; i++) { boolean useBaubles = i >= invSize; IInventory inv = useBaubles ? baublesInv : mainInv; - ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); + int slot = i - (useBaubles ? invSize : 0); + ItemStack stackInSlot = inv.getStackInSlot(slot); if(stackInSlot == stack) continue; @@ -96,6 +100,8 @@ public final class ManaItemHandler { if(remove) manaItemSlot.addMana(stackInSlot, -manaToGet); + if(useBaubles) + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); return true; } @@ -127,7 +133,8 @@ public final class ManaItemHandler { for(int i = 0; i < size; i++) { boolean useBaubles = i >= invSize; IInventory inv = useBaubles ? baublesInv : mainInv; - ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); + int slot = i - (useBaubles ? invSize : 0); + ItemStack stackInSlot = inv.getStackInSlot(slot); if(stackInSlot == stack) continue; @@ -146,6 +153,8 @@ public final class ManaItemHandler { if(add) manaItemSlot.addMana(stackInSlot, manaToSend); + if(useBaubles) + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); return received; } @@ -177,7 +186,8 @@ public final class ManaItemHandler { for(int i = 0; i < size; i++) { boolean useBaubles = i >= invSize; IInventory inv = useBaubles ? baublesInv : mainInv; - ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); + int slot = i - (useBaubles ? invSize : 0); + ItemStack stackInSlot = inv.getStackInSlot(slot); if(stackInSlot == stack) continue; @@ -189,6 +199,8 @@ public final class ManaItemHandler { if(add) manaItemSlot.addMana(stackInSlot, manaToSend); + if(useBaubles) + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); return true; } diff --git a/src/api/java/vazkii/botania/api/mana/ManaNetworkEvent.java b/src/api/java/vazkii/botania/mana/ManaNetworkEvent.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/ManaNetworkEvent.java rename to src/api/java/vazkii/botania/mana/ManaNetworkEvent.java diff --git a/src/api/java/vazkii/botania/api/mana/TileSignature.java b/src/api/java/vazkii/botania/mana/TileSignature.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/TileSignature.java rename to src/api/java/vazkii/botania/mana/TileSignature.java diff --git a/src/api/java/vazkii/botania/api/mana/spark/ISparkAttachable.java b/src/api/java/vazkii/botania/mana/spark/ISparkAttachable.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/spark/ISparkAttachable.java rename to src/api/java/vazkii/botania/mana/spark/ISparkAttachable.java diff --git a/src/api/java/vazkii/botania/api/mana/spark/ISparkEntity.java b/src/api/java/vazkii/botania/mana/spark/ISparkEntity.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/spark/ISparkEntity.java rename to src/api/java/vazkii/botania/mana/spark/ISparkEntity.java diff --git a/src/api/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/api/java/vazkii/botania/mana/spark/SparkHelper.java similarity index 100% rename from src/api/java/vazkii/botania/api/mana/spark/SparkHelper.java rename to src/api/java/vazkii/botania/mana/spark/SparkHelper.java diff --git a/src/api/java/vazkii/botania/api/package-info.java b/src/api/java/vazkii/botania/package-info.java similarity index 50% rename from src/api/java/vazkii/botania/api/package-info.java rename to src/api/java/vazkii/botania/package-info.java index 50c7015..d8a672b 100644 --- a/src/api/java/vazkii/botania/api/package-info.java +++ b/src/api/java/vazkii/botania/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "56", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "61", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/api/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/api/java/vazkii/botania/recipe/ElvenPortalUpdateEvent.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java rename to src/api/java/vazkii/botania/recipe/ElvenPortalUpdateEvent.java diff --git a/src/api/java/vazkii/botania/api/recipe/IElvenItem.java b/src/api/java/vazkii/botania/recipe/IElvenItem.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/IElvenItem.java rename to src/api/java/vazkii/botania/recipe/IElvenItem.java diff --git a/src/api/java/vazkii/botania/api/recipe/IFlowerComponent.java b/src/api/java/vazkii/botania/recipe/IFlowerComponent.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/IFlowerComponent.java rename to src/api/java/vazkii/botania/recipe/IFlowerComponent.java diff --git a/src/api/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/api/java/vazkii/botania/recipe/RecipeBrew.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/RecipeBrew.java rename to src/api/java/vazkii/botania/recipe/RecipeBrew.java diff --git a/src/api/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/api/java/vazkii/botania/recipe/RecipeElvenTrade.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/RecipeElvenTrade.java rename to src/api/java/vazkii/botania/recipe/RecipeElvenTrade.java diff --git a/src/api/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/api/java/vazkii/botania/recipe/RecipeManaInfusion.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/RecipeManaInfusion.java rename to src/api/java/vazkii/botania/recipe/RecipeManaInfusion.java diff --git a/src/api/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/api/java/vazkii/botania/recipe/RecipeMiniFlower.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/RecipeMiniFlower.java rename to src/api/java/vazkii/botania/recipe/RecipeMiniFlower.java diff --git a/src/api/java/vazkii/botania/api/recipe/RecipePetals.java b/src/api/java/vazkii/botania/recipe/RecipePetals.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/RecipePetals.java rename to src/api/java/vazkii/botania/recipe/RecipePetals.java diff --git a/src/api/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/api/java/vazkii/botania/recipe/RecipePureDaisy.java similarity index 99% rename from src/api/java/vazkii/botania/api/recipe/RecipePureDaisy.java rename to src/api/java/vazkii/botania/recipe/RecipePureDaisy.java index c4a5842..19248e6 100644 --- a/src/api/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/api/java/vazkii/botania/recipe/RecipePureDaisy.java @@ -60,7 +60,7 @@ public class RecipePureDaisy { ores = OreDictionary.getOres(entry); oreMap.put(entry, ores); } - + for(ItemStack ostack : ores) { ItemStack cstack = ostack.copy(); if(cstack.getItemDamage() == Short.MAX_VALUE) diff --git a/src/api/java/vazkii/botania/api/recipe/RecipeRuneAltar.java b/src/api/java/vazkii/botania/recipe/RecipeRuneAltar.java similarity index 100% rename from src/api/java/vazkii/botania/api/recipe/RecipeRuneAltar.java rename to src/api/java/vazkii/botania/recipe/RecipeRuneAltar.java diff --git a/src/api/java/vazkii/botania/api/subtile/ISpecialFlower.java b/src/api/java/vazkii/botania/subtile/ISpecialFlower.java similarity index 100% rename from src/api/java/vazkii/botania/api/subtile/ISpecialFlower.java rename to src/api/java/vazkii/botania/subtile/ISpecialFlower.java diff --git a/src/api/java/vazkii/botania/api/subtile/ISubTileContainer.java b/src/api/java/vazkii/botania/subtile/ISubTileContainer.java similarity index 100% rename from src/api/java/vazkii/botania/api/subtile/ISubTileContainer.java rename to src/api/java/vazkii/botania/subtile/ISubTileContainer.java diff --git a/src/api/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/api/java/vazkii/botania/subtile/RadiusDescriptor.java similarity index 100% rename from src/api/java/vazkii/botania/api/subtile/RadiusDescriptor.java rename to src/api/java/vazkii/botania/subtile/RadiusDescriptor.java diff --git a/src/api/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/api/java/vazkii/botania/subtile/SubTileEntity.java similarity index 100% rename from src/api/java/vazkii/botania/api/subtile/SubTileEntity.java rename to src/api/java/vazkii/botania/subtile/SubTileEntity.java diff --git a/src/api/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/api/java/vazkii/botania/subtile/SubTileFunctional.java similarity index 88% rename from src/api/java/vazkii/botania/api/subtile/SubTileFunctional.java rename to src/api/java/vazkii/botania/subtile/SubTileFunctional.java index 139c30d..d6156ea 100644 --- a/src/api/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/api/java/vazkii/botania/subtile/SubTileFunctional.java @@ -30,6 +30,8 @@ import vazkii.botania.api.mana.IManaPool; */ public class SubTileFunctional extends SubTileEntity { + public static final int RANGE = 10; + private static final String TAG_MANA = "mana"; private static final String TAG_POOL_X = "poolX"; @@ -59,7 +61,7 @@ public class SubTileFunctional extends SubTileEntity { linkPool(); - if(linkedPool != null) { + if(linkedPool != null && isValidBinding()) { IManaPool pool = (IManaPool) linkedPool; int manaInPool = pool.getCurrentMana(); int manaMissing = getMaxMana() - mana; @@ -85,8 +87,6 @@ public class SubTileFunctional extends SubTileEntity { } public void linkPool() { - final int range = 10; - boolean needsNew = false; if(linkedPool == null) { needsNew = true; @@ -103,32 +103,27 @@ public class SubTileFunctional extends SubTileEntity { cachedPoolCoordinates = null; } } + } else { + TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); + if(tileAt != null && tileAt instanceof IManaPool) + linkedPool = tileAt; } - if(!needsNew && linkedPool != null) { - if(supertile.getWorldObj().blockExists(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) && !linkedPool.isInvalid()) { - TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); - if(!(tileAt instanceof IManaPool) || tileAt.isInvalid()) { - linkedPool = null; - needsNew = true; - } else linkedPool = tileAt; - } else { - cachedPoolCoordinates = new ChunkCoordinates(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); - linkedPool = null; - } - } - - if(needsNew) { + if(needsNew && ticksExisted == 1) { // Only for new flowers IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllPoolsInWorld(supertile.getWorldObj()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedPool = network.getClosestPool(coords, supertile.getWorldObj(), range); + linkedPool = network.getClosestPool(coords, supertile.getWorldObj(), RANGE); sizeLastCheck = size; } } } + public void linkToForcefully(TileEntity pool) { + linkedPool = pool; + } + public void addMana(int mana) { this.mana = Math.min(getMaxMana(), this.mana + mana); } @@ -211,11 +206,15 @@ public class SubTileFunctional extends SubTileEntity { return false; } + public boolean isValidBinding() { + return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) == linkedPool; + } + @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); - BotaniaAPI.internalHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); + BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } } diff --git a/src/api/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/api/java/vazkii/botania/subtile/SubTileGenerating.java similarity index 83% rename from src/api/java/vazkii/botania/api/subtile/SubTileGenerating.java rename to src/api/java/vazkii/botania/subtile/SubTileGenerating.java index b7010a2..70c81e4 100644 --- a/src/api/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/api/java/vazkii/botania/subtile/SubTileGenerating.java @@ -16,11 +16,13 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.StatCollector; +import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; @@ -30,6 +32,8 @@ import vazkii.botania.api.mana.IManaCollector; */ public class SubTileGenerating extends SubTileEntity { + public static final int RANGE = 6; + private static final String TAG_MANA = "mana"; private static final String TAG_COLLECTOR_X = "collectorX"; @@ -72,14 +76,14 @@ public class SubTileGenerating extends SubTileEntity { if(isPassiveFlower() && muhBalance > 0 && ticksExisted > muhBalance) { supertile.getWorldObj().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType())); - supertile.getWorldObj().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); + if(supertile.getWorldObj().getBlock(supertile.xCoord, supertile.yCoord - 1, supertile.zCoord).isSideSolid(supertile.getWorldObj(), supertile.xCoord, supertile.yCoord - 1, supertile.zCoord, ForgeDirection.UP)) + supertile.getWorldObj().setBlock(supertile.xCoord, supertile.yCoord, supertile.zCoord, Blocks.deadbush); + else supertile.getWorldObj().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); } } } public void linkCollector() { - final int range = 6; - boolean needsNew = false; if(linkedCollector == null) { needsNew = true; @@ -96,38 +100,33 @@ public class SubTileGenerating extends SubTileEntity { cachedCollectorCoordinates = null; } } + } else { + TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); + if(tileAt != null && tileAt instanceof IManaCollector) + linkedCollector = tileAt; } - if(!needsNew && linkedCollector != null) { - if(supertile.getWorldObj().blockExists(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) && !linkedCollector.isInvalid()) { - TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); - if(!(tileAt instanceof IManaCollector) || tileAt.isInvalid()) { - linkedCollector = null; - needsNew = true; - } else linkedCollector = tileAt; - } else { - cachedCollectorCoordinates = new ChunkCoordinates(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); - linkedCollector = null; - } - } - - if(needsNew) { + if(needsNew && ticksExisted == 1) { // New flowers only IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllCollectorsInWorld(supertile.getWorldObj()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedCollector = network.getClosestCollector(coords, supertile.getWorldObj(), range); + linkedCollector = network.getClosestCollector(coords, supertile.getWorldObj(), RANGE); sizeLastCheck = size; } } } + public void linkToForcefully(TileEntity collector) { + linkedCollector = collector; + } + public void addMana(int mana) { this.mana = Math.min(getMaxMana(), this.mana + mana); } public void emptyManaIntoCollector() { - if(linkedCollector != null) { + if(linkedCollector != null && isValidBinding()) { IManaCollector collector = (IManaCollector) linkedCollector; if(!collector.isFull() && mana > 0) { int manaval = Math.min(mana, collector.getMaxMana() - collector.getCurrentMana()); @@ -239,11 +238,16 @@ public class SubTileGenerating extends SubTileEntity { return false; } + + public boolean isValidBinding() { + return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) == linkedCollector; + } + @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); - BotaniaAPI.internalHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); + BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } } diff --git a/src/api/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/api/java/vazkii/botania/subtile/signature/BasicSignature.java similarity index 100% rename from src/api/java/vazkii/botania/api/subtile/signature/BasicSignature.java rename to src/api/java/vazkii/botania/subtile/signature/BasicSignature.java diff --git a/src/api/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/api/java/vazkii/botania/subtile/signature/SubTileSignature.java similarity index 100% rename from src/api/java/vazkii/botania/api/subtile/signature/SubTileSignature.java rename to src/api/java/vazkii/botania/subtile/signature/SubTileSignature.java diff --git a/src/api/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/api/java/vazkii/botania/wand/ICoordBoundItem.java similarity index 100% rename from src/api/java/vazkii/botania/api/wand/ICoordBoundItem.java rename to src/api/java/vazkii/botania/wand/ICoordBoundItem.java diff --git a/src/api/java/vazkii/botania/api/wand/ITileBound.java b/src/api/java/vazkii/botania/wand/ITileBound.java similarity index 100% rename from src/api/java/vazkii/botania/api/wand/ITileBound.java rename to src/api/java/vazkii/botania/wand/ITileBound.java diff --git a/src/api/java/vazkii/botania/api/wand/IWandBindable.java b/src/api/java/vazkii/botania/wand/IWandBindable.java similarity index 100% rename from src/api/java/vazkii/botania/api/wand/IWandBindable.java rename to src/api/java/vazkii/botania/wand/IWandBindable.java diff --git a/src/api/java/vazkii/botania/api/wand/IWandHUD.java b/src/api/java/vazkii/botania/wand/IWandHUD.java similarity index 100% rename from src/api/java/vazkii/botania/api/wand/IWandHUD.java rename to src/api/java/vazkii/botania/wand/IWandHUD.java diff --git a/src/api/java/vazkii/botania/api/wand/IWandable.java b/src/api/java/vazkii/botania/wand/IWandable.java similarity index 100% rename from src/api/java/vazkii/botania/api/wand/IWandable.java rename to src/api/java/vazkii/botania/wand/IWandable.java diff --git a/src/api/java/vazkii/botania/api/wand/IWireframeAABBProvider.java b/src/api/java/vazkii/botania/wand/IWireframeAABBProvider.java similarity index 100% rename from src/api/java/vazkii/botania/api/wand/IWireframeAABBProvider.java rename to src/api/java/vazkii/botania/wand/IWireframeAABBProvider.java diff --git a/src/api/java/vazkii/botania/api/wiki/IWikiProvider.java b/src/api/java/vazkii/botania/wiki/IWikiProvider.java similarity index 100% rename from src/api/java/vazkii/botania/api/wiki/IWikiProvider.java rename to src/api/java/vazkii/botania/wiki/IWikiProvider.java diff --git a/src/api/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/api/java/vazkii/botania/wiki/SimpleWikiProvider.java similarity index 100% rename from src/api/java/vazkii/botania/api/wiki/SimpleWikiProvider.java rename to src/api/java/vazkii/botania/wiki/SimpleWikiProvider.java diff --git a/src/api/java/vazkii/botania/api/wiki/WikiHooks.java b/src/api/java/vazkii/botania/wiki/WikiHooks.java similarity index 100% rename from src/api/java/vazkii/botania/api/wiki/WikiHooks.java rename to src/api/java/vazkii/botania/wiki/WikiHooks.java diff --git a/src/api/resources/CoFH_at.cfg b/src/api/resources/CoFH_at.cfg new file mode 100644 index 0000000..3b9819b --- /dev/null +++ b/src/api/resources/CoFH_at.cfg @@ -0,0 +1,64 @@ +# NetherOres +public net.minecraft.entity.monster.EntityPigZombie func_70835_c(Lnet/minecraft/entity/Entity;)V # becomeAngryAt +public net.minecraft.entity.monster.EntitySilverfish field_70843_d # allySummonCooldown +public-f net.minecraft.init.Blocks field_150449_bY # oreNetherQuartz + +# MineFactory Reloaded +protected net.minecraft.util.WeightedRandomFishable * # need it all +public net.minecraft.entity.EntityList field_75624_e # classToIDMapping +public net.minecraft.entity.EntityList field_75622_f # stringToIDMapping +public net.minecraft.entity.monster.EntitySlime func_70799_a(I)V # setSlimeSize +public net.minecraft.entity.monster.EntityZombie func_82228_a(I)V # startConversion +public net.minecraft.entity.EntityLivingBase field_70718_bc # recentlyHit +public-f net.minecraft.init.Blocks field_150432_aD # ice +public-f net.minecraft.init.Blocks field_150410_aZ # glass_pane +public-f net.minecraft.init.Items field_151117_aB # milkBucket +protected net.minecraft.block.Block field_149770_b # unlocalizedName +public net.minecraft.server.management.PlayerManager func_72690_a(IIZ)Lnet/minecraft/server/management/PlayerManager$PlayerInstance; # getOrCreateChunkWatcher +public net.minecraft.server.management.PlayerManager$PlayerInstance +public net.minecraft.server.management.PlayerManager$PlayerInstance field_73263_b # playersWatchingChunk +public net.minecraft.entity.EntityLiving field_70728_aV # experienceValue +public net.minecraft.entity.EntityLiving field_82174_bp # equipmentDropChances +public net.minecraft.entity.Entity func_70041_e_()Z # canTriggerWalking + +# ThermalFoundation +public net.minecraft.entity.Entity field_70171_ac # inWater + +# ThermalDynamics +public net.minecraft.client.renderer.Tessellator field_147569_p # rawBufferIndex +public net.minecraft.client.renderer.Tessellator field_78408_v # xOffset +public net.minecraft.client.renderer.Tessellator field_78407_w # yOffset +public net.minecraft.client.renderer.Tessellator field_78417_x # zOffset +public net.minecraft.client.renderer.Tessellator field_78406_i # rawBuffer +public net.minecraft.client.renderer.Tessellator field_78405_h # vertexCount + +# Thermal Expansion +public net.minecraft.entity.Entity field_83001_bt # invulnerable +public net.minecraft.entity.Entity field_70178_ae # isImmuneToFire +public net.minecraft.entity.player.EntityPlayer field_71074_e # itemInUse +public net.minecraft.server.management.ItemInWorldManager field_73094_o #durabilityRemainingOnBlock + +# PC Core +public net.minecraft.client.gui.GuiScreen field_146289_q # fontRenderer +public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft +public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop +public net.minecraft.world.WorldServer field_73068_P # allPlayersSleeping + +# CoFH Core +protected net.minecraft.inventory.Container * # senseless to have private stuff here +protected net.minecraft.client.gui.inventory.GuiContainer * # senseless to have private stuff here +protected net.minecraft.client.gui.FontRenderer *()V # all of it +protected net.minecraft.client.gui.FontRenderer * # all of it +public net.minecraft.entity.projectile.EntityFishHook * # (nearly) literally everything is private + +protected net.minecraft.entity.player.EntityPlayer field_71072_f # itemInUseCount +public net.minecraft.item.ItemPickaxe field_150915_c # blocksEffectiveAgainst +public net.minecraft.item.ItemSpade field_150916_c # blocksEffectiveAgainst +public net.minecraft.item.ItemAxe field_150917_c # blocksEffectiveAgainst +public net.minecraft.util.RegistrySimple field_82596_a # registryObjects +public-f net.minecraft.util.RegistryNamespaced field_148759_a # underlyingIntegerMap +public net.minecraft.world.World field_72998_d # collidingBoundingBoxes + +# WorldProxy +public-f net.minecraft.world.World *()V # Doesn't matter what it is, we need it public +public-f net.minecraft.world.WorldServer *()V # Doesn't matter what it is, we need it public diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java index 7563a02..9ebd5a0 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java @@ -12,6 +12,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import fox.spiteful.avaritia.PotionHelper; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -40,6 +41,8 @@ import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; import vazkii.botania.api.item.IPhantomInkable; +import vazkii.botania.api.mana.IManaDiscountArmor; +import vazkii.botania.api.item.IManaProficiencyArmor; import java.util.ArrayList; import java.util.Collection; @@ -49,11 +52,14 @@ import java.util.List; @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), @Optional.Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"), - @Optional.Interface(iface = "vazkii.botania.api.item.IPhantomInkable", modid = "Botania") + @Optional.Interface(iface = "vazkii.botania.api.item.IPhantomInkable", modid = "Botania"), + @Optional.Interface(iface = "vazkii.botania.api.mana.IManaDiscountArmor", modid = "Botania"), + @Optional.Interface(iface = "vazkii.botania.api.item.IManaProficiencyArmor", modid = "Botania") }) -public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, IGoggles, IRevealer, IVisDiscountGear, IPhantomInkable { +public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, IGoggles, IRevealer, IVisDiscountGear, IPhantomInkable, IManaDiscountArmor, IManaProficiencyArmor { public static final ArmorMaterial infinite_armor = EnumHelper.addArmorMaterial("infinity", 9999, new int[]{6, 16, 12, 6}, 1000); + static ItemStack[] armorset; public IIcon cosmicMask; public final int slot; @@ -157,13 +163,54 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I return 20; } + @Optional.Method(modid = "Botania") + public String getArmorSetTitle(EntityPlayer player) { + return StatCollector.translateToLocal("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; + } + + @Optional.Method(modid = "Botania") + public String getArmorSetName() { + return StatCollector.translateToLocal("avaritia.armorset.infinity.name"); + } + + @Optional.Method(modid = "Botania") + public void addArmorSetDescription(ItemStack stack, List list) { + addStringToTooltip(StatCollector.translateToLocal("avaritia.armorset.infinity.desc0"), list); + addStringToTooltip(StatCollector.translateToLocal("avaritia.armorset.infinity.desc1"), list); + } + + @Optional.Method(modid = "Botania") + public ItemStack[] getArmorSetStacks() { + if(armorset == null) + armorset = new ItemStack[] { + new ItemStack(LudicrousItems.infinity_armor), + new ItemStack(LudicrousItems.infinity_helm), + new ItemStack(LudicrousItems.infinity_pants), + new ItemStack(LudicrousItems.infinity_shoes) + }; + + return armorset; + } + + @Optional.Method(modid = "Botania") + public void addStringToTooltip(String s, List tooltip) { + tooltip.add(s.replaceAll("&", "\u00a7")); + } + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { if(Compat.thaumic) list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + ": " + this.getVisDiscount(stack, player, (Aspect)null) + "%"); if(Compat.botan) { - if (hasPhantomInk(stack)) - list.add(StatCollector.translateToLocal("botaniamisc.hasPhantomInk").replaceAll("&", "\u00a7")); + if(GuiScreen.isShiftKeyDown()) { + addStringToTooltip(getArmorSetTitle(player), list); + addArmorSetDescription(stack, list); + ItemStack[] stacks = getArmorSetStacks(); + for(int i = 0; i < stacks.length; i++) + addStringToTooltip((hasArmorSetItem(player, i) ? EnumChatFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list); + if(hasPhantomInk(stack)) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), list); + } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); } if (this.slot == 3) { list.add(""); @@ -227,6 +274,44 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I return false; } + public boolean hasArmorSet(EntityPlayer player) { + return hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1) && hasArmorSetItem(player, 2) && hasArmorSetItem(player, 3); + } + + public boolean hasArmorSetItem(EntityPlayer player, int i) { + ItemStack stack = player.inventory.armorInventory[3 - i]; + if(stack == null) + return false; + + switch(i) { + case 0: return stack.getItem() == LudicrousItems.infinity_helm; + case 1: return stack.getItem() == LudicrousItems.infinity_armor; + case 2: return stack.getItem() == LudicrousItems.infinity_pants; + case 3: return stack.getItem() == LudicrousItems.infinity_shoes; + } + + return false; + } + + public int getSetPiecesEquipped(EntityPlayer player) { + int pieces = 0; + for(int i = 0; i < 4; i++) + if(hasArmorSetItem(player, i)) + pieces++; + + return pieces; + } + + @Override + public float getDiscount(ItemStack stack, int slot, EntityPlayer player) { + return hasArmorSet(player) ? 0.40F : 0F; + } + + @Override + public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player) { + return hasArmorSet(player); + } + public static class abilityHandler { public static List playersWithHat = new ArrayList(); public static List playersWithChest = new ArrayList(); @@ -335,7 +420,7 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I } } } - + @SubscribeEvent public void jumpBoost(LivingJumpEvent event) { if (event.entityLiving instanceof EntityPlayer) { diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 1ea5c8e..6b6d981 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -156,4 +156,9 @@ classification.infinite=Infinite classification.infinite.desc=They gather pranic energy from the hidden ley-lines and arcane geometries of the universe itself. avaritia.allele.speedNerfed=Nerfed -avaritia.allele.lifespanArtificial=Artificial \ No newline at end of file +avaritia.allele.lifespanArtificial=Artificial + +# Armor Set Stuff +avaritia.armorset.infinity.name=Cosmic Prowess +avaritia.armorset.infinity.desc0=40% less Mana cost on Mana Tools and Rods +avaritia.armorset.infinity.desc1=Increased proficiency with Magical Rods