mirror of
https://github.com/GTNewHorizons/ForbiddenMagic.git
synced 2026-11-20 12:09:50 +00:00
WOOOOOOORDS
This commit is contained in:
1 parent
9ad63adf61
commit
d53c041078
66 files changed
+6603
-28
No files matched your search
@@ -26,8 +26,6 @@ public class Config {
|
||||
|
||||
public static int bloodSealPotionID = 70;
|
||||
|
||||
public static int thaumcraftTaintBiomeID;
|
||||
public static int thaumcraftTaintPotionID;
|
||||
public static ItemStack thaumcraftResource;
|
||||
public static ItemStack thaumcraftTaintBlock;
|
||||
public static ItemStack thaumcraftOre;
|
||||
@@ -87,9 +85,6 @@ public class Config {
|
||||
thaumcraftTaintBlock = ItemApi.getBlock("blockTaint", 0);
|
||||
thaumcraftOre = ItemApi.getBlock("blockCustomOre", 0);
|
||||
taintMaterial = Block.getBlockFromItem(thaumcraftTaintBlock.getItem()).getMaterial();
|
||||
|
||||
thaumcraftTaintPotionID = Class.forName("thaumcraft.common.config.Config").getField("potionFluxTaintID").getInt(null);
|
||||
thaumcraftTaintBiomeID = Class.forName("thaumcraft.common.config.Config").getField("biomeTaintID").getInt(null);
|
||||
} catch (Exception e) {
|
||||
LogHandler.log(Level.ERROR, e, "There was problem when retrieving information from Thaumcraft.");
|
||||
e.printStackTrace();
|
||||
|
||||
@@ -66,8 +66,8 @@ public class BloodMagic {
|
||||
IArcaneRecipe blood_staff = ThaumcraftApi.addArcaneCraftingRecipe("ROD_blood_staff", new ItemStack(ForbiddenItems.wandCore, 1, 9), (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, 3), Character.valueOf('D'), new ItemStack(demonShard) });
|
||||
(new DarkResearchItem("ROD_blood_staff", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 8).add(Aspect.WATER, 7).add(Aspect.WEAPON, 6), -5, -7, 5, new ItemStack(ForbiddenItems.wandCore, 1, 9))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_blood_staff.1"), new ResearchPage(blood_staff) }).setParents(new String[] { "ROD_silverwood_staff", "ROD_blood" }).setSpecial().setConcealed().registerResearchItem();
|
||||
|
||||
InfusionRecipe blood_rapier = ThaumcraftApi.addInfusionCraftingRecipe("BLOODRAPIER", new ItemStack(ForbiddenItems.bloodRapier, 1, 0), 8, (new AspectList()).add(Aspect.LIFE, 18).add(Aspect.HUNGER, 32).add(Aspect.WEAPON, 8), ItemApi.getItem("itemSwordThaumium", 0), new ItemStack[] { ItemApi.getItem("itemResource", 12), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.gluttonyShard, 1, 0), new ItemStack(Items.feather), ItemApi.getItem("itemResource", 6) });
|
||||
(new DarkResearchItem("BLOODRAPIER", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.HUNGER, 12).add(Aspect.WEAPON, 12).add(Aspect.MAGIC, 12), -9, 8, 4, new ItemStack(ForbiddenItems.bloodRapier, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODRAPIER.1"), new ResearchPage(blood_rapier) }).setParents(new String[] { "INFAUXSION" }).setConcealed().registerResearchItem();
|
||||
InfusionRecipe blood_rapier = ThaumcraftApi.addInfusionCraftingRecipe("BLOODRAPIER", new ItemStack(ForbiddenItems.bloodRapier, 1, 0), 8, (new AspectList()).add(Aspect.LIFE, 18).add(Aspect.HUNGER, 32).add(Aspect.WEAPON, 8), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[] { ItemApi.getItem("itemResource", 12), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.gluttonyShard, 1, 0), new ItemStack(Items.feather), ItemApi.getItem("itemResource", 6) });
|
||||
(new DarkResearchItem("BLOODRAPIER", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.HUNGER, 12).add(Aspect.WEAPON, 12).add(Aspect.MAGIC, 12), -9, 8, 4, new ItemStack(ForbiddenItems.bloodRapier, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODRAPIER.1"), new ResearchPage(blood_rapier) }).setParents(new String[] { "INFAUXSION", "VOIDMETAL" }).setConcealed().registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("BLOODRAPIER", 3);
|
||||
|
||||
if (Compat.kami) {
|
||||
|
||||
@@ -73,7 +73,7 @@ public class Compat {
|
||||
|
||||
if (kami) {
|
||||
try {
|
||||
Item kamiResource = GameRegistry.findItem("ThaumicTinkerer", "ttinkerer:kamiResource");
|
||||
Item kamiResource = GameRegistry.findItem("ThaumicTinkerer", "kamiResource");
|
||||
list = new AspectList().add(DarkAspects.NETHER, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(kamiResource, 1, 6), list);
|
||||
list = new AspectList().add(Aspect.ELDRITCH, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1);
|
||||
@@ -115,14 +115,16 @@ public class Compat {
|
||||
|
||||
i = GameRegistry.findItemStack("Natura", "soil.tainted", 1);
|
||||
if (i != null) {
|
||||
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(i.getItem(), 1, 0));
|
||||
//list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(i.getItem(), 1, 0));
|
||||
list = new AspectList().add(Aspect.EARTH, 1);
|
||||
list.add(DarkAspects.NETHER, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(i.getItem(), 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
}
|
||||
|
||||
i = GameRegistry.findItemStack("Natura", "heatsand", 1);
|
||||
if (i != null) {
|
||||
list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(i.getItem(), 1, 0));
|
||||
//list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(i.getItem(), 1, 0));
|
||||
list = new AspectList().add(Aspect.FIRE, 1).add(Aspect.EARTH, 1);
|
||||
list.add(DarkAspects.NETHER, 1);
|
||||
ThaumcraftApi.registerObjectTag(new ItemStack(i.getItem(), 1, OreDictionary.WILDCARD_VALUE), list);
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@ import fox.spiteful.forbidden.Config;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
|
||||
public class ItemTaintShovel extends ItemSpade implements IRepairable
|
||||
{
|
||||
@@ -63,17 +65,31 @@ public class ItemTaintShovel extends ItemSpade implements IRepairable
|
||||
|
||||
@Override
|
||||
public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) {
|
||||
if(player != null && player.isPotionActive(Config.thaumcraftTaintPotionID)) {
|
||||
itemstack.damageItem(5, player);
|
||||
player.swingItem();
|
||||
if(player.worldObj.isRemote)
|
||||
player.removePotionEffectClient(Config.thaumcraftTaintPotionID);
|
||||
else {
|
||||
world.playSoundEffect((double)x + 0.5D, (double)y + 0.5D, (double)z + 0.5D, "thaumcraft:wandfail", 0.2F, 0.2F + world.rand.nextFloat() * 0.2F);
|
||||
player.removePotionEffect(Config.thaumcraftTaintPotionID);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return super.onItemUse(itemstack, player, world, x, y, z, side, par8, par9, par10);
|
||||
int purified = 0;
|
||||
for(int ex = x - 5;ex < x + 6;ex++){
|
||||
for(int wy = y - 4;wy < y + 5;wy++){
|
||||
for(int zee = z - 5;zee < z + 6;zee++){
|
||||
Block target = world.getBlock(ex, wy, zee);
|
||||
if(target != null && (target == ConfigBlocks.blockFluxGoo || target == ConfigBlocks.blockFluxGas)){
|
||||
purified++;
|
||||
world.setBlockToAir(ex, wy, zee);
|
||||
for(int sparkle = 0;sparkle < 3;sparkle++) {
|
||||
double d1 = (double) ((float) ex + world.rand.nextFloat());
|
||||
double d2 = (double) ((float) wy + world.rand.nextFloat());
|
||||
double d0 = (double) ((float) zee + world.rand.nextFloat());
|
||||
Thaumcraft.proxy.sparkle((float) d1, (float) d2, (float) d0, 0x76FFFB);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(purified > 0){
|
||||
itemstack.damageItem(Math.min(purified, 15), player);
|
||||
player.swingItem();
|
||||
world.playSoundEffect((double)x + 0.5D, (double)y + 0.5D, (double)z + 0.5D, "thaumcraft:wandfail", 0.2F, 0.2F + world.rand.nextFloat() * 0.2F);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
return super.onItemUse(itemstack, player, world, x, y, z, side, par8, par9, par10);
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ public class TaintedWandUpdate implements IWandRodOnUpdate {
|
||||
Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
|
||||
|
||||
public void onUpdate(ItemStack itemstack, EntityPlayer player) {
|
||||
if(player.ticksExisted % 100 == 0 && player.worldObj.getBiomeGenForCoords((int)player.posX, (int)player.posZ).biomeID == Config.thaumcraftTaintBiomeID){
|
||||
if(player.ticksExisted % 100 == 0 && player.worldObj.getBiomeGenForCoords((int)player.posX, (int)player.posZ).biomeID == thaumcraft.common.config.Config.biomeTaintID){
|
||||
for(int x = 0;x < primals.length;x++){
|
||||
if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack) / 10) {
|
||||
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
|
||||
|
||||
@@ -23,7 +23,7 @@ public class YandereWandUpdate implements IWandRodOnUpdate {
|
||||
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("manasteel"))
|
||||
cost = 900;
|
||||
else
|
||||
cost = 1000;
|
||||
cost = 1100;
|
||||
|
||||
for(int x = 0;x < primals.length;x++)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user