upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport some Vanilla 1.21 ResourceLocation methods (#10241)

Browse Source 
Co-authored-by: Paint_Ninja <PaintNinja@users.noreply.github.com>
This commit is contained in:
JonathingandPaint_Ninja authored and GitHub committed 2024-12-23 18:57:33 -08:00
1 parent 4ab4dacf6c
commit a5293855d6
1 file changed
+32
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/resources/ResourceLocation.java.patch
+32
View File
@@ -1,5 +1,21 @@
--- a/net/minecraft/resources/ResourceLocation.java
+++ b/net/minecraft/resources/ResourceLocation.java
@@ -34,6 +_,7 @@
this.f_135805_ = p_249394_;
}
+ /** Forge: Consider using {@link #fromNamespaceAndPath(String, String)} instead, as Mojang made this constructor private in Vanilla 1.21 */
public ResourceLocation(String p_135811_, String p_135812_) {
this(m_245413_(p_135811_, p_135812_), m_245185_(p_135811_, p_135812_), (ResourceLocation.Dummy)null);
}
@@ -42,6 +_,7 @@
this(p_135814_[0], p_135814_[1]);
}
+ /** Forge: Consider using {@link #parse(String)} instead, as Mojang made this constructor private in Vanilla 1.21 */
public ResourceLocation(String p_135809_) {
this(m_135832_(p_135809_, ':'));
}
@@ -143,6 +_,12 @@
return i;
}
@@ -13,3 +29,19 @@
public String m_179910_() {
return this.toString().replace('/', '_').replace(':', '_');
}
@@ -244,5 +_,15 @@
public JsonElement serialize(ResourceLocation p_135855_, Type p_135856_, JsonSerializationContext p_135857_) {
return new JsonPrimitive(p_135855_.toString());
}
+ }
+
+ /** Forge: Backport of Vanilla 1.21 method */
+ public static ResourceLocation fromNamespaceAndPath(String namespace, String path) {
+ return new ResourceLocation(namespace, path);
+ }
+
+ /** Forge: Backport of Vanilla 1.21 method */
+ public static ResourceLocation parse(String location) {
+ return new ResourceLocation(location);
}
}