mirror of
https://github.com/GTNewHorizons/Tainted-Magic.git
synced 2026-11-20 03:59:36 +00:00
Bug fixes and texture improvements
This commit is contained in:
1 parent
fd216ef735
commit
04b9a76e9f
12 files changed
+48
-22
No files matched your search
@@ -67,9 +67,9 @@ public class EntityGlowpet extends EntityThrowable
|
||||
|
||||
if (!whitelisted.contains(b.getMaterial()))
|
||||
{
|
||||
this.motionZ *= -0.5D;
|
||||
this.motionX *= -0.5D;
|
||||
this.motionY *= -0.5D;
|
||||
this.motionZ *= -0.8D;
|
||||
this.motionX *= -0.8D;
|
||||
this.motionY *= -0.8D;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -128,9 +128,9 @@ public class EntityGlowpet extends EntityThrowable
|
||||
dy /= d;
|
||||
dz /= d;
|
||||
|
||||
this.motionX = dx;
|
||||
this.motionY = dy;
|
||||
this.motionZ = dz;
|
||||
this.motionX = dx * Math.random();
|
||||
this.motionY = dy * Math.random();
|
||||
this.motionZ = dz * Math.random();
|
||||
|
||||
this.worldObj.playSoundAtEntity(this, "taintedmagic:shard", 0.1F, 2.0F * this.worldObj.rand.nextFloat());
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ public class EntityHomingShard extends EntityThrowable implements IEntityAdditio
|
||||
int targetID = 0;
|
||||
EntityLivingBase target;
|
||||
|
||||
Material[] mats = { Material.plants, Material.air, Material.leaves, Material.portal, Material.vine, Material.web, Material.portal };
|
||||
Material[] mats = { Material.plants, Material.air, Material.leaves, Material.portal, Material.vine, Material.web };
|
||||
|
||||
public EntityHomingShard (World w)
|
||||
{
|
||||
@@ -129,9 +129,9 @@ public class EntityHomingShard extends EntityThrowable implements IEntityAdditio
|
||||
|
||||
if (!whitelisted.contains(b.getMaterial()))
|
||||
{
|
||||
this.motionZ *= -0.5D;
|
||||
this.motionX *= -0.5D;
|
||||
this.motionY *= -0.5D;
|
||||
this.motionZ *= -0.8D;
|
||||
this.motionX *= -0.8D;
|
||||
this.motionY *= -0.8D;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -190,9 +190,9 @@ public class EntityHomingShard extends EntityThrowable implements IEntityAdditio
|
||||
dy /= d;
|
||||
dz /= d;
|
||||
|
||||
this.motionX = dx;
|
||||
this.motionY = dy;
|
||||
this.motionZ = dz;
|
||||
this.motionX = dx * Math.random();
|
||||
this.motionY = dy * Math.random();
|
||||
this.motionZ = dz * Math.random();
|
||||
|
||||
this.worldObj.playSoundAtEntity(this, "taintedmagic:shard", 0.1F, 2.0F * this.worldObj.rand.nextFloat());
|
||||
}
|
||||
|
||||
@@ -263,9 +263,9 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable
|
||||
}
|
||||
case 1 :
|
||||
{
|
||||
for (int a = 0; a < 50; a++)
|
||||
for (int a = 0; a < 75; a++)
|
||||
{
|
||||
EntityTaintBubble proj = new EntityTaintBubble(w, p, 5.0F, getAttackDamage(s) * 1.5F, false);
|
||||
EntityTaintBubble proj = new EntityTaintBubble(w, p, 5.0F, getAttackDamage(s) * 2.0F, false);
|
||||
proj.posX += proj.motionX;
|
||||
proj.posY += proj.motionY;
|
||||
proj.posZ += proj.motionZ;
|
||||
@@ -278,8 +278,6 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable
|
||||
break;
|
||||
}
|
||||
}
|
||||
s.stackTagCompound = new NBTTagCompound();
|
||||
s.stackTagCompound.setInteger("inscription", 2);
|
||||
}
|
||||
|
||||
private boolean isFullyCharged (EntityPlayer p)
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package taintedmagic.common.items.wand.foci;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
@@ -23,7 +25,8 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemFocusMeteorology extends ItemFocusBasic
|
||||
{
|
||||
IIcon depthIcon = null;
|
||||
public IIcon depthIcon;
|
||||
public IIcon iconOverlay;
|
||||
|
||||
private static final AspectList cost = new AspectList().add(Aspect.AIR, 1000).add(Aspect.WATER, 1000).add(Aspect.FIRE, 1000).add(Aspect.EARTH, 1000).add(Aspect.ORDER, 1000).add(Aspect.ENTROPY, 1000);
|
||||
|
||||
@@ -37,6 +40,7 @@ public class ItemFocusMeteorology extends ItemFocusBasic
|
||||
public void registerIcons (IIconRegister ir)
|
||||
{
|
||||
this.icon = ir.registerIcon("taintedmagic:ItemFocusMeteorology");
|
||||
this.iconOverlay = ir.registerIcon("taintedmagic:ItemFocusTime_overlay");
|
||||
this.depthIcon = ir.registerIcon("taintedmagic:ItemFocusMeteorology_depth");
|
||||
}
|
||||
|
||||
@@ -70,6 +74,25 @@ public class ItemFocusMeteorology extends ItemFocusBasic
|
||||
return false;
|
||||
}
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
public int getRenderPasses (int m)
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly (Side.CLIENT)
|
||||
public IIcon getIconFromDamageForRenderPass (int meta, int pass)
|
||||
{
|
||||
return (pass == 0) ? this.icon : this.iconOverlay;
|
||||
}
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
public boolean requiresMultipleRenderPasses ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public ItemFocusBasic.WandFocusAnimation getAnimation (ItemStack s)
|
||||
{
|
||||
return ItemFocusBasic.WandFocusAnimation.WAVE;
|
||||
|
||||
@@ -79,7 +79,7 @@ public class ItemFocusTime extends ItemFocusBasic
|
||||
if (pass == 0)
|
||||
{
|
||||
EntityPlayer p = TaintedMagic.proxy.getClientPlayer();
|
||||
return p == null ? 0xFFFFFF : Color.HSBtoRGB(p.ticksExisted * 16F % 360 / 360F, 1F, 1F);
|
||||
return p == null ? 0xFFFFFF : Color.HSBtoRGB(p.ticksExisted * 8F % 360 / 360F, 1F, 1F);
|
||||
}
|
||||
if (pass == 1) return 16777215;
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ public class RecipeRegistry
|
||||
|
||||
ResearchRegistry.recipes.put("ItemPrimordialEdge", ThaumcraftApi.addInfusionCraftingRecipe("PRIMALBLADE", new ItemStack(ItemRegistry.ItemPrimordialEdge), 8, new AspectList().add(Aspect.WEAPON, 65).add(Aspect.ELDRITCH, 46).add(Aspect.DARKNESS, 16).add(Aspect.METAL, 60).add(Aspect.VOID, 56), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[]{ ItemApi.getItem("itemPrimalCrusher", 0), ItemApi.getBlock("blockCrystal", 0), ItemApi.getBlock("blockCrystal", 1), ItemApi.getBlock("blockCrystal", 2), ItemApi.getBlock("blockCrystal", 3), ItemApi.getBlock("blockCrystal", 4), ItemApi.getBlock("blockCrystal", 5) }));
|
||||
|
||||
ResearchRegistry.recipes.put("ItemFocusMageMace", ThaumcraftApi.addInfusionCraftingRecipe("MACEFOCUS", new ItemStack(ItemRegistry.ItemFocusMageMace), 3, new AspectList().add(Aspect.WEAPON, 32).add(Aspect.METAL, 8).add(Aspect.ENTROPY, 18).add(Aspect.MAGIC, 26), new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack[]{ new ItemStack(Items.gold_ingot), new ItemStack(Items.quartz), ItemApi.getItem("itemShard", 5), new ItemStack(Items.quartz), new ItemStack(Items.diamond_sword), new ItemStack(Items.quartz), ItemApi.getItem("itemShard", 5), new ItemStack(Items.quartz) }));
|
||||
ResearchRegistry.recipes.put("ItemFocusMageMace", ThaumcraftApi.addInfusionCraftingRecipe("MACEFOCUS", new ItemStack(ItemRegistry.ItemFocusMageMace), 3, new AspectList().add(Aspect.WEAPON, 32).add(Aspect.METAL, 8).add(Aspect.ENTROPY, 18).add(Aspect.MAGIC, 26), new ItemStack(Blocks.iron_block), new ItemStack[]{ new ItemStack(Items.gold_ingot), new ItemStack(Items.quartz), ItemApi.getItem("itemShard", 5), new ItemStack(Items.quartz), new ItemStack(ConfigItems.itemSwordThaumium), new ItemStack(Items.quartz), ItemApi.getItem("itemShard", 5), new ItemStack(Items.quartz) }));
|
||||
|
||||
ResearchRegistry.recipes.put("ItemSwordCrimson", ThaumcraftApi.addInfusionCraftingRecipe("CRIMSONBLADE", new ItemStack(ConfigItems.itemSwordCrimson), 7, new AspectList().add(Aspect.WEAPON, 32).add(Aspect.METAL, 16).add(Aspect.ENTROPY, 8).add(Aspect.ELDRITCH, 18).add(Aspect.VOID, 32), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[]{ new ItemStack(ItemRegistry.ItemCrystalDagger), new ItemStack(ItemRegistry.ItemMaterial, 1, 7), new ItemStack(ItemRegistry.ItemMaterial, 1, 8), new ItemStack(ItemRegistry.ItemMaterial, 1, 7), new ItemStack(ItemRegistry.ItemMaterial, 1, 2), new ItemStack(ItemRegistry.ItemMaterial, 1, 7), new ItemStack(ItemRegistry.ItemMaterial, 1, 8), new ItemStack(ItemRegistry.ItemMaterial, 1, 7) }));
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ public class ResearchRegistry
|
||||
new TaintedMagicResearchItem("CRYSTALDAGGER", TM, new AspectList().add(Aspect.WEAPON, 4).add(Aspect.FIRE, 4).add(Aspect.HEAL, 4), 0, -3, 0, new ItemStack(ItemRegistry.ItemCrystalDagger, 1, 7)).setParentsHidden("ENCHFABRIC", "ESSENTIACRYSTAL", "VOIDMETAL").setParents("TAINTEDMAGIC").setComplexity(2).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((IArcaneRecipe) recipes.get("ItemCrystalDagger")) }).registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("CRYSTALDAGGER", 2);
|
||||
|
||||
new TaintedMagicResearchItem("MACEFOCUS", TM, new AspectList().add(Aspect.ENTROPY, 10).add(Aspect.EARTH, 4).add(Aspect.WEAPON, 6).add(Aspect.MAGIC, 8), 5, 4, 0, new ItemStack(ItemRegistry.ItemFocusMageMace)).setParents("TMFOCUSFIRE").setConcealed().setComplexity(2).setParentsHidden("FOCUSFIRE", "SHADOWMETAL").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFocusMageMace")) }).registerResearchItem();
|
||||
new TaintedMagicResearchItem("MACEFOCUS", TM, new AspectList().add(Aspect.ENTROPY, 10).add(Aspect.EARTH, 4).add(Aspect.WEAPON, 6).add(Aspect.MAGIC, 8), 5, 4, 0, new ItemStack(ItemRegistry.ItemFocusMageMace)).setParents("TMFOCUSFIRE").setConcealed().setComplexity(2).setParentsHidden("THAUMIUM").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemFocusMageMace")) }).registerResearchItem();
|
||||
|
||||
new TaintedMagicResearchItem("CRIMSONBLADE", TM, new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.ELDRITCH, 2).add(Aspect.WEAPON, 16).add(Aspect.VOID, 6), -7, 1, 0, ItemApi.getItem("itemSwordCrimson", 0)).setParents("PRAETORARMOR").setConcealed().setComplexity(3).setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemSwordCrimson")) }).setSecondary().registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("CRIMSONBLADE", 3);
|
||||
|
||||
Reference in new issue
Block a user