lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Doing more cleanup

Browse source
This commit is contained in:
WayofTime 2015-07-29 09:15:43 -04:00
parent 59b8ecc271
commit b090d154eb
7 changed files with 158 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java
View file

@ -17,10 +17,10 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.IThrowableEntity;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.common.registry.IThrowableEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
//Shamelessly ripped off from x3n0ph0b3 //Shamelessly ripped off from x3n0ph0b3
public class EnergyBlastProjectile extends Entity implements IProjectile, IThrowableEntity public class EnergyBlastProjectile extends Entity implements IProjectile, IThrowableEntity

290
src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java
View file

@ -1,145 +1,145 @@
package WayofTime.alchemicalWizardry.common.items.forestry; //package WayofTime.alchemicalWizardry.common.items.forestry;
//
import java.util.List; //import java.util.List;
//
import net.minecraft.client.renderer.texture.IIconRegister; //import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; //import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; //import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; //import net.minecraft.util.StatCollector;
import net.minecraft.world.World; //import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; //import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.EnergyItems; //import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side; //import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; //import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.apiculture.IBee; //import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome; //import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing; //import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IHiveFrame; //import forestry.api.apiculture.IHiveFrame;
//
public class ItemBloodFrame extends EnergyItems implements IHiveFrame //public class ItemBloodFrame extends EnergyItems implements IHiveFrame
{ //{
public ItemBloodFrame() // public ItemBloodFrame()
{ // {
super(); // super();
this.maxStackSize = 1; // this.maxStackSize = 1;
this.setMaxDamage(10); // this.setMaxDamage(10);
setEnergyUsed(1000); // setEnergyUsed(1000);
setCreativeTab(AlchemicalWizardry.tabBloodMagic); // setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} // }
//
@Override // @Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) // public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
{ // {
par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc")); // par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc"));
//
if (!(par1ItemStack.getTagCompound() == null)) // if (!(par1ItemStack.getTagCompound() == null))
{ // {
par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); // par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName"));
} // }
} // }
//
@Override // @Override
@SideOnly(Side.CLIENT) // @SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) // public void registerIcons(IIconRegister iconRegister)
{ // {
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodFrame"); // this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodFrame");
} // }
//
@Override // @Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) // public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ // {
if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) // if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
{ // {
if (par1ItemStack.getItemDamage() > 0) // if (par1ItemStack.getItemDamage() > 0)
{ // {
if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) // if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{ // {
par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); // par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
} // }
} // }
} // }
return par1ItemStack; // return par1ItemStack;
} // }
//
@Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) // @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier)
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return 1; // return 1;
} // }
//
@Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) // @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier)
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return 1; // return 1;
} // }
//
@Override public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) // @Override public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier)
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return 0.0001f; // return 0.0001f;
} // }
//
@Override public float getProductionModifier(IBeeGenome genome, float currentModifier) // @Override public float getProductionModifier(IBeeGenome genome, float currentModifier)
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return 0; // return 0;
} // }
//
@Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) // @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier)
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return 1; // return 1;
} // }
//
@Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) // @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier)
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return 1; // return 1;
} // }
//
@Override public boolean isSealed() // @Override public boolean isSealed()
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return false; // return false;
} // }
//
@Override public boolean isSelfLighted() // @Override public boolean isSelfLighted()
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return false; // return false;
} // }
//
@Override public boolean isSunlightSimulated() // @Override public boolean isSunlightSimulated()
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return false; // return false;
} // }
//
@Override public boolean isHellish() // @Override public boolean isHellish()
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
return false; // return false;
} // }
//
@Override public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) // @Override public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear)
{ // {
// TODO Auto-generated method stub // // TODO Auto-generated method stub
if(EnergyItems.canSyphonInContainer(frame, getEnergyUsed()*wear)) // if(EnergyItems.canSyphonInContainer(frame, getEnergyUsed()*wear))
{ // {
EnergyItems.syphonWhileInContainer(frame, getEnergyUsed()*wear); // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed()*wear);
return frame; // return frame;
}else // }else
{ // {
frame.setItemDamage(frame.getItemDamage() + wear); // frame.setItemDamage(frame.getItemDamage() + wear);
if(frame.getItemDamage()>=frame.getMaxDamage()) // if(frame.getItemDamage()>=frame.getMaxDamage())
{ // {
return null; // return null;
} // }
return frame; // return frame;
} // }
//
} // }
//
//
//
} //}

