Skip to content

Commit d79972e

Browse files
committed
Update entity_spec()
- Add DRAGON_FIREBALL direction - Fix SMALL_FIREBALL - Add block and offset to all minecarts - Update wrapper classes
1 parent 764a69f commit d79972e

File tree

12 files changed

+39
-111
lines changed

12 files changed

+39
-111
lines changed

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCComplexEntityPart;
4444
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCComplexLivingEntity;
4545
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCEntity;
46+
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCFireball;
4647
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCHanging;
4748
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCHumanEntity;
4849
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCLivingEntity;
@@ -109,6 +110,7 @@
109110
import org.bukkit.entity.ComplexLivingEntity;
110111
import org.bukkit.entity.Entity;
111112
import org.bukkit.entity.EntityType;
113+
import org.bukkit.entity.Fireball;
112114
import org.bukkit.entity.Hanging;
113115
import org.bukkit.entity.HumanEntity;
114116
import org.bukkit.entity.LivingEntity;
@@ -377,6 +379,12 @@ public static MCEntity BukkitGetCorrectEntity(Entity be) {
377379
return new BukkitMCMinecart(be);
378380
}
379381

382+
if(be instanceof Fireball) {
383+
// Must come before Projectile
384+
type.setWrapperClass(BukkitMCFireball.class);
385+
return new BukkitMCFireball(be);
386+
}
387+
380388
if(be instanceof Projectile) {
381389
type.setWrapperClass(BukkitMCProjectile.class);
382390
return new BukkitMCProjectile(be);

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCExplosiveMinecart.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPoweredMinecart.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCRideableMinecart.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCSpawnerMinecart.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/entities/MCExplosiveMinecart.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/entities/MCPoweredMinecart.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/entities/MCRideableMinecart.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/entities/MCSpawnerMinecart.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCEntityType.java

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
import com.laytonsmith.abstraction.MCEntity;
44
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCCommandMinecart;
5-
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCExplosiveMinecart;
5+
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCEnderSignal;
66
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCFishHook;
77
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCHopperMinecart;
88
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCItem;
99
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCLightningStrike;
10-
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCMinecart;
11-
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCPoweredMinecart;
1210
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCStorageMinecart;
1311
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCTNT;
1412
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCThrownPotion;
@@ -111,44 +109,38 @@ public void setWrapperClass(Class<? extends MCEntity> clazz) {
111109
// run once on setup
112110
private void setWrapperClass() {
113111
switch(getAbstracted()) {
114-
case UNKNOWN:
115-
wrapperClass = null;
116-
break;
117112
case DROPPED_ITEM:
118113
wrapperClass = BukkitMCItem.class;
119114
break;
120-
case PRIMED_TNT:
121-
wrapperClass = BukkitMCTNT.class;
115+
case ENDER_EYE:
116+
wrapperClass = BukkitMCEnderSignal.class;
117+
break;
118+
case FISHING_HOOK:
119+
wrapperClass = BukkitMCFishHook.class;
122120
break;
123121
case LIGHTNING:
124122
wrapperClass = BukkitMCLightningStrike.class;
125123
break;
126-
case SPLASH_POTION:
127-
wrapperClass = BukkitMCThrownPotion.class;
128-
break;
129124
case LINGERING_POTION:
130125
wrapperClass = BukkitMCThrownPotion.class;
131126
break;
132127
case MINECART_CHEST:
133128
wrapperClass = BukkitMCStorageMinecart.class;
134129
break;
135-
case MINECART_FURNACE:
136-
wrapperClass = BukkitMCPoweredMinecart.class;
130+
case MINECART_COMMAND:
131+
wrapperClass = BukkitMCCommandMinecart.class;
137132
break;
138133
case MINECART_HOPPER:
139134
wrapperClass = BukkitMCHopperMinecart.class;
140135
break;
141-
case MINECART_TNT:
142-
wrapperClass = BukkitMCExplosiveMinecart.class;
143-
break;
144-
case MINECART_MOB_SPAWNER:
145-
wrapperClass = BukkitMCMinecart.class;
136+
case PRIMED_TNT:
137+
wrapperClass = BukkitMCTNT.class;
146138
break;
147-
case MINECART_COMMAND:
148-
wrapperClass = BukkitMCCommandMinecart.class;
139+
case SPLASH_POTION:
140+
wrapperClass = BukkitMCThrownPotion.class;
149141
break;
150-
case FISHING_HOOK:
151-
wrapperClass = BukkitMCFishHook.class;
142+
case UNKNOWN:
143+
wrapperClass = null;
152144
break;
153145
default:
154146
String[] split = abstracted.name().toLowerCase().split("_");

0 commit comments

Comments
 (0)