Permalink
Browse files

Move misplaced entity interfaces

  • Loading branch information...
PseudoKnight committed Aug 3, 2018
1 parent 2c74356 commit f62e7cacd1ebcf96511a5f8fad881b4de4060bf5
Showing with 99 additions and 121 deletions.
  1. +0 −5 src/main/java/com/laytonsmith/abstraction/MCEgg.java
  2. +0 −6 src/main/java/com/laytonsmith/abstraction/MCLightningStrike.java
  3. +1 −0 src/main/java/com/laytonsmith/abstraction/MCProjectileSource.java
  4. +0 −5 src/main/java/com/laytonsmith/abstraction/MCSnowball.java
  5. +0 −5 src/main/java/com/laytonsmith/abstraction/MCVehicle.java
  6. +2 −0 src/main/java/com/laytonsmith/abstraction/MCWorld.java
  7. +1 −0 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCServer.java
  8. +2 −2 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java
  9. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBlockProjectileSource.java
  10. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAgeable.java
  11. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntityProjectileSource.java
  12. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCExperienceOrb.java
  13. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCFireball.java
  14. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCHanging.java
  15. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCItem.java
  16. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLightningStrike.java
  17. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPainting.java
  18. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCProjectile.java
  19. +2 −2 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCStorageMinecart.java
  20. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCTNT.java
  21. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCTameable.java
  22. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCVehicle.java
  23. +3 −3 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitEntityEvents.java
  24. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitWeatherEvents.java
  25. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCAbstractHorse.java
  26. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCAgeable.java
  27. +2 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCArmorStand.java
  28. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCArrow.java
  29. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCBoat.java
  30. +4 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCEnderCrystal.java
  31. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCExperienceOrb.java
  32. +1 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCFireball.java
  33. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCFishHook.java
  34. +2 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCHanging.java
  35. +4 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCItem.java
  36. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCItemFrame.java
  37. +8 −0 src/main/java/com/laytonsmith/abstraction/entities/MCLightningStrike.java
  38. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCLlamaSpit.java
  39. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCMinecart.java
  40. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCOcelot.java
  41. +1 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCPainting.java
  42. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCParrot.java
  43. +0 −3 src/main/java/com/laytonsmith/abstraction/entities/MCPig.java
  44. +5 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCProjectile.java
  45. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCRabbit.java
  46. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCSheep.java
  47. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCShulkerBullet.java
  48. +0 −7 src/main/java/com/laytonsmith/abstraction/entities/MCSnowball.java
  49. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCTNT.java
  50. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCTameable.java
  51. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCThrownPotion.java
  52. +7 −0 src/main/java/com/laytonsmith/abstraction/entities/MCVehicle.java
  53. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCVillager.java
  54. +0 −7 src/main/java/com/laytonsmith/abstraction/entities/MCWither.java
  55. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCWitherSkull.java
  56. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCWolf.java
  57. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCHangingBreakEvent.java
  58. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCItemDespawnEvent.java
  59. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCItemSpawnEvent.java
  60. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCLightningStrikeEvent.java
  61. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCPlayerDropItemEvent.java
  62. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCPlayerPickupItemEvent.java
  63. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCProjectileHitEvent.java
  64. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCProjectileLaunchEvent.java
  65. +1 −0 src/main/java/com/laytonsmith/core/ObjectGenerator.java
  66. +1 −1 src/main/java/com/laytonsmith/core/Static.java
  67. +2 −2 src/main/java/com/laytonsmith/core/events/drivers/EntityEvents.java
  68. +2 −2 src/main/java/com/laytonsmith/core/events/drivers/VehicleEvents.java
  69. +10 −15 src/main/java/com/laytonsmith/core/functions/EntityManagement.java
  70. +4 −2 src/main/java/com/laytonsmith/core/functions/MobManagement.java

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -1,6 +1,7 @@
package com.laytonsmith.abstraction;
import com.laytonsmith.PureUtilities.Vector3D;
import com.laytonsmith.abstraction.entities.MCProjectile;
import com.laytonsmith.abstraction.enums.MCProjectileType;
public interface MCProjectileSource extends AbstractionObject {

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -3,6 +3,8 @@
import com.laytonsmith.abstraction.blocks.MCBlock;
import com.laytonsmith.abstraction.entities.MCFallingBlock;
import com.laytonsmith.abstraction.entities.MCFirework;
import com.laytonsmith.abstraction.entities.MCItem;
import com.laytonsmith.abstraction.entities.MCLightningStrike;
import com.laytonsmith.abstraction.enums.MCBiomeType;
import com.laytonsmith.abstraction.enums.MCDifficulty;
import com.laytonsmith.abstraction.enums.MCEffect;
@@ -5,6 +5,7 @@
import com.laytonsmith.abstraction.MCCommandMap;
import com.laytonsmith.abstraction.MCCommandSender;
import com.laytonsmith.abstraction.MCConsoleCommandSender;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCInventory;
import com.laytonsmith.abstraction.MCInventoryHolder;
import com.laytonsmith.abstraction.MCItemFactory;
@@ -4,9 +4,9 @@
import com.laytonsmith.abstraction.MCChunk;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCFireworkEffect;
import com.laytonsmith.abstraction.MCItem;
import com.laytonsmith.abstraction.entities.MCItem;
import com.laytonsmith.abstraction.MCItemStack;
import com.laytonsmith.abstraction.MCLightningStrike;
import com.laytonsmith.abstraction.entities.MCLightningStrike;
import com.laytonsmith.abstraction.MCLivingEntity;
import com.laytonsmith.abstraction.MCLocation;
import com.laytonsmith.abstraction.MCPlayer;
@@ -1,7 +1,7 @@
package com.laytonsmith.abstraction.bukkit.blocks;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCProjectile;
import com.laytonsmith.abstraction.entities.MCProjectile;
import com.laytonsmith.PureUtilities.Vector3D;
import com.laytonsmith.abstraction.blocks.MCBlock;
import com.laytonsmith.abstraction.blocks.MCBlockProjectileSource;
@@ -1,7 +1,7 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.AbstractionObject;
import com.laytonsmith.abstraction.MCAgeable;
import com.laytonsmith.abstraction.entities.MCAgeable;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
@@ -2,7 +2,7 @@
import com.laytonsmith.PureUtilities.Vector3D;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCProjectile;
import com.laytonsmith.abstraction.entities.MCProjectile;
import com.laytonsmith.abstraction.MCProjectileSource;
import com.laytonsmith.abstraction.bukkit.BukkitConvertor;
import com.laytonsmith.abstraction.enums.MCProjectileType;
@@ -1,6 +1,6 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCExperienceOrb;
import com.laytonsmith.abstraction.entities.MCExperienceOrb;
import org.bukkit.entity.Entity;
import org.bukkit.entity.ExperienceOrb;
@@ -1,7 +1,7 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.PureUtilities.Vector3D;
import com.laytonsmith.abstraction.MCFireball;
import com.laytonsmith.abstraction.entities.MCFireball;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Fireball;
import org.bukkit.util.Vector;
@@ -1,6 +1,6 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCHanging;
import com.laytonsmith.abstraction.entities.MCHanging;
import com.laytonsmith.abstraction.blocks.MCBlockFace;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity;
@@ -1,6 +1,6 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCItem;
import com.laytonsmith.abstraction.entities.MCItem;
import com.laytonsmith.abstraction.MCItemStack;
import com.laytonsmith.abstraction.bukkit.BukkitMCItemStack;
import org.bukkit.entity.Entity;
@@ -1,6 +1,6 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCLightningStrike;
import com.laytonsmith.abstraction.entities.MCLightningStrike;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LightningStrike;
@@ -1,6 +1,6 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCPainting;
import com.laytonsmith.abstraction.entities.MCPainting;
import com.laytonsmith.abstraction.enums.MCArt;
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCArt;
import org.bukkit.entity.Entity;
@@ -1,7 +1,7 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCProjectile;
import com.laytonsmith.abstraction.entities.MCProjectile;
import com.laytonsmith.abstraction.MCProjectileSource;
import com.laytonsmith.abstraction.blocks.MCBlockProjectileSource;
import com.laytonsmith.abstraction.bukkit.BukkitConvertor;
@@ -2,11 +2,11 @@
import com.laytonsmith.abstraction.MCInventory;
import com.laytonsmith.abstraction.bukkit.BukkitMCInventory;
import com.laytonsmith.abstraction.entities.MCHopperMinecart;
import com.laytonsmith.abstraction.entities.MCStorageMinecart;
import org.bukkit.entity.Entity;
import org.bukkit.entity.minecart.StorageMinecart;
public class BukkitMCStorageMinecart extends BukkitMCMinecart implements MCHopperMinecart {
public class BukkitMCStorageMinecart extends BukkitMCMinecart implements MCStorageMinecart {
StorageMinecart sm;
@@ -1,7 +1,7 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCTNT;
import com.laytonsmith.abstraction.entities.MCTNT;
import org.bukkit.entity.Entity;
import org.bukkit.entity.TNTPrimed;
@@ -2,7 +2,7 @@
import com.laytonsmith.abstraction.AbstractionObject;
import com.laytonsmith.abstraction.MCAnimalTamer;
import com.laytonsmith.abstraction.MCTameable;
import com.laytonsmith.abstraction.entities.MCTameable;
import com.laytonsmith.abstraction.bukkit.BukkitMCAnimalTamer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
@@ -1,6 +1,6 @@
package com.laytonsmith.abstraction.bukkit.entities;
import com.laytonsmith.abstraction.MCVehicle;
import com.laytonsmith.abstraction.entities.MCVehicle;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Vehicle;
@@ -3,13 +3,13 @@
import com.laytonsmith.PureUtilities.Vector3D;
import com.laytonsmith.abstraction.Implementation;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCHanging;
import com.laytonsmith.abstraction.MCItem;
import com.laytonsmith.abstraction.entities.MCHanging;
import com.laytonsmith.abstraction.entities.MCItem;
import com.laytonsmith.abstraction.MCItemStack;
import com.laytonsmith.abstraction.MCLivingEntity;
import com.laytonsmith.abstraction.MCLocation;
import com.laytonsmith.abstraction.MCPlayer;
import com.laytonsmith.abstraction.MCProjectile;
import com.laytonsmith.abstraction.entities.MCProjectile;
import com.laytonsmith.abstraction.MCTravelAgent;
import com.laytonsmith.abstraction.blocks.MCBlock;
import com.laytonsmith.abstraction.blocks.MCMaterial;
@@ -1,6 +1,6 @@
package com.laytonsmith.abstraction.bukkit.events;
import com.laytonsmith.abstraction.MCLightningStrike;
import com.laytonsmith.abstraction.entities.MCLightningStrike;
import com.laytonsmith.abstraction.MCWorld;
import com.laytonsmith.abstraction.bukkit.BukkitMCWorld;
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCLightningStrike;
@@ -2,8 +2,6 @@
import com.laytonsmith.abstraction.MCInventoryHolder;
import com.laytonsmith.abstraction.MCItemStack;
import com.laytonsmith.abstraction.MCTameable;
import com.laytonsmith.abstraction.MCVehicle;
public interface MCAbstractHorse extends MCTameable, MCVehicle, MCInventoryHolder {
@@ -1,4 +1,6 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCLivingEntity;
public interface MCAgeable extends MCLivingEntity {
@@ -1,6 +1,7 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.PureUtilities.Vector3D;
import com.laytonsmith.abstraction.MCItemStack;
import com.laytonsmith.abstraction.enums.MCBodyPart;
import java.util.Map;
@@ -1,7 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCProjectile;
public interface MCArrow extends MCProjectile {
int getKnockbackStrength();
@@ -1,6 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCVehicle;
import com.laytonsmith.abstraction.enums.MCTreeSpecies;
public interface MCBoat extends MCVehicle {
@@ -1,4 +1,7 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCLocation;
public interface MCEnderCrystal extends MCEntity {
@@ -1,4 +1,6 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCEntity;
public interface MCExperienceOrb extends MCEntity {
@@ -1,4 +1,4 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.PureUtilities.Vector3D;
@@ -1,7 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCProjectile;
public interface MCFishHook extends MCProjectile {
}
@@ -1,5 +1,6 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.blocks.MCBlockFace;
public interface MCHanging extends MCEntity {
@@ -1,4 +1,7 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCItemStack;
public interface MCItem extends MCEntity {
@@ -1,6 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCHanging;
import com.laytonsmith.abstraction.MCItemStack;
import com.laytonsmith.abstraction.enums.MCRotation;
@@ -0,0 +1,8 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCEntity;
public interface MCLightningStrike extends MCEntity {
boolean isEffect();
}
@@ -1,6 +1,4 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCProjectile;
public interface MCLlamaSpit extends MCProjectile {
}
@@ -1,7 +1,6 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCMaterialData;
import com.laytonsmith.abstraction.MCVehicle;
public interface MCMinecart extends MCVehicle {
@@ -1,6 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCTameable;
import com.laytonsmith.abstraction.enums.MCOcelotType;
public interface MCOcelot extends MCTameable {
@@ -1,4 +1,4 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.enums.MCArt;
@@ -1,6 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCTameable;
import com.laytonsmith.abstraction.enums.MCParrotType;
public interface MCParrot extends MCTameable {
@@ -1,8 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCAgeable;
import com.laytonsmith.abstraction.MCVehicle;
public interface MCPig extends MCAgeable, MCVehicle {
boolean isSaddled();
@@ -1,4 +1,8 @@
package com.laytonsmith.abstraction;
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCMetadatable;
import com.laytonsmith.abstraction.MCProjectileSource;
public interface MCProjectile extends MCEntity, MCMetadatable {
@@ -1,6 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCAgeable;
import com.laytonsmith.abstraction.enums.MCRabbitType;
public interface MCRabbit extends MCAgeable {
@@ -1,6 +1,5 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCAgeable;
import com.laytonsmith.abstraction.enums.MCDyeColor;
public interface MCSheep extends MCAgeable {
@@ -1,7 +1,6 @@
package com.laytonsmith.abstraction.entities;
import com.laytonsmith.abstraction.MCEntity;
import com.laytonsmith.abstraction.MCProjectile;
public interface MCShulkerBullet extends MCProjectile {
Oops, something went wrong.

0 comments on commit f62e7ca

Please sign in to comment.