Skip to content

Fixed setRawData error in ItemBuilder #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rodel77 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed setRawData error in ItemBuilder #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7f273
Fixed setRawData error (#20)
rodel77 Oct 24, 2020
c9b2793
Updated version number
rodel77 Oct 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
.classpath
.project
.settings
.gradle
.vscode
/.idea
/build/tmp/retromapReplacedMain
/build
/bin
/.gradle/3.3/taskArtifacts
/*.iml
/build
/libs
/libs
*.launch
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/xwaffle/universalmarket/UniversalMarket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
authors = {
"Xwaffle"
},
version = "1.3"
version = "1.4"
)
public class UniversalMarket {

Expand Down
24 changes: 11 additions & 13 deletions src/main/java/com/xwaffle/universalmarket/market/Market.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/xwaffle/universalmarket/utils/ItemBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down