From 3c99da750aac758801e467a45f828d06d396874b Mon Sep 17 00:00:00 2001 From: Reider745 <70357814+Reider745@users.noreply.github.com> Date: Wed, 29 Nov 2023 08:48:35 +0300 Subject: [PATCH] ZotCoreLoader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - измененно пару клиентских методов - добавлена поддержка NativeAPI.getRotation --- src/main/java/com/reider745/entity/EntityMethod.java | 8 ++++++++ .../java/com/zhekasmirnov/innercore/api/NativeAPI.java | 2 ++ .../innercore/mod/resource/ResourcePackManager.java | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/reider745/entity/EntityMethod.java b/src/main/java/com/reider745/entity/EntityMethod.java index bb7d30e1..8f31b5bd 100644 --- a/src/main/java/com/reider745/entity/EntityMethod.java +++ b/src/main/java/com/reider745/entity/EntityMethod.java @@ -304,4 +304,12 @@ public class EntityMethod { if(entity != null) entity.namedTag = pointer; } + + public static void getRotation(long unwrapEntity, float[] pos) { + Entity entity = getEntityToLong(unwrapEntity); + if(entity != null){ + pos[0] = (float) entity.getYaw(); + pos[1] = (float) entity.getPitch(); + } + } } diff --git a/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java b/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java index b532801c..12090aa9 100644 --- a/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java +++ b/src/main/java/com/zhekasmirnov/innercore/api/NativeAPI.java @@ -355,9 +355,11 @@ public class NativeAPI { } public static void getRotation(long unwrapEntity, float[] pos) { + EntityMethod.getRotation(unwrapEntity, pos); } public static void setRotation(long unwrapEntity, float x, float y) { + } public static void setRotationAxis(long unwrapEntity, int axis, float val) { diff --git a/src/main/java/com/zhekasmirnov/innercore/mod/resource/ResourcePackManager.java b/src/main/java/com/zhekasmirnov/innercore/mod/resource/ResourcePackManager.java index 91d1ea55..b766c1e7 100644 --- a/src/main/java/com/zhekasmirnov/innercore/mod/resource/ResourcePackManager.java +++ b/src/main/java/com/zhekasmirnov/innercore/mod/resource/ResourcePackManager.java @@ -44,18 +44,18 @@ public class ResourcePackManager { } public static String getBlockTextureName(String name, int id) { - if (instance.resourceStorage != null) { + /*if (instance.resourceStorage != null) { String result = instance.resourceStorage.blockTextureDescriptor.getTextureName(name, id); return result; - } + }*/ return null; } public static String getItemTextureName(String name, int id) { - if (instance.resourceStorage != null) { + /*if (instance.resourceStorage != null) { String result = instance.resourceStorage.itemTextureDescriptor.getTextureName(name, id); return result; - } + }*/ return null; }