Upload my Code Changes/Format/imports

This commit is contained in:
Alexander committed 2014-02-16 14:23:50 -05:00
1 parent 5bcdb7ca46
commit 5d4e38c0cb
264 files changed
+4014 -3972

No files matched your search

@@ -2,12 +2,7 @@ package mcp.mobius.waila.api;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public interface IWailaBlock
{
@@ -1,10 +1,7 @@
package mcp.mobius.waila.api;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
+7 -10
View File
@@ -1,31 +1,28 @@
package mods.battlegear2.api;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
//This is a tempory fix until we get the heradry system up and running
public interface IDyable {
public interface IDyable
{
/**
* Return whether the specified armor ItemStack has a color.
*/
public boolean hasColor(ItemStack par1ItemStack);
public boolean hasColor (ItemStack par1ItemStack);
/**
* Return the color for the specified armor ItemStack.
*/
public int getColor(ItemStack par1ItemStack);
public int getColor (ItemStack par1ItemStack);
public void setColor(ItemStack dyable, int rgb);
public void setColor (ItemStack dyable, int rgb);
/**
* Remove the color from the specified armor ItemStack.
*/
public void removeColor(ItemStack par1ItemStack);
public int getDefaultColor(ItemStack par1ItemStack);
public void removeColor (ItemStack par1ItemStack);
public int getDefaultColor (ItemStack par1ItemStack);
}
@@ -1,10 +1,10 @@
package mods.battlegear2.api;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
public interface IShield {
public interface IShield
{
/**
* Gets the decay rate for the stamina bar when the shield is in use.
@@ -14,7 +14,7 @@ public interface IShield {
* @param shield The {@link #ItemStack} representing the shield
* @return a value between 0 & 1 representing the decay rate per tick
*/
public float getDecayRate(ItemStack shield);
public float getDecayRate (ItemStack shield);
/**
* Returns true if the current shield can and should block the given damage source
@@ -23,7 +23,7 @@ public interface IShield {
* @param source The {@link #DamageSource} representing the current damage
* @return true if the shield can block the given damage type
*/
public boolean canBlock(ItemStack shield, DamageSource source);
public boolean canBlock (ItemStack shield, DamageSource source);
/**
* Gets the extra decay rate to the stamina bar when the shield is damaged
@@ -32,7 +32,7 @@ public interface IShield {
* @param amount The amount of damage the shield has absorbed
* @return a value between 0 & 1 representing the decay rate
*/
public float getDamageDecayRate(ItemStack shield, float amount);
public float getDamageDecayRate (ItemStack shield, float amount);
/**
* Returns the block angle in degrees that the shield can block.
@@ -41,8 +41,7 @@ public interface IShield {
* @param shield The {@link #ItemStack} representing the shield
* @return The maximum angle the shield should be able to block at
*/
public float getBlockAngle(ItemStack shield);
public float getBlockAngle (ItemStack shield);
/**
* Returns the time a shield bash should take to be preformed. A shield bash will disallow actions
@@ -50,5 +49,5 @@ public interface IShield {
*
* @return The amount of ticks the shield bash animation will play
*/
public int getBashTimer(ItemStack shield);
public int getBashTimer (ItemStack shield);
}
@@ -2,27 +2,32 @@ package mods.battlegear2.api;
import net.minecraftforge.event.entity.player.PlayerEvent;
public class PlayerEventChild extends PlayerEvent{
public class PlayerEventChild extends PlayerEvent
{
public PlayerEvent parent;
public PlayerEvent parent;
public PlayerEventChild(PlayerEvent parent) {
super(parent.entityPlayer);
this.parent = parent;
}
public PlayerEventChild(PlayerEvent parent)
{
super(parent.entityPlayer);
this.parent = parent;
}
public void setCancelParentEvent(boolean cancel) {
public void setCancelParentEvent (boolean cancel)
{
parent.setCanceled(cancel);
}
@Override
public void setCanceled(boolean cancel) {
public void setCanceled (boolean cancel)
{
super.setCanceled(cancel);
parent.setCanceled(cancel);
}
@Override
public void setResult(Result value) {
public void setResult (Result value)
{
super.setResult(value);
parent.setResult(value);
}
@@ -5,28 +5,29 @@ import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public interface IArrowContainer2 {
public interface IArrowContainer2
{
/**
* Returns the maximum amout of slots in the arrow container
* @param container {@link #ItemStack} representing this item
* @return the amount of slots
*/
public int getSlotCount(ItemStack container);
public int getSlotCount (ItemStack container);
/**
* Returns the currently selected slot in the arrow container
* @param container {@link #ItemStack} representing this item
* @return the currently selected slot
*/
public int getSelectedSlot(ItemStack container);
public int getSelectedSlot (ItemStack container);
/**
* Sets the currently selected slot to the given value
* @param container {@link #ItemStack} representing this item
* @param newSlot the new slot index
*/
public void setSelectedSlot(ItemStack container, int newSlot);
public void setSelectedSlot (ItemStack container, int newSlot);
/**
* Returns the itemStack in the currently selected slot
@@ -34,7 +35,7 @@ public interface IArrowContainer2 {
* @param slot the slot index
* @return The {@link #ItemStack} in the given slot.
*/
public ItemStack getStackInSlot(ItemStack container, int slot);
public ItemStack getStackInSlot (ItemStack container, int slot);
/**
* Sets places the given item stack in the give slot
@@ -42,8 +43,7 @@ public interface IArrowContainer2 {
* @param slot the slot index
* @param container {@link #ItemStack} representing the new stack
*/
public void setStackInSlot(ItemStack container, int slot, ItemStack stack);
public void setStackInSlot (ItemStack container, int slot, ItemStack stack);
/**
*
@@ -52,7 +52,7 @@ public interface IArrowContainer2 {
* @param player The {@link #EntityPlayer} using the bow
* @return true if the item contains at least one arrow in the selected slot
*/
public boolean hasArrowFor(ItemStack container, ItemStack bow, EntityPlayer player, int slot);
public boolean hasArrowFor (ItemStack container, ItemStack bow, EntityPlayer player, int slot);
/**
* The arrow spawned when bow is used with this non empty container equipped
@@ -62,7 +62,8 @@ public interface IArrowContainer2 {
* @param world
* @return the arrow entity to spawn when bow is used
*/
public EntityArrow getArrowType(ItemStack container, World world, EntityPlayer player, float charge);
public EntityArrow getArrowType (ItemStack container, World world, EntityPlayer player, float charge);
/**
* Action to take after an arrow has been fired
* Usually equal to removing an arrow from the container
@@ -72,19 +73,21 @@ public interface IArrowContainer2 {
* @param bow The bow which fired
* @param arrow the arrow fired
*/
public void onArrowFired(World world, EntityPlayer player, ItemStack container, ItemStack bow, EntityArrow arrow);
public void onArrowFired (World world, EntityPlayer player, ItemStack container, ItemStack bow, EntityArrow arrow);
/**
* Called before the arrow is fired from this container
* @param arrowEvent Used to decide bow damage, bow sound and arrow enchantment
*/
public void onPreArrowFired(QuiverArrowEvent arrowEvent);
public void onPreArrowFired (QuiverArrowEvent arrowEvent);
/**
* Called when the container is put on a crafting bench with other items
* @param container The {@link #ItemStack} representing this item
* @param arrowStack The {@link #ItemStack} representing other items
* @return True to receive {@link #addArrows(ItemStack, ItemStack)}
*/
public boolean isCraftableWithArrows(ItemStack contaner, ItemStack arrowStack);
public boolean isCraftableWithArrows (ItemStack contaner, ItemStack arrowStack);
/**
* Crafts the item with the items from {@link #isCraftableWithArrows(ItemStack, ItemStack)}
@@ -92,8 +95,6 @@ public interface IArrowContainer2 {
* @param arrows Another valid item on the crafting bench
* @return Number of arrows that couldn't fit in
*/
public ItemStack addArrows(ItemStack container, ItemStack newStack);
public ItemStack addArrows (ItemStack container, ItemStack newStack);
}
@@ -1,30 +1,30 @@
package mods.battlegear2.api.quiver;
import mods.battlegear2.api.PlayerEventChild;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
public class QuiverArrowEvent extends PlayerEventChild{
public class QuiverArrowEvent extends PlayerEventChild
{
public int bowDamage = 1;
public float bowSoundVolume = 1.0F;
public boolean addEnchantments = true;
public ArrowLooseEvent event;
public int bowDamage = 1;
public float bowSoundVolume = 1.0F;
public boolean addEnchantments = true;
public ArrowLooseEvent event;
public QuiverArrowEvent(ArrowLooseEvent parent) {
super(parent);
this.event = parent;
}
public QuiverArrowEvent(ArrowLooseEvent parent)
{
super(parent);
this.event = parent;
}
public ItemStack getBow()
{
return event.bow;
}
public int getCharge()
{
return event.charge;
}
public ItemStack getBow ()
{
return event.bow;
}
public int getCharge ()
{
return event.charge;
}
}
@@ -1,43 +1,52 @@
package mods.battlegear2.api.quiver;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import java.util.Comparator;
import java.util.Map;
import java.util.TreeMap;
public class QuiverArrowRegistry {
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
private static Map<ItemStack, Class<? extends EntityArrow>> map = new TreeMap<ItemStack, Class<? extends EntityArrow>>(new StackComparator());
public class QuiverArrowRegistry
{
public static void addArrowToRegistry(Item i, int itemMetadata, Class<? extends EntityArrow> entityArrow){
private static Map<ItemStack, Class<? extends EntityArrow>> map = new TreeMap<ItemStack, Class<? extends EntityArrow>>(new StackComparator());
public static void addArrowToRegistry (Item i, int itemMetadata, Class<? extends EntityArrow> entityArrow)
{
ItemStack stack = new ItemStack(i, 1, itemMetadata);
map.put(stack, entityArrow);
}
public static Class<? extends EntityArrow> getArrowClass(ItemStack stack){
public static Class<? extends EntityArrow> getArrowClass (ItemStack stack)
{
return map.get(stack);
}
static class StackComparator implements Comparator<ItemStack> {
static class StackComparator implements Comparator<ItemStack>
{
@Override
public int compare(ItemStack stack, ItemStack stack2) {
public int compare (ItemStack stack, ItemStack stack2)
{
if(stack == stack2){
if (stack == stack2)
{
return 0;
}else{
}
else
{
int idDiff =0;//COMMENTED TO SHUT UP IDE= stack.itemID - stack2.itemID;
if(idDiff != 0){
int idDiff = 0;//COMMENTED TO SHUT UP IDE= stack.itemID - stack2.itemID;
if (idDiff != 0)
{
return idDiff;
}else
}
else
return stack.getItemDamage() - stack2.getItemDamage();
}
}
}
}
@@ -2,13 +2,14 @@ package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLivingBase;
public interface IBackStabbable {
public interface IBackStabbable
{
/**
* Action to perform on back stabbing
* @param entityHit
* @param entityHitting
/**
* Action to perform on back stabbing
* @param entityHit
* @param entityHitting
* @return true if it adds an hitting action
*/
public boolean onBackStab(EntityLivingBase entityHit, EntityLivingBase entityHitting);
*/
public boolean onBackStab (EntityLivingBase entityHit, EntityLivingBase entityHitting);
}
@@ -1,30 +1,31 @@
package mods.battlegear2.api.weapons;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import cpw.mods.fml.relauncher.Side;
public interface IBattlegearWeapon {
public interface IBattlegearWeapon
{
/**
* Returns true if the weapon will allow other weapons to be placed in the partner offhand slot
*/
public boolean willAllowOffhandWeapon();
public boolean willAllowOffhandWeapon ();
/**
* Will allow shield
*/
public boolean willAllowShield();
public boolean willAllowShield ();
/**
* Returns true if the weapon be dual wielded in the offhand slot
*/
public boolean isOffhandHandDualWeapon();
public boolean isOffhandHandDualWeapon ();
/**
* Returns true if the weapon should always be sheathed on the back, false if it should be sheathed on the hip
*/
public boolean sheatheOnBack();
public boolean sheatheOnBack ();
/**
* Perform any function when the item is held in the offhand and the user right clicks an entity.
@@ -36,7 +37,7 @@ public interface IBattlegearWeapon {
* @param offhandItem the ItemStack currently being held in the left hand
* @return true if the off hand swing animation should be performed
*/
public boolean offhandAttackEntity(OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem);
public boolean offhandAttackEntity (OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem);
/**
* Perform any function when the item is held in the offhand and the user right clicks "Air".
@@ -46,7 +47,7 @@ public interface IBattlegearWeapon {
* @param offhandItem the ItemStack currently being held in the left hand
* @return true if the off hand swing animation should be performed
*/
public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
public boolean offhandClickAir (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
/**
* Perform any function when the item is held in the offhand and the user right clicks a block.
@@ -56,7 +57,7 @@ public interface IBattlegearWeapon {
* @param mainhandItem the ItemStack currently being held in the right hand
* @param offhandItem the ItemStack currently being held in the left hand
*/
public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
public boolean offhandClickBlock (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem);
/**
* Perform any passive effects on each game tick when the item is held in the offhand
@@ -65,6 +66,6 @@ public interface IBattlegearWeapon {
* @param mainhandItem the ItemStack currently being held in the right hand
* @param offhandItem the ItemStack currently being held in the left hand
*/
public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem);
public void performPassiveEffects (Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem);
}
@@ -2,11 +2,12 @@ package mods.battlegear2.api.weapons;
import net.minecraft.item.ItemStack;
public interface IExtendedReachWeapon {
/**
* The distance the weapon will hit (note this will ONLY work for main hand weapons)
* @param stack
* @return
*/
public float getReachModifierInBlocks(ItemStack stack);
public interface IExtendedReachWeapon
{
/**
* The distance the weapon will hit (note this will ONLY work for main hand weapons)
* @param stack
* @return
*/
public float getReachModifierInBlocks (ItemStack stack);
}
@@ -1,15 +1,15 @@
package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
public interface IHitTimeModifier {
/**
*
* @param entityHit
* @return The amount to modify the hit shield
*/
public int getHitTime(ItemStack stack, EntityLivingBase entityHit);
public interface IHitTimeModifier
{
/**
*
* @param entityHit
* @return The amount to modify the hit shield
*/
public int getHitTime (ItemStack stack, EntityLivingBase entityHit);
}
@@ -1,13 +1,13 @@
package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
public interface IPenetrateWeapon {
/**
* The amount of damage bypassing armor
* @param stack The {@link net.minecraft.item.ItemStack} representative of the item dealing the hit.
* @return the amount of damage that bypasses armour
*/
public int getPenetratingPower(ItemStack stack);
public interface IPenetrateWeapon
{
/**
* The amount of damage bypassing armor
* @param stack The {@link net.minecraft.item.ItemStack} representative of the item dealing the hit.
* @return the amount of damage that bypasses armour
*/
public int getPenetratingPower (ItemStack stack);
}
@@ -1,13 +1,12 @@
package mods.battlegear2.api.weapons;
import java.util.Map;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.potion.PotionEffect;
import java.util.Map;
public interface IPotionEffect {
public interface IPotionEffect
{
/**
* Returns a map containing the potion effects to apply to an entity hit by the weapon. Each effect
@@ -18,6 +17,6 @@ public interface IPotionEffect {
* @param entityHitting
* @return A Map of {@link PotionEffect} with chance value ranging from 0 to 1, to be dealt to the entityHit
*/
public Map<PotionEffect,Float> getEffectsOnHit(EntityLivingBase entityHit, EntityLivingBase entityHitting);
public Map<PotionEffect, Float> getEffectsOnHit (EntityLivingBase entityHit, EntityLivingBase entityHitting);
}
@@ -1,16 +1,14 @@
package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
public interface ISpecialEffect {
/**
*
* @param entityHit The entity the effect will be applied to.
* @param entityHitting
* @return true if it adds an hitting action
*/
public boolean performEffects(EntityLivingBase entityHit, EntityLivingBase entityHitting);
public interface ISpecialEffect
{
/**
*
* @param entityHit The entity the effect will be applied to.
* @param entityHitting
* @return true if it adds an hitting action
*/
public boolean performEffects (EntityLivingBase entityHit, EntityLivingBase entityHitting);
}
@@ -3,20 +3,22 @@ package mods.battlegear2.api.weapons;
import mods.battlegear2.api.PlayerEventChild;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.player.EntityInteractEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
public class OffhandAttackEvent extends PlayerEventChild {
public class OffhandAttackEvent extends PlayerEventChild
{
public boolean swingOffhand = true;
public boolean shouldAttack = true;
public EntityInteractEvent event;
public OffhandAttackEvent(EntityInteractEvent parent) {
public OffhandAttackEvent(EntityInteractEvent parent)
{
super(parent);
this.event = parent;
}
public Entity getTarget() {
public Entity getTarget ()
{
return event.target;
}
}