Revert "Update Botania API. Use ForgeGradle for some dependencies, update others. Actually runs in dev environment now. Add armor set bonus for mana reduction while wearing infinity armor."

This reverts commit f4eb321fc2.
This commit is contained in:
Jeremy Diamond committed 2015-09-05 01:17:52 -07:00
1 parent 293939083a
commit b939e9cbaf
132 files changed
+60 -449

No files matched your search

+4 -35
View File
@@ -15,49 +15,18 @@ 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'
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
version = "0.2"
group= "fox.spiteful.avaritia" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Avaritia"
minecraft {
version = config.mc_version + "-" + config.forge_version
version = "1.7.10-10.13.3.1408-1.7.10"
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')
}
-12
View File
@@ -1,12 +0,0 @@
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -94,15 +94,9 @@ 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;
public static KnowledgeType elvenKnowledge;
// This is here for completeness sake, but you shouldn't use it
public static KnowledgeType relicKnowledge;
public static KnowledgeType basicKnowledge, elvenKnowledge;
// All of these categories are initialized during botania's PreInit stage.
public static LexiconCategory categoryBasics;
@@ -123,7 +117,6 @@ 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
@@ -135,8 +128,7 @@ 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 (older versions)
addOreWeight("oreFzDarkIron", 1700); // Factorization (newer versions)
addOreWeight("oreDarkIron", 1700); // Factorization
addOreWeight("oreDiamond", 1265); // Vanilla
addOreWeight("oreEmerald", 780); // Vanilla
addOreWeight("oreGalena", 1000); // Factorization
@@ -151,10 +143,8 @@ 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
@@ -12,7 +12,6 @@ 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;
@@ -58,5 +57,5 @@ public interface IBotaniaBoss extends IBossDisplayData {
* here if needed.
*/
@SideOnly(Side.CLIENT)
public void bossBarRenderCallback(ScaledResolution res, int x, int y);
public void bossBarRenderCallback();
}
@@ -15,7 +15,6 @@ 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;
@@ -32,8 +31,6 @@ public final class CorporeaHelper {
private static final WeakHashMap<List<ICorporeaSpark>, List<IInventory>> cachedNetworks = new WeakHashMap();
private static final List<ICorporeaAutoCompleteController> autoCompleteControllers = new ArrayList<ICorporeaAutoCompleteController>();
private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]");
public static final String[] WILDCARD_STRINGS = new String[] {
"...", "~", "+", "?" , "*"
};
@@ -294,7 +291,7 @@ public final class CorporeaHelper {
}
String name = stripControlCodes(stack.getDisplayName().toLowerCase().trim());
String name = 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);
}
@@ -340,9 +337,4 @@ public final class CorporeaHelper {
return true;
return false;
}
// Copy from StringUtils
public static String stripControlCodes(String str) {
return patternControlCode.matcher(str).replaceAll("");
}
}
@@ -32,7 +32,6 @@ 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 {
@@ -150,16 +149,6 @@ 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
@@ -216,9 +205,4 @@ public class DummyMethodHandler implements IInternalMethodHandler {
return false;
}
@Override
public void sendBaubleUpdatePacket(EntityPlayer player, int slot) {
// NO-OP
}
}
@@ -31,7 +31,6 @@ 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;
@@ -97,12 +96,6 @@ 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);
@@ -120,6 +113,4 @@ public interface IInternalMethodHandler {
public boolean isBotaniaFlower(World world, int x, int y, int z);
public void sendBaubleUpdatePacket(EntityPlayer player, int slot);
}
@@ -15,8 +15,6 @@ 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
@@ -29,7 +27,6 @@ public interface IWireframeCoordinateListProvider {
* Returns a list of ChunkCoordinates for the wireframes to draw.
* Can be null.
*/
@SideOnly(Side.CLIENT)
public List<ChunkCoordinates> getWireframesToDraw(EntityPlayer player, ItemStack stack);
}
@@ -17,8 +17,6 @@ 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<LexiconEntry> {
@@ -79,11 +77,6 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
return unlocalizedName;
}
@SideOnly(Side.CLIENT)
public boolean isVisible() {
return true;
}
/**
* Sets what pages you want this entry to have.
*/
@@ -15,8 +15,7 @@ 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)
* as well as Rods.
* Mana tools are the ones on the main toolset (Pick, Shovel, Axe, Sword and Shovel).
*/
public interface IManaDiscountArmor {
@@ -39,8 +39,7 @@ public final class ManaItemHandler {
for(int i = 0; i < size; i++) {
boolean useBaubles = i >= invSize;
IInventory inv = useBaubles ? baublesInv : mainInv;
int slot = i - (useBaubles ? invSize : 0);
ItemStack stackInSlot = inv.getStackInSlot(slot);
ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0));
if(stackInSlot == stack)
continue;
@@ -54,8 +53,6 @@ public final class ManaItemHandler {
if(remove)
manaItem.addMana(stackInSlot, -mana);
if(useBaubles)
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
return mana;
}
@@ -87,8 +84,7 @@ public final class ManaItemHandler {
for(int i = 0; i < size; i++) {
boolean useBaubles = i >= invSize;
IInventory inv = useBaubles ? baublesInv : mainInv;
int slot = i - (useBaubles ? invSize : 0);
ItemStack stackInSlot = inv.getStackInSlot(slot);
ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0));
if(stackInSlot == stack)
continue;
@@ -100,8 +96,6 @@ public final class ManaItemHandler {
if(remove)
manaItemSlot.addMana(stackInSlot, -manaToGet);
if(useBaubles)
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
return true;
}
@@ -133,8 +127,7 @@ public final class ManaItemHandler {
for(int i = 0; i < size; i++) {
boolean useBaubles = i >= invSize;
IInventory inv = useBaubles ? baublesInv : mainInv;
int slot = i - (useBaubles ? invSize : 0);
ItemStack stackInSlot = inv.getStackInSlot(slot);
ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0));
if(stackInSlot == stack)
continue;
@@ -153,8 +146,6 @@ public final class ManaItemHandler {
if(add)
manaItemSlot.addMana(stackInSlot, manaToSend);
if(useBaubles)
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
return received;
}
@@ -186,8 +177,7 @@ public final class ManaItemHandler {
for(int i = 0; i < size; i++) {
boolean useBaubles = i >= invSize;
IInventory inv = useBaubles ? baublesInv : mainInv;
int slot = i - (useBaubles ? invSize : 0);
ItemStack stackInSlot = inv.getStackInSlot(slot);
ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0));
if(stackInSlot == stack)
continue;
@@ -199,8 +189,6 @@ public final class ManaItemHandler {
if(add)
manaItemSlot.addMana(stackInSlot, manaToSend);
if(useBaubles)
BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot);
return true;
}
@@ -1,4 +1,4 @@
@API(owner = "Botania", apiVersion = "61", provides = "BotaniaAPI")
@API(owner = "Botania", apiVersion = "56", provides = "BotaniaAPI")
package vazkii.botania.api;
import cpw.mods.fml.common.API;
Loaded 100 of 132 files, more files were not shown because too many files have changed in this diff. Show more