From 79485d1b387f5ac2438c190a8c4a3b36cf96c799 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 00:36:19 -0500 Subject: [PATCH] Make cows also eat brown mushrooms --- ...cows-to-mooshroom-when-fed-mushrooms.patch | 22 ++- ...cows-to-mooshroom-when-fed-mushrooms.patch | 145 +++++++++++------- patches/server/0011-Integrate-ridables.patch | 21 +-- 3 files changed, 116 insertions(+), 72 deletions(-) diff --git a/patches/api/0002-cows-to-mooshroom-when-fed-mushrooms.patch b/patches/api/0002-cows-to-mooshroom-when-fed-mushrooms.patch index ea0255a7e..ff3e2514f 100644 --- a/patches/api/0002-cows-to-mooshroom-when-fed-mushrooms.patch +++ b/patches/api/0002-cows-to-mooshroom-when-fed-mushrooms.patch @@ -1,11 +1,12 @@ -From c5475c4147ad18323c8dc56755e7b6f8df714870 Mon Sep 17 00:00:00 2001 +From a90a0924488b32baed8ce6d36c94a74b11c857f3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 3 May 2019 23:21:23 -0500 Subject: [PATCH] cows to mooshroom when fed mushrooms --- .../paper/event/entity/EntityTransformedEvent.java | 6 ++++++ - 1 file changed, 6 insertions(+) + .../java/org/bukkit/event/entity/EntityTransformEvent.java | 6 ++++++ + 2 files changed, 12 insertions(+) diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java index 12194f1f..8b2e533d 100644 @@ -24,6 +25,23 @@ index 12194f1f..8b2e533d 100644 /** * When a pig turns to a zombiepigman */ +diff --git a/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java b/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java +index 1370380a..b1c26519 100644 +--- a/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java ++++ b/src/main/java/org/bukkit/event/entity/EntityTransformEvent.java +@@ -96,6 +96,12 @@ public class EntityTransformEvent extends EntityEvent implements Cancellable { + * When a mooshroom (or MUSHROOM_COW) is sheared and a cow spawns. + */ + SHEARED, ++ // Purpur start ++ /** ++ * When a cow turns to a mooshroom ++ */ ++ SHROOMED, ++ // Purpur end + /** + * When lightning strikes a entity. + */ -- 2.20.1 diff --git a/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch b/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch index 02a2deadf..2f97dc46b 100644 --- a/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch +++ b/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch @@ -1,12 +1,12 @@ -From a831a65545098083d533f3053354aef9e0d98a62 Mon Sep 17 00:00:00 2001 +From e6a82c5af231ce38496a394ea07227ad4ec578b6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:10:30 -0500 Subject: [PATCH] cows to mooshroom when fed mushrooms --- .../java/net/minecraft/server/Entity.java | 1 + - .../java/net/minecraft/server/EntityCow.java | 45 ++++++++++++++++++- - 2 files changed, 45 insertions(+), 1 deletion(-) + .../java/net/minecraft/server/EntityCow.java | 75 ++++++++++++++++++- + 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 3d60b5c28..9834a8928 100644 @@ -21,75 +21,110 @@ index 3d60b5c28..9834a8928 100644 if (!this.isSilent()) { this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1); diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index d2c2e3cc3..55169d564 100644 +index d2c2e3cc3..4b460a0a7 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java -@@ -16,7 +16,7 @@ public class EntityCow extends EntityAnimal { +@@ -4,6 +4,10 @@ package net.minecraft.server; + import org.bukkit.craftbukkit.event.CraftEventFactory; + import org.bukkit.craftbukkit.inventory.CraftItemStack; + // CraftBukkit end ++// Purpur start ++import com.destroystokyo.paper.event.entity.EntityTransformedEvent; ++import org.bukkit.event.entity.EntityTransformEvent; ++// Purpur end + + public class EntityCow extends EntityAnimal { + +@@ -16,7 +20,7 @@ public class EntityCow extends EntityAnimal { this.goalSelector.a(0, new PathfinderGoalFloat(this)); this.goalSelector.a(1, new PathfinderGoalPanic(this, 2.0D)); this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D)); - this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT), false)); -+ this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem()), false)); ++ this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem(), Blocks.BROWN_MUSHROOM.getItem()), false)); this.goalSelector.a(4, new PathfinderGoalFollowParent(this, 1.25D)); this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D)); this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F)); -@@ -55,6 +55,8 @@ public class EntityCow extends EntityAnimal { - return 0.4F; - } - -+ private int mushroomsFed = 0; // Purpur -+ - @Override - public boolean a(EntityHuman entityhuman, EnumHand enumhand) { - ItemStack itemstack = entityhuman.b(enumhand); -@@ -79,6 +81,47 @@ public class EntityCow extends EntityAnimal { +@@ -79,11 +83,80 @@ public class EntityCow extends EntityAnimal { // CraftBukkit end return true; + // Purpur start - feed mushroom to change to mooshroom -+ } else if (getEntityType() != EntityTypes.MOOSHROOM && itemstack.getItem() == Blocks.RED_MUSHROOM.getItem()) { -+ world.broadcastEntityEffect(this, (byte) 18); // hearts -+ playSound(SoundEffects.ENTITY_COW_MILK, 1.0F, 1.0F); -+ if (++mushroomsFed < 5) { -+ if (!entityhuman.abilities.canInstantlyBuild) { -+ itemstack.subtract(1); -+ } -+ return true; // require 5 mushrooms to transform (prevents mushroom duping) -+ } -+ EntityMushroomCow mooshroom = EntityTypes.MOOSHROOM.create(world); -+ if (mooshroom == null) { -+ return false; -+ } -+ mooshroom.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch); -+ mooshroom.setHealth(this.getHealth()); -+ mooshroom.setAge(getAge()); -+ mooshroom.u(this); -+ mooshroom.aK = this.aK; -+ mooshroom.aM = this.aM; -+ mooshroom.lastYaw = this.lastYaw; -+ mooshroom.lastPitch = this.lastPitch; -+ if (this.hasCustomName()) { -+ mooshroom.setCustomName(this.getCustomName()); -+ } -+ if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), mooshroom.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.SHROOMED).callEvent()) { -+ mooshroom.die(); -+ return false; -+ } -+ this.world.addEntity(mooshroom); -+ this.die(); -+ if (!entityhuman.abilities.canInstantlyBuild) { -+ itemstack.subtract(1); -+ } -+ for (int i = 0; i < 15; ++i) { -+ ((WorldServer) world).sendParticles(world.players, null, Particles.z, -+ locX + random.nextFloat(), locY + (random.nextFloat() * 2), locZ + random.nextFloat(), 1, -+ random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true); -+ } -+ return true; ++ } else if (getEntityType() != EntityTypes.MOOSHROOM && isMushroom(itemstack)) { ++ return feedMushroom(entityhuman, itemstack); + // Purpur end } else { return super.a(entityhuman, enumhand); } + } + ++ // Purpur start - feed mushroom to change to mooshroom ++ private int redMushroomsFed = 0; ++ private int brownMushroomsFed = 0; ++ ++ private boolean isMushroom(ItemStack itemstack) { ++ return itemstack.getItem() == Blocks.RED_MUSHROOM.getItem() || itemstack.getItem() == Blocks.BROWN_MUSHROOM.getItem(); ++ } ++ ++ private int incrementFeedCount(ItemStack itemstack) { ++ if (itemstack.getItem() == Blocks.RED_MUSHROOM.getItem()) { ++ return ++redMushroomsFed; ++ } else { ++ return ++brownMushroomsFed; ++ } ++ } ++ ++ private boolean feedMushroom(EntityHuman entityhuman, ItemStack itemstack) { ++ world.broadcastEntityEffect(this, (byte) 18); // hearts ++ playSound(SoundEffects.ENTITY_COW_MILK, 1.0F, 1.0F); ++ if (incrementFeedCount(itemstack) < 5) { ++ if (!entityhuman.abilities.canInstantlyBuild) { ++ itemstack.subtract(1); ++ } ++ return true; // require 5 mushrooms to transform (prevents mushroom duping) ++ } ++ EntityMushroomCow mooshroom = EntityTypes.MOOSHROOM.create(world); ++ if (mooshroom == null) { ++ return false; ++ } ++ if (itemstack.getItem() == Blocks.BROWN_MUSHROOM.getItem()) { ++ mooshroom.a(EntityMushroomCow.Type.BROWN); ++ } else { ++ mooshroom.a(EntityMushroomCow.Type.RED); ++ } ++ mooshroom.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch); ++ mooshroom.setHealth(this.getHealth()); ++ mooshroom.setAge(getAge()); ++ mooshroom.u(this); ++ mooshroom.aK = this.aK; ++ mooshroom.aM = this.aM; ++ mooshroom.lastYaw = this.lastYaw; ++ mooshroom.lastPitch = this.lastPitch; ++ if (this.hasCustomName()) { ++ mooshroom.setCustomName(this.getCustomName()); ++ } ++ if (CraftEventFactory.callEntityTransformEvent(this, mooshroom, EntityTransformEvent.TransformReason.SHROOMED).isCancelled()) { ++ return false; ++ } ++ if (!new EntityTransformedEvent(this.getBukkitEntity(), mooshroom.getBukkitEntity(), EntityTransformedEvent.TransformedReason.SHROOMED).callEvent()) { ++ return false; ++ } ++ this.world.addEntity(mooshroom); ++ this.die(); ++ if (!entityhuman.abilities.canInstantlyBuild) { ++ itemstack.subtract(1); ++ } ++ for (int i = 0; i < 15; ++i) { ++ ((WorldServer) world).sendParticles(((WorldServer) world).players, null, Particles.HAPPY_VILLAGER, ++ locX + random.nextFloat(), locY + (random.nextFloat() * 2), locZ + random.nextFloat(), 1, ++ random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true); ++ } ++ return true; ++ } ++ // Purpur end ++ + @Override + public EntityCow createChild(EntityAgeable entityageable) { + return (EntityCow) EntityTypes.COW.a(this.world); -- 2.20.1 diff --git a/patches/server/0011-Integrate-ridables.patch b/patches/server/0011-Integrate-ridables.patch index d41e715d4..2524347ee 100644 --- a/patches/server/0011-Integrate-ridables.patch +++ b/patches/server/0011-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From 856e639ac4dda7f7e6c472725457f97b7f88ac0f Mon Sep 17 00:00:00 2001 +From c73d3c9684a3a1d635b4df7d4ad2ae84a28f6aa8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -9,7 +9,7 @@ Subject: [PATCH] Integrate ridables .../server/ControllerLookDolphin.java | 4 +- .../java/net/minecraft/server/Entity.java | 15 +++- .../net/minecraft/server/EntityChicken.java | 17 +++- - .../java/net/minecraft/server/EntityCow.java | 16 +++- + .../java/net/minecraft/server/EntityCow.java | 14 ++++ .../net/minecraft/server/EntityCreeper.java | 14 ++++ .../net/minecraft/server/EntityDolphin.java | 27 ++++++- .../net/minecraft/server/EntityDrowned.java | 9 ++- @@ -52,7 +52,7 @@ Subject: [PATCH] Integrate ridables .../controller/ControllerMoveWASDFlying.java | 58 ++++++++++++++ .../controller/ControllerMoveWASDWater.java | 42 ++++++++++ .../craftbukkit/entity/CraftLivingEntity.java | 10 +++ - 48 files changed, 916 insertions(+), 61 deletions(-) + 48 files changed, 915 insertions(+), 60 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 @@ -221,10 +221,10 @@ index a374c3051..4ab6b4fc4 100644 public void b(float f, float f1) {} diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 55169d564..4e70a2fc8 100644 +index 4b460a0a7..754133c72 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java -@@ -9,6 +9,11 @@ public class EntityCow extends EntityAnimal { +@@ -13,6 +13,11 @@ public class EntityCow extends EntityAnimal { public EntityCow(EntityTypes entitytypes, World world) { super(entitytypes, world); @@ -236,7 +236,7 @@ index 55169d564..4e70a2fc8 100644 } @Override -@@ -59,6 +64,15 @@ public class EntityCow extends EntityAnimal { +@@ -61,6 +66,15 @@ public class EntityCow extends EntityAnimal { @Override public boolean a(EntityHuman entityhuman, EnumHand enumhand) { @@ -252,15 +252,6 @@ index 55169d564..4e70a2fc8 100644 ItemStack itemstack = entityhuman.b(enumhand); if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) { -@@ -116,7 +130,7 @@ public class EntityCow extends EntityAnimal { - itemstack.subtract(1); - } - for (int i = 0; i < 15; ++i) { -- ((WorldServer) world).sendParticles(world.players, null, Particles.z, -+ ((WorldServer) world).sendParticles(((WorldServer) world).players, null, Particles.HAPPY_VILLAGER, - locX + random.nextFloat(), locY + (random.nextFloat() * 2), locZ + random.nextFloat(), 1, - random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true); - } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java index 0c2c3c730..e0bfe0345 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java