Completely rewrite entity types and config handling

itsmeow · Nov 22, 2019 · 5814a28 · 5814a28
1 parent 5e41df9
commit 5814a28
Show file tree

Hide file tree

Showing 42 changed files with 575 additions and 522 deletions.
diff --git a/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java b/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java
@@ -8,19 +8,20 @@
 import its_meow.betteranimalsplus.common.entity.projectile.EntityPheasantEgg;
 import its_meow.betteranimalsplus.common.world.gen.TrilliumGenerator;
 import its_meow.betteranimalsplus.config.BetterAnimalsPlusConfig;
+import its_meow.betteranimalsplus.init.ModEntities;
 import its_meow.betteranimalsplus.init.ModItems;
 import its_meow.betteranimalsplus.init.ModTriggers;
 import its_meow.betteranimalsplus.network.ClientConfigurationPacket;
 import its_meow.betteranimalsplus.network.ClientRequestBAMPacket;
 import its_meow.betteranimalsplus.network.ServerNoBAMPacket;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.dispenser.IPosition;
 import net.minecraft.dispenser.ProjectileDispenseBehavior;
 import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.SpawnEggItem;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Util;
@@ -81,8 +82,8 @@ public ItemStack createIcon() {
         @Override
         public void fill(NonNullList<ItemStack> toDisplay) {
             super.fill(toDisplay);
-            for (SpawnEggItem egg : ModItems.eggs.keySet()) {
-                ItemStack stack = new ItemStack(egg);
+            for(EntityTypeContainer<?> cont : ModEntities.ENTITIES.values()) {
+                ItemStack stack = new ItemStack(cont.egg);
                 toDisplay.add(stack);
             }
         }

diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityAnimalWithTypes.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityAnimalWithTypes.java
@@ -4,7 +4,7 @@
 
 import javax.annotation.Nullable;
 
-import its_meow.betteranimalsplus.init.ModEntities;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.entity.AgeableEntity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ILivingEntityData;
@@ -80,11 +80,11 @@ public DataParameter<Integer> getDataKey() {
         return TYPE_NUMBER;
     }
 
-    protected abstract String getContainerName();
+    protected abstract EntityTypeContainer<? extends EntityAnimalWithTypes> getContainer();
 
     @Override
     public boolean canDespawn(double range) {
-        return ModEntities.entityMap.containsKey(this.getContainerName()) ? ModEntities.entityMap.get(this.getContainerName()).despawn : false;
+        return getContainer().despawn;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBadger.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBadger.java
@@ -7,6 +7,7 @@
 
 import its_meow.betteranimalsplus.common.entity.projectile.EntityBadgerDirt;
 import its_meow.betteranimalsplus.init.ModEntities;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -38,7 +39,7 @@
 public class EntityBadger extends EntityAnimalWithSelectiveTypes implements IMob {
 
     public EntityBadger(World worldIn) {
-        super(ModEntities.getEntityType("badger"), worldIn);
+        super(ModEntities.BADGER.entityType, worldIn);
     }
 
 	@Override
@@ -222,8 +223,8 @@ protected int[] getTypesFor(Set<BiomeDictionary.Type> types) {
     }
 
     @Override
-    protected String getContainerName() {
-        return "badger";
+    protected EntityTypeContainer<? extends EntityAnimalWithTypes> getContainer() {
+        return ModEntities.BADGER;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBasicWaterCreature.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBasicWaterCreature.java
@@ -1,6 +1,6 @@
 package its_meow.betteranimalsplus.common.entity;
 
-import its_meow.betteranimalsplus.init.ModEntities;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.MoverType;
 import net.minecraft.entity.passive.WaterMobEntity;
@@ -46,12 +46,11 @@ public void tick() {
         }
     }
 
-    protected abstract String getContainerName();
+    protected abstract EntityTypeContainer<? extends EntityBasicWaterCreature> getContainer();
 
     @Override
     public boolean canDespawn(double range) {
-        return ModEntities.entityMap.containsKey(this.getContainerName()) ? ModEntities.entityMap.get(this.getContainerName()).despawn : false;
+        return getContainer().despawn;
     }
 
-
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBear.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBear.java
@@ -43,7 +43,7 @@ public class EntityBear extends MonsterEntity {
     private int warningSoundTicks;
 
     public EntityBear(World worldIn) {
-        super(ModEntities.getEntityType("brownbear"), worldIn);
+        super(ModEntities.BROWN_BEAR.entityType, worldIn);
     }
 
     public EntityBear(EntityType<? extends EntityBear> type, World worldIn) {
@@ -205,7 +205,7 @@ protected double getAttackReachSqr(LivingEntity attackTarget) {
 
     @Override
     public boolean canDespawn(double range) {
-        return ModEntities.entityMap.containsKey("brownbear") ? ModEntities.entityMap.get("brownbear").despawn : false;
+        return ModEntities.ENTITIES.containsKey("brownbear") ? ModEntities.ENTITIES.get("brownbear").despawn : false;
     }
 
     @Override

diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBearNeutral.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBearNeutral.java
@@ -34,7 +34,7 @@ public class EntityBearNeutral extends EntityBear implements IVariantTypes {
     protected static final DataParameter<Integer> TYPE_NUMBER = EntityDataManager.<Integer>createKey(EntityBearNeutral.class, DataSerializers.VARINT);
 
     public EntityBearNeutral(World worldIn) {
-        super(ModEntities.getEntityType("blackbear"), worldIn);
+        super(ModEntities.BLACK_BEAR.entityType, worldIn);
     }
 
     @Override
@@ -134,7 +134,7 @@ protected ResourceLocation getLootTable() {
 
     @Override
     public boolean canDespawn(double range) {
-        return ModEntities.entityMap.containsKey("blackbear") ? ModEntities.entityMap.get("blackbear").despawn : false;
+        return ModEntities.ENTITIES.containsKey("blackbear") ? ModEntities.ENTITIES.get("blackbear").despawn : false;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBoar.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityBoar.java
@@ -5,6 +5,7 @@
 import javax.annotation.Nullable;
 
 import its_meow.betteranimalsplus.init.ModEntities;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import its_meow.betteranimalsplus.util.HeadTypes;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
@@ -47,7 +48,7 @@
 public class EntityBoar extends EntityAnimalWithSelectiveTypes implements IMob {
 
 	public EntityBoar(World worldIn) {
-		super(ModEntities.getEntityType("boar"), worldIn);
+		super(ModEntities.BOAR.entityType, worldIn);
 	}
 
 	@Override
@@ -276,8 +277,8 @@ protected int[] getTypesFor(Set<BiomeDictionary.Type> types) {
     }
 
     @Override
-    protected String getContainerName() {
-        return "boar";
+    protected EntityTypeContainer<? extends EntityAnimalWithTypes> getContainer() {
+        return ModEntities.BOAR;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCoyote.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCoyote.java
@@ -6,6 +6,7 @@
 
 import its_meow.betteranimalsplus.config.BetterAnimalsPlusConfig;
 import its_meow.betteranimalsplus.init.ModEntities;
+import its_meow.betteranimalsplus.util.EntityTypeContainerTameable;
 import its_meow.betteranimalsplus.util.HeadTypes;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.goal.FollowOwnerGoal;
@@ -43,7 +44,7 @@
 public class EntityCoyote extends EntityFeralWolf {
 
     public EntityCoyote(World worldIn) {
-        super(ModEntities.getEntityType("coyote"), worldIn);
+        super(ModEntities.COYOTE.entityType, worldIn);
         this.setTamed(false);
     }
 
@@ -188,8 +189,8 @@ public boolean processInteract(PlayerEntity player, Hand hand) {
     }
 
     @Override
-    protected String getContainerName() {
-        return "coyote";
+    protected EntityTypeContainerTameable<? extends EntityTameableBetterAnimalsPlus> getContainer() {
+        return ModEntities.COYOTE;
     }
 
     @Override

diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCrab.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCrab.java
@@ -1,6 +1,7 @@
 package its_meow.betteranimalsplus.common.entity;
 
 import its_meow.betteranimalsplus.init.ModEntities;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.MobEntity;
 import net.minecraft.entity.ai.goal.AvoidEntityGoal;
@@ -19,7 +20,7 @@ public class EntityCrab extends EntityCrabLikeBase {
     protected static final DataParameter<Integer> CRAB_RAVE = EntityDataManager.<Integer>createKey(EntityCrab.class, DataSerializers.VARINT);
 
     public EntityCrab(World world) {
-        super(ModEntities.getEntityType("crab"), world);
+        super(ModEntities.CRAB.entityType, world);
         this.setPathPriority(PathNodeType.WATER, 10F);
     }
 
@@ -118,8 +119,8 @@ protected void setAttackTarget(MobEntity mob, LivingEntity living) {
     }
 
     @Override
-    protected String getContainerName() {
-        return "crab";
+    protected EntityTypeContainer<? extends EntityAnimalWithTypes> getContainer() {
+        return ModEntities.CRAB;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCrabLikeBase.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCrabLikeBase.java
@@ -1,6 +1,5 @@
 package its_meow.betteranimalsplus.common.entity;
 
-import its_meow.betteranimalsplus.init.ModEntities;
 import its_meow.betteranimalsplus.init.ModLootTables;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
@@ -113,12 +112,10 @@ public boolean isPushedByWater() {
     protected ResourceLocation getLootTable() {
         return ModLootTables.CRAB;
     }
-
-    protected abstract String getContainerName();
 
     @Override
     public boolean canDespawn(double range) {
-        return !this.hasCustomName() && ModEntities.entityMap.containsKey(this.getContainerName()) ? ModEntities.entityMap.get(this.getContainerName()).despawn : false;
+        return !this.hasCustomName() && super.canDespawn(range);
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCreatureWithTypes.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityCreatureWithTypes.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Nullable;
 
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.entity.CreatureEntity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ILivingEntityData;
@@ -70,4 +71,11 @@ public DataParameter<Integer> getDataKey() {
         return TYPE_NUMBER;
     }
 
+    protected abstract EntityTypeContainer<? extends EntityCreatureWithTypes> getContainer();
+
+    @Override
+    public boolean canDespawn(double range) {
+        return getContainer().despawn;
+    }
+
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityDeer.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityDeer.java
@@ -5,6 +5,7 @@
 
 import its_meow.betteranimalsplus.init.ModEntities;
 import its_meow.betteranimalsplus.init.ModLootTables;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import its_meow.betteranimalsplus.util.HeadTypes;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.SharedMonsterAttributes;
@@ -32,7 +33,7 @@
 public class EntityDeer extends EntityAnimalEatsGrassWithTypes {
 
     public EntityDeer(World worldIn) {
-        super(ModEntities.getEntityType("deer"), worldIn, 5);
+        super(ModEntities.DEER.entityType, worldIn, 5);
     }
 
     public int getEatTime() {
@@ -144,8 +145,8 @@ protected IVariantTypes getBaseChild() {
     }
 
     @Override
-    protected String getContainerName() {
-        return "deer";
+    protected EntityTypeContainer<? extends EntityAnimalWithTypes> getContainer() {
+        return ModEntities.DEER;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityFeralWolf.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityFeralWolf.java
@@ -9,6 +9,7 @@
 import its_meow.betteranimalsplus.init.ModEntities;
 import its_meow.betteranimalsplus.init.ModItems;
 import its_meow.betteranimalsplus.init.ModLootTables;
+import its_meow.betteranimalsplus.util.EntityTypeContainerTameable;
 import its_meow.betteranimalsplus.util.HeadTypes;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
@@ -87,7 +88,7 @@ public class EntityFeralWolf extends EntityTameableWithSelectiveTypes implements
     public SitGoal aiSit;
 
     public EntityFeralWolf(World worldIn) {
-        super(ModEntities.getEntityType("feralwolf"), worldIn);
+        super(ModEntities.FERAL_WOLF.entityType, worldIn);
         this.world = worldIn;
         this.setTamed(false);
     }
@@ -527,8 +528,8 @@ protected ResourceLocation getLootTable() {
     }
 
     @Override
-    protected String getContainerName() {
-        return "feralwolf";
+    protected EntityTypeContainerTameable<? extends EntityTameableBetterAnimalsPlus> getContainer() {
+        return ModEntities.FERAL_WOLF;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityGoat.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityGoat.java
@@ -9,6 +9,7 @@
 import its_meow.betteranimalsplus.init.ModItems;
 import its_meow.betteranimalsplus.init.ModLootTables;
 import its_meow.betteranimalsplus.init.ModTriggers;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
@@ -53,7 +54,7 @@ public class EntityGoat extends EntityAnimalEatsGrassWithTypes {
     private ArrayList<Item> temptItems = null;
 
     public EntityGoat(World worldIn) {
-        super(ModEntities.getEntityType("goat"), worldIn, 5);
+        super(ModEntities.GOAT.entityType, worldIn, 5);
         this.world = worldIn;
         this.addTemptItems();
     }
@@ -322,8 +323,8 @@ protected IVariantTypes getBaseChild() {
     }
 
     @Override
-    protected String getContainerName() {
-        return "goat";
+    protected EntityTypeContainer<? extends EntityAnimalWithTypes> getContainer() {
+        return ModEntities.GOAT;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityHorseshoeCrab.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityHorseshoeCrab.java
@@ -1,6 +1,7 @@
 package its_meow.betteranimalsplus.common.entity;
 
 import its_meow.betteranimalsplus.init.ModEntities;
+import its_meow.betteranimalsplus.util.EntityTypeContainer;
 import net.minecraft.entity.ai.goal.AvoidEntityGoal;
 import net.minecraft.entity.ai.goal.RandomWalkingGoal;
 import net.minecraft.entity.player.PlayerEntity;
@@ -10,7 +11,7 @@
 public class EntityHorseshoeCrab extends EntityCrabLikeBase {
 
     public EntityHorseshoeCrab(World world) {
-        super(ModEntities.getEntityType("horseshoecrab"), world);
+        super(ModEntities.HORSESHOE_CRAB.entityType, world);
     }
 
     @Override
@@ -35,8 +36,8 @@ protected ResourceLocation getLootTable() {
     }
 
     @Override
-    protected String getContainerName() {
-        return "horseshoecrab";
+    protected EntityTypeContainer<? extends EntityAnimalWithTypes> getContainer() {
+        return ModEntities.HORSESHOE_CRAB;
     }
 
 }
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityJellyfish.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityJellyfish.java
@@ -49,7 +49,7 @@ public class EntityJellyfish extends WaterMobEntity implements IVariantTypes {
     private float randomMotionVecZ;
 
     public EntityJellyfish(World worldIn) {
-        super(ModEntities.getEntityType("jellyfish"), worldIn);
+        super(ModEntities.JELLYFISH.entityType, worldIn);
         this.setSize(0.8F, 0.8F);
         rotationVelocity = (1.0F / (rand.nextFloat() + 1.0F) * 0.2F);
     }
@@ -299,7 +299,7 @@ public EntityDataManager getDataManagerI() {
 
     @Override
     public boolean canDespawn(double range) {
-        return ModEntities.entityMap.containsKey("jellyfish") ? ModEntities.entityMap.get("jellyfish").despawn : false;
+        return ModEntities.ENTITIES.containsKey("jellyfish") ? ModEntities.ENTITIES.get("jellyfish").despawn : false;
     }
 
 }