From 13e29016ab7790d8ceebefdfb0b1cfe4b03aa6a6 Mon Sep 17 00:00:00 2001
From: Tofaa <82680183+Tofaa2@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:14:32 +0400
Subject: [PATCH] fix wolf collar color
---
.idea/workspace.xml | 78 +++++++++----------
.../meta/mobs/tameable/WolfMeta.java | 9 +++
2 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 482e564..1e6af11 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,7 @@
-
-
-
-
-
-
-
+
@@ -96,39 +90,39 @@
- {
+ "keyToString": {
+ "Downloaded.Files.Path.Enabled": "false",
+ "Gradle.Build EntityLib.executor": "Run",
+ "Gradle.EntityLib [dependencies].executor": "Run",
+ "Gradle.EntityLib [publish].executor": "Run",
+ "Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor": "Run",
+ "Gradle.EntityLib:test-plugin [publish].executor": "Run",
+ "Gradle.EntityLib:test-plugin [runServer].executor": "Debug",
+ "Gradle.EntityLib:test-plugin [shadowJar].executor": "Run",
+ "Repository.Attach.Annotations": "false",
+ "Repository.Attach.JavaDocs": "false",
+ "Repository.Attach.Sources": "false",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "git-widget-placeholder": "master",
+ "ignore.virus.scanning.warn.message": "true",
+ "jdk.selected.JAVA_MODULE": "corretto-17",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "D:/Github/EntityLib/api/src/main/java/me/tofaa/entitylib/extras",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "Project",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.2",
+ "settings.editor.selected.configurable": "preferences.pluginManager",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -327,6 +321,7 @@
+
@@ -350,6 +345,11 @@
33
+
+ file://$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestPlayerCommand.java
+ 69
+
+
file://$PROJECT_DIR$/src/main/java/me/tofaa/entitylib/meta/types/DisplayMeta.java
153
diff --git a/api/src/main/java/me/tofaa/entitylib/meta/mobs/tameable/WolfMeta.java b/api/src/main/java/me/tofaa/entitylib/meta/mobs/tameable/WolfMeta.java
index e051e6f..5035476 100644
--- a/api/src/main/java/me/tofaa/entitylib/meta/mobs/tameable/WolfMeta.java
+++ b/api/src/main/java/me/tofaa/entitylib/meta/mobs/tameable/WolfMeta.java
@@ -1,6 +1,7 @@
package me.tofaa.entitylib.meta.mobs.tameable;
import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
+import me.tofaa.entitylib.extras.DyeColor;
import me.tofaa.entitylib.meta.Metadata;
import me.tofaa.entitylib.meta.types.TameableMeta;
@@ -29,6 +30,14 @@ public class WolfMeta extends TameableMeta {
super.metadata.setIndex(offset(OFFSET, 1), EntityDataTypes.INT, value);
}
+ public DyeColor getCollarColorAsDye() {
+ return DyeColor.values()[super.metadata.getIndex(offset(OFFSET, 1), DyeColor.RED.ordinal())];
+ }
+
+ public void setCollarColor(DyeColor color) {
+ super.metadata.setIndex(offset(OFFSET, 1), EntityDataTypes.INT, color.ordinal());
+ }
+
public int getAngerTime() {
return super.metadata.getIndex(offset(OFFSET, 2), 0);
}