From 814da2453c79a3c095c1dadcfa0f23e3ba592c00 Mon Sep 17 00:00:00 2001
From: RednedEpic <redned235@gmail.com>
Date: Wed, 8 Jan 2020 20:26:44 -0600
Subject: [PATCH] Implement sheep colors and shearing (Closes #126)

---
 .../entity/living/animal/SheepEntity.java     | 51 +++++++++++++++++++
 .../connector/entity/type/EntityType.java     |  3 +-
 connector/src/main/resources/mappings         |  2 +-
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 connector/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java

diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java
new file mode 100644
index 00000000..55584b11
--- /dev/null
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/animal/SheepEntity.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.entity.living.animal;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.data.EntityFlag;
+import org.geysermc.connector.entity.living.AnimalEntity;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class SheepEntity extends AnimalEntity {
+
+    public SheepEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        super.updateBedrockMetadata(entityMetadata, session);
+        if (entityMetadata.getId() == 16) {
+            byte xd = (byte) entityMetadata.getValue();
+            metadata.getFlags().setFlag(EntityFlag.SHEARED, (xd & 0x10) == 0x10);
+            metadata.put(EntityData.COLOR, xd);
+        }
+    }
+}
\ No newline at end of file
diff --git a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java
index f7a4b843..f1dfa6af 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java
@@ -28,6 +28,7 @@ package org.geysermc.connector.entity.type;
 import lombok.Getter;
 import org.geysermc.connector.entity.*;
 import org.geysermc.connector.entity.living.*;
+import org.geysermc.connector.entity.living.animal.SheepEntity;
 import org.geysermc.connector.entity.living.horse.HorseEntity;
 import org.geysermc.connector.entity.living.horse.LlamaEntity;
 import org.geysermc.connector.entity.living.monster.GuardianEntity;
@@ -39,7 +40,7 @@ public enum EntityType {
     CHICKEN(AnimalEntity.class, 10, 0.7f, 0.4f),
     COW(AnimalEntity.class, 11, 1.4f, 0.9f),
     PIG(AnimalEntity.class, 12, 0.9f),
-    SHEEP(AnimalEntity.class, 13, 1.3f, 0.9f),
+    SHEEP(SheepEntity.class, 13, 1.3f, 0.9f),
     WOLF(AnimalEntity.class, 14, 0.85f, 0.6f),
     VILLAGER(AbstractMerchantEntity.class, 15, 1.8f, 0.6f, 0.6f, 1.62f),
     MOOSHROOM(AnimalEntity.class, 16, 1.4f, 0.9f),
diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings
index 582fb160..b9308a64 160000
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@@ -1 +1 @@
-Subproject commit 582fb1609ffde735e514b99550362a9a533fc88a
+Subproject commit b9308a64699fabb7510a05d3b270ccd6dd52b635