From 9d7f27309d4abc0fc00b5174635f6dd4728b9007 Mon Sep 17 00:00:00 2001 From: rodel Date: Sat, 24 Oct 2020 18:28:37 -0500 Subject: [PATCH 1/2] Fixed setRawData error (#20) --- .gitignore | 11 +++++++-- build.gradle | 4 ++-- .../universalmarket/market/Market.java | 24 +++++++++---------- .../universalmarket/utils/ItemBuilder.java | 5 +++- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index b513ad7..2904671 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ +.classpath +.project +.settings +.gradle +.vscode /.idea -/build/tmp/retromapReplacedMain +/build +/bin /.gradle/3.3/taskArtifacts /*.iml /build -/libs \ No newline at end of file +/libs +*.launch \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2ce9c13..f3e0ff3 100644 --- a/build.gradle +++ b/build.gradle @@ -25,8 +25,8 @@ group = pluginGroup version = pluginVersion dependencies { - compile 'org.spongepowered:spongeapi:7.0.0' - compile files('libs/spongeforge-1.12.2-2555-7.1.0-BETA-2837.jar') + compile 'org.spongepowered:spongeapi:7.2.0' + compile files('libs/spongeforge-1.12.2-2838-7.2.0-dev-shaded.jar') } diff --git a/src/main/java/com/xwaffle/universalmarket/market/Market.java b/src/main/java/com/xwaffle/universalmarket/market/Market.java index 6b978d0..e791013 100644 --- a/src/main/java/com/xwaffle/universalmarket/market/Market.java +++ b/src/main/java/com/xwaffle/universalmarket/market/Market.java @@ -1,12 +1,19 @@ package com.xwaffle.universalmarket.market; +import java.math.BigDecimal; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; + import com.google.common.collect.Lists; import com.google.common.reflect.TypeToken; import com.xwaffle.universalmarket.UniversalMarket; import com.xwaffle.universalmarket.utils.InventoryBuilder; import com.xwaffle.universalmarket.utils.ItemBuilder; -import net.minecraft.nbt.NBTTagCompound; -import ninja.leaping.configurate.objectmapping.ObjectMappingException; + import org.spongepowered.api.Sponge; import org.spongepowered.api.data.type.DyeColors; import org.spongepowered.api.entity.living.player.Player; @@ -16,28 +23,19 @@ import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.ItemTypes; import org.spongepowered.api.item.inventory.Inventory; -import org.spongepowered.api.item.inventory.InventoryProperty; import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.entity.Hotbar; import org.spongepowered.api.item.inventory.entity.MainPlayerInventory; -import org.spongepowered.api.item.inventory.property.SlotIndex; -import org.spongepowered.api.item.inventory.query.QueryOperation; import org.spongepowered.api.item.inventory.query.QueryOperationTypes; import org.spongepowered.api.service.economy.Currency; import org.spongepowered.api.service.economy.account.UniqueAccount; import org.spongepowered.api.text.Text; import org.spongepowered.api.text.format.TextColors; import org.spongepowered.common.item.inventory.adapter.impl.slots.SlotAdapter; -import org.spongepowered.common.item.inventory.query.operation.InventoryPropertyQueryOperation; import org.spongepowered.common.item.inventory.util.ItemStackUtil; -import java.math.BigDecimal; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; +import net.minecraft.nbt.NBTTagCompound; +import ninja.leaping.configurate.objectmapping.ObjectMappingException; /** * Created by Chase(Xwaffle) on 10/16/2017. diff --git a/src/main/java/com/xwaffle/universalmarket/utils/ItemBuilder.java b/src/main/java/com/xwaffle/universalmarket/utils/ItemBuilder.java index 4712d04..4e984db 100644 --- a/src/main/java/com/xwaffle/universalmarket/utils/ItemBuilder.java +++ b/src/main/java/com/xwaffle/universalmarket/utils/ItemBuilder.java @@ -9,6 +9,7 @@ import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.text.Text; import org.spongepowered.common.item.inventory.util.ItemStackUtil; +import org.spongepowered.common.util.Constants; import java.util.ArrayList; import java.util.Arrays; @@ -35,7 +36,9 @@ public ItemBuilder(ItemType itemType, int ammount, int meta) { itemStack = ItemStack.of(itemType, ammount); DataContainer container = itemStack.toContainer(); container.set(DataQuery.of("UnsafeDamage"), meta); - itemStack.setRawData(container); + if(container.contains(Constants.Sponge.UNSAFE_NBT)){ + itemStack.setRawData(container); + } } public ItemBuilder setName(Text name) { From c9b2793f425cd187c3f7e18831201f8ace92f764 Mon Sep 17 00:00:00 2001 From: rodel Date: Sat, 24 Oct 2020 18:34:14 -0500 Subject: [PATCH 2/2] Updated version number --- src/main/java/com/xwaffle/universalmarket/UniversalMarket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/xwaffle/universalmarket/UniversalMarket.java b/src/main/java/com/xwaffle/universalmarket/UniversalMarket.java index 323741e..063a101 100644 --- a/src/main/java/com/xwaffle/universalmarket/UniversalMarket.java +++ b/src/main/java/com/xwaffle/universalmarket/UniversalMarket.java @@ -32,7 +32,7 @@ authors = { "Xwaffle" }, - version = "1.3" + version = "1.4" ) public class UniversalMarket {