Skip to content
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

Mod Material support, for Hybrid Server #7126

Merged
merged 20 commits into from
Oct 31, 2024
Merged

Mod Material support, for Hybrid Server #7126

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2439507
fix: Mod items support, for Hybrid Server
0XPYEX0 Oct 2, 2024
dc1957e
style: style
0XPYEX0 Oct 2, 2024
acf70fb
perf: rename function name and aliases name
0XPYEX0 Oct 2, 2024
e8e8074
perf: notes
0XPYEX0 Oct 2, 2024
bc7740e
perf: not a break change
0XPYEX0 Oct 2, 2024
fd28c5c
perf: the @Nullable annotation
0XPYEX0 Oct 2, 2024
d49018b
docs: javadoc
0XPYEX0 Oct 2, 2024
c04c6a3
style: to upper cases
0XPYEX0 Oct 2, 2024
b9a37ed
perf: resolved mentioned
0XPYEX0 Oct 2, 2024
070b0ba
style: style
0XPYEX0 Oct 2, 2024
a8e13ff
perf: resolved mentioned
0XPYEX0 Oct 2, 2024
3c2057f
feat: the expression: from
0XPYEX0 Oct 2, 2024
d8a2d76
fix: wrong space
0XPYEX0 Oct 2, 2024
034f70b
fix: ..s
0XPYEX0 Oct 3, 2024
163809d
Merge branch 'dev/feature' into dev/patch
sovdeeth Oct 26, 2024
8f57fe9
perf: add warnings
0XPYEX0 Oct 27, 2024
1c4c1dd
style: just sort codes, using IDEA
0XPYEX0 Oct 27, 2024
1b94832
Merge branch 'dev/feature' into dev/patch
0XPYEX0 Oct 27, 2024
2f59fb6
perf: resolved mentioned
0XPYEX0 Oct 29, 2024
005dfdc
Merge branch 'dev/feature' into dev/patch
sovdeeth Oct 31, 2024
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
8 changes: 6 additions & 2 deletions src/main/java/ch/njol/skript/aliases/Aliases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import ch.njol.skript.config.Node;
import ch.njol.skript.config.SectionNode;
import ch.njol.skript.entity.EntityData;
import org.bukkit.entity.EntityType;
import org.skriptlang.skript.lang.script.Script;
import ch.njol.skript.lang.parser.ParserInstance;
import ch.njol.skript.localization.ArgsMessage;
Expand Down Expand Up @@ -403,7 +402,12 @@ private static void loadMissingAliases() {
for (Material material : Material.values()) {
if (!material.isLegacy() && !provider.hasAliasForMaterial(material)) {
NamespacedKey key = material.getKey();
String name = key.getKey().replace("_", " ");
String name = (key.getNamespace().equals(NamespacedKey.MINECRAFT)
? key.getKey()
: key.getNamespace() + "'s " + key.getKey()
).replace("_", " ");
// mod:an_item → mod's an item
0XPYEX0 marked this conversation as resolved.
Show resolved Hide resolved
// minecraft:dirt → dirt
parser.loadAlias(name + "¦s", key.toString());
Skript.debug(ChatColor.YELLOW + "Creating temporary alias for: " + key);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/aliases/AliasesProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
datas = typeOfId.getTypes();
} else { // ... but quite often, we just got Vanilla id
// Prepare and modify ItemStack (using somewhat Unsafe methods)
Material material = BukkitUnsafe.getMaterialFromMinecraftId(id);
Material material = BukkitUnsafe.getMaterialFromNamespacedId(id);
if (material == null) { // If server doesn't recognize id, do not proceed
throw new InvalidMinecraftIdException(id);
}
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@

import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;

import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.UnsafeValues;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
Expand All @@ -39,7 +37,6 @@
import com.google.gson.reflect.TypeToken;
import ch.njol.util.EnumTypeAdapter;
import ch.njol.skript.Skript;
import ch.njol.skript.util.Version;

/**
* Contains helpers for Bukkit's not so safe stuff.
Expand Down Expand Up @@ -68,9 +65,17 @@ public class BukkitUnsafe {
@Nullable
private static Map<Integer,Material> idMappings;

@Nullable
@Deprecated
public static Material getMaterialFromMinecraftId(String id) {
0XPYEX0 marked this conversation as resolved.
Show resolved Hide resolved
return Material.matchMaterial(id);
return getMaterialFromNamespacedId(id);
}

@Nullable
public static Material getMaterialFromNamespacedId(String id) {
0XPYEX0 marked this conversation as resolved.
Show resolved Hide resolved
return Material.matchMaterial(id.toLowerCase().startsWith(NamespacedKey.MINECRAFT + ":")
? id
: id.replace(":", "_") //For Hybrid Server
);
}

public static void modifyItemStack(ItemStack stack, String arguments) {
Expand Down