From b090d154eb800f5c0ddfe68ee82d6126346e707f Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 29 Jul 2015 09:15:43 -0400 Subject: [PATCH] Doing more cleanup --- .../projectile/EnergyBlastProjectile.java | 6 +- .../common/items/forestry/ItemBloodFrame.java | 290 +++++++++--------- .../renderer/block/TEAltarRenderer.java | 14 +- .../renderer/model/ModelSpellEffectBlock.java | 4 +- .../model/ModelSpellEnhancementBlock.java | 4 +- .../model/ModelSpellModifierBlock.java | 4 +- .../model/ModelSpellParadigmBlock.java | 4 +- 7 files changed, 158 insertions(+), 168 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java index fa7daebc..4dc6faf7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java @@ -17,10 +17,10 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; 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 cpw.mods.fml.common.registry.IThrowableEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; //Shamelessly ripped off from x3n0ph0b3 public class EnergyBlastProjectile extends Entity implements IProjectile, IThrowableEntity diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java index 1a10f2da..8acc4636 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java @@ -1,145 +1,145 @@ -package WayofTime.alchemicalWizardry.common.items.forestry; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IHiveFrame; - -public class ItemBloodFrame extends EnergyItems implements IHiveFrame -{ - public ItemBloodFrame() - { - super(); - this.maxStackSize = 1; - this.setMaxDamage(10); - setEnergyUsed(1000); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) - { - par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodFrame"); - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) - { - if (par1ItemStack.getItemDamage() > 0) - { - if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) - { - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); - } - } - } - return par1ItemStack; - } - - @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) - { - // TODO Auto-generated method stub - return 1; - } - - @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) - { - // TODO Auto-generated method stub - return 1; - } - - @Override public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) - { - // TODO Auto-generated method stub - return 0.0001f; - } - - @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) - { - // TODO Auto-generated method stub - return 0; - } - - @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) - { - // TODO Auto-generated method stub - return 1; - } - - @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) - { - // TODO Auto-generated method stub - return 1; - } - - @Override public boolean isSealed() - { - // TODO Auto-generated method stub - return false; - } - - @Override public boolean isSelfLighted() - { - // TODO Auto-generated method stub - return false; - } - - @Override public boolean isSunlightSimulated() - { - // TODO Auto-generated method stub - return false; - } - - @Override public boolean isHellish() - { - // TODO Auto-generated method stub - return false; - } - - @Override public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) - { - // TODO Auto-generated method stub - if(EnergyItems.canSyphonInContainer(frame, getEnergyUsed()*wear)) - { - EnergyItems.syphonWhileInContainer(frame, getEnergyUsed()*wear); - return frame; - }else - { - frame.setItemDamage(frame.getItemDamage() + wear); - if(frame.getItemDamage()>=frame.getMaxDamage()) - { - return null; - } - return frame; - } - - } - - - -} +//package WayofTime.alchemicalWizardry.common.items.forestry; +// +//import java.util.List; +// +//import net.minecraft.client.renderer.texture.IIconRegister; +//import net.minecraft.entity.player.EntityPlayer; +//import net.minecraft.item.ItemStack; +//import net.minecraft.util.StatCollector; +//import net.minecraft.world.World; +//import WayofTime.alchemicalWizardry.AlchemicalWizardry; +//import WayofTime.alchemicalWizardry.common.items.EnergyItems; +//import cpw.mods.fml.relauncher.Side; +//import cpw.mods.fml.relauncher.SideOnly; +//import forestry.api.apiculture.IBee; +//import forestry.api.apiculture.IBeeGenome; +//import forestry.api.apiculture.IBeeHousing; +//import forestry.api.apiculture.IHiveFrame; +// +//public class ItemBloodFrame extends EnergyItems implements IHiveFrame +//{ +// public ItemBloodFrame() +// { +// super(); +// this.maxStackSize = 1; +// this.setMaxDamage(10); +// setEnergyUsed(1000); +// setCreativeTab(AlchemicalWizardry.tabBloodMagic); +// } +// +// @Override +// public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) +// { +// par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc")); +// +// if (!(par1ItemStack.getTagCompound() == null)) +// { +// par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); +// } +// } +// +// @Override +// @SideOnly(Side.CLIENT) +// public void registerIcons(IIconRegister iconRegister) +// { +// this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodFrame"); +// } +// +// @Override +// public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) +// { +// if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) +// { +// if (par1ItemStack.getItemDamage() > 0) +// { +// if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) +// { +// par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); +// } +// } +// } +// return par1ItemStack; +// } +// +// @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) +// { +// // TODO Auto-generated method stub +// return 1; +// } +// +// @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) +// { +// // TODO Auto-generated method stub +// return 1; +// } +// +// @Override public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) +// { +// // TODO Auto-generated method stub +// return 0.0001f; +// } +// +// @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) +// { +// // TODO Auto-generated method stub +// return 0; +// } +// +// @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) +// { +// // TODO Auto-generated method stub +// return 1; +// } +// +// @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) +// { +// // TODO Auto-generated method stub +// return 1; +// } +// +// @Override public boolean isSealed() +// { +// // TODO Auto-generated method stub +// return false; +// } +// +// @Override public boolean isSelfLighted() +// { +// // TODO Auto-generated method stub +// return false; +// } +// +// @Override public boolean isSunlightSimulated() +// { +// // TODO Auto-generated method stub +// return false; +// } +// +// @Override public boolean isHellish() +// { +// // TODO Auto-generated method stub +// return false; +// } +// +// @Override public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) +// { +// // TODO Auto-generated method stub +// if(EnergyItems.canSyphonInContainer(frame, getEnergyUsed()*wear)) +// { +// EnergyItems.syphonWhileInContainer(frame, getEnergyUsed()*wear); +// return frame; +// }else +// { +// frame.setItemDamage(frame.getItemDamage() + wear); +// if(frame.getItemDamage()>=frame.getMaxDamage()) +// { +// return null; +// } +// return frame; +// } +// +// } +// +// +// +//} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/TEAltarRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/TEAltarRenderer.java index 054e1201..2b836d86 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/TEAltarRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/TEAltarRenderer.java @@ -8,7 +8,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -122,7 +122,7 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer 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) { @@ -166,11 +166,6 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer return; } - case UNKNOWN: - { - return; - } - default: { return; @@ -216,11 +211,6 @@ public class TEAltarRenderer extends TileEntitySpecialRenderer return; } - case UNKNOWN: - { - return; - } - default: { return; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEffectBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEffectBlock.java index d816ae3d..fcf03321 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEffectBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEffectBlock.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class ModelSpellEffectBlock extends ModelBase { @@ -184,7 +184,7 @@ public class ModelSpellEffectBlock extends ModelBase 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); setRotationAngles(f, f1, f2, f3, f4, f5, entity); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEnhancementBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEnhancementBlock.java index e83b4084..19e20c45 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEnhancementBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellEnhancementBlock.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class ModelSpellEnhancementBlock extends ModelBase @@ -185,7 +185,7 @@ public class ModelSpellEnhancementBlock extends ModelBase 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); setRotationAngles(f, f1, f2, f3, f4, f5, entity); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellModifierBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellModifierBlock.java index a879889b..28faaf7e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellModifierBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellModifierBlock.java @@ -3,7 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class ModelSpellModifierBlock extends ModelBase { @@ -149,7 +149,7 @@ public class ModelSpellModifierBlock extends ModelBase 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); setRotationAngles(f, f1, f2, f3, f4, f5, entity); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellParadigmBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellParadigmBlock.java index 9fd4d551..4053b60b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellParadigmBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelSpellParadigmBlock.java @@ -10,7 +10,7 @@ package WayofTime.alchemicalWizardry.common.renderer.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class ModelSpellParadigmBlock extends ModelBase { @@ -100,7 +100,7 @@ public class ModelSpellParadigmBlock extends ModelBase 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); setRotationAngles(f, f1, f2, f3, f4, f5, entity);