Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Reworked finalize system

Browse Source
This commit is contained in:
Auxilor
2021-02-26 10:12:22 +00:00
parent cf29df7bce
commit e9e39345ed
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/VillagerTrade.java
View File

@@ -19,7 +19,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.display(result);
Display.displayAndFinalize(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -31,7 +31,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.display(selling);
Display.displayAndFinalize(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {
e.printStackTrace();

4
eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/VillagerTrade.java
View File

@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
Field fResult = MerchantRecipe.class.getDeclaredField("result");
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.display(result);
Display.displayAndFinalize(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.display(selling);
Display.displayAndFinalize(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {

4
eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/VillagerTrade.java
View File

@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
Field fResult = MerchantRecipe.class.getDeclaredField("result");
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.display(result);
Display.displayAndFinalize(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.display(selling);
Display.displayAndFinalize(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {

4
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.java
View File

@@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
Field fResult = MerchantRecipe.class.getDeclaredField("result");
fResult.setAccessible(true);
ItemStack result = merchantRecipe.getResult();
Display.display(result);
Display.displayAndFinalize(result);
fResult.set(merchantRecipe, result);
// Get NMS MerchantRecipe from CraftMerchantRecipe
@@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy {
fSelling.setAccessible(true);
ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
Display.display(selling);
Display.displayAndFinalize(selling);
fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
} catch (IllegalAccessException | NoSuchFieldException e) {

8
eco-util/src/main/java/com/willfp/eco/util/display/Display.java
View File

@@ -55,11 +55,6 @@ public class Display {
* @return The itemstack.
*/
public ItemStack display(@NotNull final ItemStack itemStack) {
if (isFinalized(itemStack)) {
unfinalize(itemStack);
return itemStack;
}
Map<String, Object[]> pluginVarArgs = new HashMap<>();
for (DisplayPriority priority : DisplayPriority.values()) {
@@ -113,9 +108,8 @@ public class Display {
* @return The itemstack.
*/
public ItemStack revert(@NotNull final ItemStack itemStack) {
if (isFinalized(itemStack)) {
if (Display.isFinalized(itemStack)) {
unfinalize(itemStack);
return itemStack;
}
if (!itemStack.hasItemMeta()) {