mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
c0c212bf48
Upstream has released updates that appears to apply and compile correctly Paper Changes: b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads 3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495 e470f1ef Add more information to Timing Reports f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers a4fe910f Fix sounds when using worldedit regen command 70ad51a8 Updated Upstream (Bukkit/CraftBukkit) d7cfa4fa Improve legacy format serialization more
59 lines
2.7 KiB
Diff
59 lines
2.7 KiB
Diff
From b28d366ed0e2e748cc515c6ac6c5d5a90652f579 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Wed, 1 Jan 2020 20:12:39 -0600
|
|
Subject: [PATCH] Add obfhelpers for plugin use
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/IChatBaseComponent.java | 2 ++
|
|
src/main/java/net/minecraft/server/ItemStack.java | 1 +
|
|
src/main/java/net/minecraft/server/NBTTagString.java | 1 +
|
|
3 files changed, 4 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
|
|
index fb97c51bb1..50ed4001d1 100644
|
|
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
|
|
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
|
|
@@ -145,6 +145,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
|
|
return this;
|
|
}
|
|
|
|
+ default IChatBaseComponent setFormat(EnumChatFormat enumchatformat) { return a(enumchatformat); } // Purpur - OBFHELPER
|
|
default IChatBaseComponent a(EnumChatFormat enumchatformat) {
|
|
ChatModifier chatmodifier = this.getChatModifier();
|
|
|
|
@@ -431,6 +432,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
|
|
return jsonobject;
|
|
}
|
|
|
|
+ public static String toJson(IChatBaseComponent ichatbasecomponent) { return a(ichatbasecomponent); } // Purpur - OBFHELPER
|
|
public static String a(IChatBaseComponent ichatbasecomponent) {
|
|
return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
|
index ea60880c6f..413b888a04 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
|
@@ -596,6 +596,7 @@ public final class ItemStack {
|
|
return this.tag;
|
|
}
|
|
|
|
+ public NBTTagCompound getOrCreateSubTag(String s) { return a(s); } // Purpur - OBFHELPER
|
|
public NBTTagCompound a(String s) {
|
|
if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
|
|
return this.tag.getCompound(s);
|
|
diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
|
|
index bea4a0b808..c6481c7ff1 100644
|
|
--- a/src/main/java/net/minecraft/server/NBTTagString.java
|
|
+++ b/src/main/java/net/minecraft/server/NBTTagString.java
|
|
@@ -40,6 +40,7 @@ public class NBTTagString implements NBTBase {
|
|
this.data = s;
|
|
}
|
|
|
|
+ public static NBTTagString create(String s) { return a(s); } // Purpur - OBFHELPER
|
|
public static NBTTagString a(String s) {
|
|
return s.isEmpty() ? NBTTagString.b : new NBTTagString(s);
|
|
}
|
|
--
|
|
2.24.0
|
|
|