Make giants naturally spawn and have AI

patches/server/0011-Integrate-ridables.patch

@@ -1,11 +1,9 @@
-From c73d3c9684a3a1d635b4df7d4ad2ae84a28f6aa8 Mon Sep 17 00:00:00 2001
+From d75244e75c3a3b9932e56ee42ea7bce24a332f36 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
 
 ---
- .../java/net/minecraft/server/BiomeBase.java  |  1 +
- .../java/net/minecraft/server/Biomes.java     | 23 ++++++
  .../server/ControllerLookDolphin.java         |  4 +-
  .../java/net/minecraft/server/Entity.java     | 15 +++-
  .../net/minecraft/server/EntityChicken.java   | 17 +++-
@@ -16,7 +14,7 @@ Subject: [PATCH] Integrate ridables
  .../net/minecraft/server/EntityEnderman.java  | 15 ++++
  .../net/minecraft/server/EntityEndermite.java | 17 +++-
  .../java/net/minecraft/server/EntityFish.java | 33 ++++++--
- .../minecraft/server/EntityGiantZombie.java   | 35 ++++++++-
+ .../minecraft/server/EntityGiantZombie.java   | 13 ++++
  .../net/minecraft/server/EntityGuardian.java  | 37 +++++++--
  .../net/minecraft/server/EntityHorse.java     | 10 ++-
  .../minecraft/server/EntityHorseAbstract.java |  4 +-
@@ -52,57 +50,12 @@ Subject: [PATCH] Integrate ridables
  .../controller/ControllerMoveWASDFlying.java  | 58 ++++++++++++++
  .../controller/ControllerMoveWASDWater.java   | 42 ++++++++++
  .../craftbukkit/entity/CraftLivingEntity.java | 10 +++
- 48 files changed, 915 insertions(+), 60 deletions(-)
+ 46 files changed, 870 insertions(+), 59 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
 
-diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 72eb669c5..f1500f7a0 100644
---- a/src/main/java/net/minecraft/server/BiomeBase.java
-+++ b/src/main/java/net/minecraft/server/BiomeBase.java
-@@ -97,6 +97,7 @@ public abstract class BiomeBase {
-         return this.m != null;
-     }
- 
-+    protected void addMobSpawn(EnumCreatureType creaturetype, BiomeBase.BiomeMeta biomemeta) { a(creaturetype, biomemeta); } // Purpur - OBFHELPER
-     protected void a(EnumCreatureType enumcreaturetype, BiomeBase.BiomeMeta biomebase_biomemeta) {
-         ((List) this.u.get(enumcreaturetype)).add(biomebase_biomemeta);
-     }
-diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
-index 317db4b12..69ba98b66 100644
---- a/src/main/java/net/minecraft/server/Biomes.java
-+++ b/src/main/java/net/minecraft/server/Biomes.java
-@@ -92,5 +92,28 @@ public abstract class Biomes {
- 
-     static {
-         Collections.addAll(BiomeBase.b, new BiomeBase[] { Biomes.OCEAN, Biomes.PLAINS, Biomes.DESERT, Biomes.MOUNTAINS, Biomes.FOREST, Biomes.TAIGA, Biomes.SWAMP, Biomes.RIVER, Biomes.FROZEN_RIVER, Biomes.SNOWY_TUNDRA, Biomes.SNOWY_MOUNTAINS, Biomes.MUSHROOM_FIELDS, Biomes.MUSHROOM_FIELD_SHORE, Biomes.BEACH, Biomes.DESERT_HILLS, Biomes.WOODED_HILLS, Biomes.TAIGA_HILLS, Biomes.JUNGLE, Biomes.JUNGLE_HILLS, Biomes.JUNGLE_EDGE, Biomes.DEEP_OCEAN, Biomes.STONE_SHORE, Biomes.SNOWY_BEACH, Biomes.BIRCH_FOREST, Biomes.BIRCH_FOREST_HILLS, Biomes.DARK_FOREST, Biomes.SNOWY_TAIGA, Biomes.SNOWY_TAIGA_HILLS, Biomes.GIANT_TREE_TAIGA, Biomes.GIANT_TREE_TAIGA_HILLS, Biomes.WOODED_MOUNTAINS, Biomes.SAVANNA, Biomes.SAVANNA_PLATEAU, Biomes.BADLANDS, Biomes.WOODED_BADLANDS_PLATEAU, Biomes.BADLANDS_PLATEAU});
-+
-+        // Purpur start - add natural mob spawns (maybe find a better place for this?)
-+        addSpawn("plains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
-+        addSpawn("sunflower_plains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
-+        addSpawn("desert", EnumCreatureType.MONSTER, EntityTypes.GIANT, 2, 1, 1);
-+        addSpawn("desert_hills", EnumCreatureType.MONSTER, EntityTypes.GIANT, 2, 1, 1);
-+        addSpawn("desert_lakes", EnumCreatureType.MONSTER, EntityTypes.GIANT, 2, 1, 1);
-+        addSpawn("mountains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
-+        addSpawn("gravelly_mountains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
-+        addSpawn("modified_gravelly_mountains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
-+        addSpawn("savanna", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
-+        addSpawn("savanna_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
-+        addSpawn("shattered_savanna", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
-+        addSpawn("shattered_savanna_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
-+        addSpawn("badlands", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 1, 2);
-+        addSpawn("badlands_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 1, 2);
-+        addSpawn("eroded_badlands", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 1, 2);
-+        addSpawn("modified_badlands_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 2, 1);
-+    }
-+
-+    private static void addSpawn(String biome, EnumCreatureType ct, EntityTypes et, int weight, int min_group, int max_group) {
-+        IRegistry.BIOME.get(new MinecraftKey(biome)).addMobSpawn(ct, new BiomeBase.BiomeMeta(et, weight, min_group, max_group));
-     }
-+    // Purpur end
- }
 diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
 index 454627f65..df3d6cf28 100644
 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
@@ -546,7 +499,7 @@ index a28fbdf1e..c014c6f6c 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index bcbade19e..3cfbc5c49 100644
+index bcbade19e..f45a5c2c7 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
 @@ -5,7 +5,11 @@ public class EntityGiantZombie extends EntityMonster {
@@ -561,32 +514,12 @@ index bcbade19e..3cfbc5c49 100644
          // Purpur end
      }
  
-@@ -22,8 +26,37 @@ public class EntityGiantZombie extends EntityMonster {
+@@ -22,7 +26,16 @@ public class EntityGiantZombie extends EntityMonster {
          this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(50.0D);
      }
  
 +    // Purpur start
      @Override
-+    protected void initPathfinder() {
-+        this.goalSelector.a(0, new PathfinderGoalFloat(this));
-+        this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, 1.0D, false));
-+        this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D));
-+        this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 16.0F));
-+        this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
-+        this.goalSelector.a(5, new PathfinderGoalMoveTowardsRestriction(this, 1.0D));
-+        this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this).a(EntityPigZombie.class));
-+        this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
-+        this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillager.class, false));
-+        this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
-+        this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, true));
-+    }
-+
-+    @Override
-+    public float cW() { // jump height
-+        return 1.0F;
-+    }
-+
-+    @Override
 +    public boolean a(EntityHuman entityhuman, EnumHand enumhand) { // processInteract
 +        if (super.a(entityhuman, enumhand)) {
 +            return true; // vanilla action handled
@@ -596,10 +529,8 @@ index bcbade19e..3cfbc5c49 100644
 +    // Purpur end
 +
      public float a(BlockPosition blockposition, IWorldReader iworldreader) {
--        return iworldreader.w(blockposition) - 0.5F;
+         return iworldreader.w(blockposition) - 0.5F;
-+        return super.a(blockposition, iworldreader); // Purpur - fix light requirements for natural spawns
      }
- }
 diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
 index 335416d96..6c41730eb 100644
 --- a/src/main/java/net/minecraft/server/EntityGuardian.java

patches/server/0015-Make-giants-naturally-spawn-and-have-AI.patch

@@ -0,0 +1,98 @@
+From 563416526b8844dbd95d748c683fe8cdf31611cd Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sun, 12 May 2019 00:43:12 -0500
+Subject: [PATCH] Make giants naturally spawn and have AI
+
+---
+ .../java/net/minecraft/server/BiomeBase.java  |  1 +
+ .../java/net/minecraft/server/Biomes.java     | 23 +++++++++++++++++++
+ .../minecraft/server/EntityGiantZombie.java   | 22 +++++++++++++++++-
+ 3 files changed, 45 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
+index 72eb669c5..f1500f7a0 100644
+--- a/src/main/java/net/minecraft/server/BiomeBase.java
++++ b/src/main/java/net/minecraft/server/BiomeBase.java
+@@ -97,6 +97,7 @@ public abstract class BiomeBase {
+         return this.m != null;
+     }
+ 
++    protected void addMobSpawn(EnumCreatureType creaturetype, BiomeBase.BiomeMeta biomemeta) { a(creaturetype, biomemeta); } // Purpur - OBFHELPER
+     protected void a(EnumCreatureType enumcreaturetype, BiomeBase.BiomeMeta biomebase_biomemeta) {
+         ((List) this.u.get(enumcreaturetype)).add(biomebase_biomemeta);
+     }
+diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
+index 317db4b12..69ba98b66 100644
+--- a/src/main/java/net/minecraft/server/Biomes.java
++++ b/src/main/java/net/minecraft/server/Biomes.java
+@@ -92,5 +92,28 @@ public abstract class Biomes {
+ 
+     static {
+         Collections.addAll(BiomeBase.b, new BiomeBase[] { Biomes.OCEAN, Biomes.PLAINS, Biomes.DESERT, Biomes.MOUNTAINS, Biomes.FOREST, Biomes.TAIGA, Biomes.SWAMP, Biomes.RIVER, Biomes.FROZEN_RIVER, Biomes.SNOWY_TUNDRA, Biomes.SNOWY_MOUNTAINS, Biomes.MUSHROOM_FIELDS, Biomes.MUSHROOM_FIELD_SHORE, Biomes.BEACH, Biomes.DESERT_HILLS, Biomes.WOODED_HILLS, Biomes.TAIGA_HILLS, Biomes.JUNGLE, Biomes.JUNGLE_HILLS, Biomes.JUNGLE_EDGE, Biomes.DEEP_OCEAN, Biomes.STONE_SHORE, Biomes.SNOWY_BEACH, Biomes.BIRCH_FOREST, Biomes.BIRCH_FOREST_HILLS, Biomes.DARK_FOREST, Biomes.SNOWY_TAIGA, Biomes.SNOWY_TAIGA_HILLS, Biomes.GIANT_TREE_TAIGA, Biomes.GIANT_TREE_TAIGA_HILLS, Biomes.WOODED_MOUNTAINS, Biomes.SAVANNA, Biomes.SAVANNA_PLATEAU, Biomes.BADLANDS, Biomes.WOODED_BADLANDS_PLATEAU, Biomes.BADLANDS_PLATEAU});
++
++        // Purpur start - add natural mob spawns (maybe find a better place for this?)
++        addSpawn("plains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
++        addSpawn("sunflower_plains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
++        addSpawn("desert", EnumCreatureType.MONSTER, EntityTypes.GIANT, 2, 1, 1);
++        addSpawn("desert_hills", EnumCreatureType.MONSTER, EntityTypes.GIANT, 2, 1, 1);
++        addSpawn("desert_lakes", EnumCreatureType.MONSTER, EntityTypes.GIANT, 2, 1, 1);
++        addSpawn("mountains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
++        addSpawn("gravelly_mountains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
++        addSpawn("modified_gravelly_mountains", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 1);
++        addSpawn("savanna", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
++        addSpawn("savanna_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
++        addSpawn("shattered_savanna", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
++        addSpawn("shattered_savanna_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 5, 1, 2);
++        addSpawn("badlands", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 1, 2);
++        addSpawn("badlands_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 1, 2);
++        addSpawn("eroded_badlands", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 1, 2);
++        addSpawn("modified_badlands_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 2, 1);
++    }
++
++    private static void addSpawn(String biome, EnumCreatureType ct, EntityTypes et, int weight, int min_group, int max_group) {
++        IRegistry.BIOME.get(new MinecraftKey(biome)).addMobSpawn(ct, new BiomeBase.BiomeMeta(et, weight, min_group, max_group));
+     }
++    // Purpur end
+ }
+diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
+index f45a5c2c7..3cfbc5c49 100644
+--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
++++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
+@@ -27,6 +27,26 @@ public class EntityGiantZombie extends EntityMonster {
+     }
+ 
+     // Purpur start
++    @Override
++    protected void initPathfinder() {
++        this.goalSelector.a(0, new PathfinderGoalFloat(this));
++        this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, 1.0D, false));
++        this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D));
++        this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 16.0F));
++        this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
++        this.goalSelector.a(5, new PathfinderGoalMoveTowardsRestriction(this, 1.0D));
++        this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this).a(EntityPigZombie.class));
++        this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
++        this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillager.class, false));
++        this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
++        this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, true));
++    }
++
++    @Override
++    public float cW() { // jump height
++        return 1.0F;
++    }
++
+     @Override
+     public boolean a(EntityHuman entityhuman, EnumHand enumhand) { // processInteract
+         if (super.a(entityhuman, enumhand)) {
+@@ -37,6 +57,6 @@ public class EntityGiantZombie extends EntityMonster {
+     // Purpur end
+ 
+     public float a(BlockPosition blockposition, IWorldReader iworldreader) {
+-        return iworldreader.w(blockposition) - 0.5F;
++        return super.a(blockposition, iworldreader); // Purpur - fix light requirements for natural spawns
+     }
+ }
+-- 
+2.20.1
+