14
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/TEAltarRenderer.java
View file

@ -8,7 +8,7 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraft.util.EnumFacing;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -122,7 +122,7 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
return scaleFactor; return scaleFactor;
} }
private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z, ForgeDirection forgeDirection) private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z, EnumFacing forgeDirection)
{ {
if (ghostItemStack != null) if (ghostItemStack != null)
{ {
@ -166,11 +166,6 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
return; return;
} }
case UNKNOWN:
{
return;
}
default: default:
{ {
return; return;
@ -216,11 +211,6 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer
return; return;
} }
case UNKNOWN:
{
return;
}
default: default:
{ {
return; return;

4
src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEffectBlock.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraft.util.EnumFacing;
public class ModelSpellEffectBlock extends ModelBase public class ModelSpellEffectBlock extends ModelBase
{ {
@ -184,7 +184,7 @@ public class ModelSpellEffectBlock extends ModelBase
setRotation(outputSpacer4, 0F, 0F, 0F); setRotation(outputSpacer4, 0F, 0F, 0F);
} }
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, ForgeDirection input, ForgeDirection output) public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, EnumFacing input, EnumFacing output)
{ {
super.render(entity, f, f1, f2, f3, f4, f5); super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity); setRotationAngles(f, f1, f2, f3, f4, f5, entity);

4
src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEnhancementBlock.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraft.util.EnumFacing;
public class ModelSpellEnhancementBlock extends ModelBase public class ModelSpellEnhancementBlock extends ModelBase
@ -185,7 +185,7 @@ public class ModelSpellEnhancementBlock extends ModelBase
setRotation(outputSecond, 0F, 0F, 0F); setRotation(outputSecond, 0F, 0F, 0F);
} }
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, ForgeDirection input, ForgeDirection output) public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, EnumFacing input, EnumFacing output)
{ {
super.render(entity, f, f1, f2, f3, f4, f5); super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity); setRotationAngles(f, f1, f2, f3, f4, f5, entity);

4
src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellModifierBlock.java
View file

@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraft.util.EnumFacing;
public class ModelSpellModifierBlock extends ModelBase public class ModelSpellModifierBlock extends ModelBase
{ {
@ -149,7 +149,7 @@ public class ModelSpellModifierBlock extends ModelBase
setRotation(output4, 0F, 0F, 0F); setRotation(output4, 0F, 0F, 0F);
} }
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, ForgeDirection input, ForgeDirection output) public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, EnumFacing input, EnumFacing output)
{ {
super.render(entity, f, f1, f2, f3, f4, f5); super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity); setRotationAngles(f, f1, f2, f3, f4, f5, entity);

4
src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellParadigmBlock.java
View file

@ -10,7 +10,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraft.util.EnumFacing;
public class ModelSpellParadigmBlock extends ModelBase public class ModelSpellParadigmBlock extends ModelBase
{ {
@ -100,7 +100,7 @@ public class ModelSpellParadigmBlock extends ModelBase
setRotation(Shape5, 0F, 0F, 0F); setRotation(Shape5, 0F, 0F, 0F);
} }
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, ForgeDirection input, ForgeDirection output) public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, EnumFacing input, EnumFacing output)
{ {
super.render(entity, f, f1, f2, f3, f4, f5); super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity); setRotationAngles(f, f1, f2, f3, f4, f5, entity);