From d5d698270f4fe3184b5367c79683a2d69375fa9f Mon Sep 17 00:00:00 2001 From: MaXFeeD Date: Sat, 10 Feb 2024 16:36:57 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=81=D0=B5=D1=80=D1=8C=D0=B5=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=BF=D0=BE=D1=82=D0=B5=D1=80=D1=8F=20?= =?UTF-8?q?=D1=8D=D0=BA=D1=81=D1=82=D1=80=D1=8B=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=BE=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reider745/api/pointers/PointerClass.java | 27 ------------------- .../pointers/PointerClassAdditionalValue.java | 19 ------------- .../java/com/reider745/hooks/ItemUtils.java | 1 - .../innercore/game/item/ItemStack.java | 5 ++-- .../api/NativeItemInstanceExtra.java | 4 +-- 5 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/com/reider745/api/pointers/PointerClass.java delete mode 100644 src/main/java/com/reider745/api/pointers/PointerClassAdditionalValue.java diff --git a/src/main/java/com/reider745/api/pointers/PointerClass.java b/src/main/java/com/reider745/api/pointers/PointerClass.java deleted file mode 100644 index 62182438..00000000 --- a/src/main/java/com/reider745/api/pointers/PointerClass.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.reider745.api.pointers; - -public abstract class PointerClass { - public final long pointer; - public final PointersStorage storage; - - public PointerClass(){ - this.storage = PointersStorage.getStorageForType(getPointerStorageType()); - pointer = storage.addPointer(this); - } - - protected PointerClass(PointersStorage storage){ - this.storage = storage; - pointer = storage.addPointer(this); - } - - abstract public String getPointerStorageType(); - - public final long getPointer(){ - return pointer; - } - - @Override - protected final void finalize() throws Throwable { - storage.removePointer(pointer); - } -} diff --git a/src/main/java/com/reider745/api/pointers/PointerClassAdditionalValue.java b/src/main/java/com/reider745/api/pointers/PointerClassAdditionalValue.java deleted file mode 100644 index 72e44838..00000000 --- a/src/main/java/com/reider745/api/pointers/PointerClassAdditionalValue.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.reider745.api.pointers; - -import java.lang.ref.WeakReference; - -public class PointerClassAdditionalValue extends ClassPointer { - private Object value = null; - - public PointerClassAdditionalValue(WeakReference reference) { - super(reference); - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } -} diff --git a/src/main/java/com/reider745/hooks/ItemUtils.java b/src/main/java/com/reider745/hooks/ItemUtils.java index 4ed15e84..d6203e7e 100644 --- a/src/main/java/com/reider745/hooks/ItemUtils.java +++ b/src/main/java/com/reider745/hooks/ItemUtils.java @@ -171,7 +171,6 @@ public class ItemUtils implements HookClass { CompoundTag custom = extra.getNamedTag(); if (custom != null) { item.setNamedTag(custom); - // Logger.info("get(" + id + ":" + meta + ")=" + item.getOrCreateNamedTag().getString(INNER_CORE_TAG_NAME)); } } return item; diff --git a/src/main/java/com/zhekasmirnov/apparatus/adapter/innercore/game/item/ItemStack.java b/src/main/java/com/zhekasmirnov/apparatus/adapter/innercore/game/item/ItemStack.java index 4c69b14b..0dcd7a70 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/adapter/innercore/game/item/ItemStack.java +++ b/src/main/java/com/zhekasmirnov/apparatus/adapter/innercore/game/item/ItemStack.java @@ -30,7 +30,7 @@ public class ItemStack { } public ItemStack(ItemStack stack) { - this(stack.id, stack.count, stack.data, null); + this(stack.id, stack.count, stack.data, stack.extra); } public ItemStack(NativeItemInstance itemInstance) { @@ -76,7 +76,8 @@ public class ItemStack { } catch (JSONException e) { return null; } - return new ItemStack(json.optInt("id", 0), json.optInt("count", 0), json.optInt("data", 0), NativeItemInstanceExtra.fromJson(json.optJSONObject("extra"))); + return new ItemStack(json.optInt("id", 0), json.optInt("count", 0), json.optInt("data", 0), + NativeItemInstanceExtra.fromJson(json.optJSONObject("extra"))); } else if (obj instanceof NativeItemInstance) { return new ItemStack((NativeItemInstance) obj); } else if (obj instanceof Item) { diff --git a/src/main/java/com/zhekasmirnov/innercore/api/NativeItemInstanceExtra.java b/src/main/java/com/zhekasmirnov/innercore/api/NativeItemInstanceExtra.java index 4e9cbefc..f347a2aa 100644 --- a/src/main/java/com/zhekasmirnov/innercore/api/NativeItemInstanceExtra.java +++ b/src/main/java/com/zhekasmirnov/innercore/api/NativeItemInstanceExtra.java @@ -317,15 +317,13 @@ public class NativeItemInstanceExtra { public void setAllCustomData(String extra) { customData = new JSONObject(extra); if (item != null) { - String dataJson = customData.toString(); CompoundTag tag = item.getOrCreateNamedTag(); if (!customData.isEmpty()) { - tag.putString(ItemUtils.INNER_CORE_TAG_NAME, dataJson); + tag.putString(ItemUtils.INNER_CORE_TAG_NAME, customData.toString()); } else { tag.remove(ItemUtils.INNER_CORE_TAG_NAME); } item.setNamedTag(tag); - // Logger.info("setAllCustomData(" + item.getId() + ":" + item.getDamage() + ")=" + dataJson); } }