Skip to content

Commit b7a8e22

Browse files
ChengZhiMeowChengZhiMeow
committed
feat: add support for Minecraft versions 1.21.8, 1.21.9, 1.21.10
build: upgrade craftengine-api to 0.0.65 build: upgrade cc-yaml to 2.1.22 build: upgrade cc-scheduler to 2.0.4 build: upgrade paper-api to 1.21.10 build: upgrade packetevents-api to 2.10.1 build: upgrade mythicmobs-api to 5.9.5 build: upgrade vault-api to 1.7.1 refactor: replace mhdf-langutil with component-based translatable names fix: library load cannot use mc_version param
1 parent 7f1782e commit b7a8e22

12 files changed

Lines changed: 78 additions & 127 deletions

File tree

‎build.gradle.kts‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ allprojects {
2727
maven("https://repo.codemc.io/repository/maven-releases")
2828
maven("https://repo.codemc.io/repository/maven-snapshots")
2929
maven("https://repo.catnies.top/releases")
30-
maven("https://maven.chengzhimeow.cn/releases")
30+
maven("https://repo.catnies.top/mhdf")
3131
maven("https://jitpack.io")
3232
}
3333

@@ -86,29 +86,24 @@ tasks {
8686

8787
exclude("META-INF/")
8888

89-
relocate("org.h2", "cn.chengzhimeow.mhdftools.libs.org.h2")
90-
relocate("com.mysql", "cn.chengzhimeow.mhdftools.libs.com.mysql")
91-
92-
relocate("cn.chengzhimeow.ccscheduler", "cn.chengzhimeow.mhdftools.libs.cn.chengzhimeow.ccscheduler")
93-
relocate("cn.chengzhimeow.ccyaml", "cn.chengzhimeow.mhdftools.libs.cn.chengzhimeow.ccyaml")
94-
relocate("cn.chengzhiya", "cn.chengzhimeow.mhdftools.libs.cn.chengzhiya")
95-
96-
relocate("com.alibaba", "cn.chengzhimeow.mhdftools.libs.com.alibaba")
97-
relocate("org.reflections", "cn.chengzhimeow.mhdftools.libs.org.reflections")
98-
99-
relocate("com.github.retrooper", "cn.chengzhimeow.mhdftools.libs.com.github.retrooper")
100-
relocate("io.github.retrooper", "cn.chengzhimeow.mhdftools.libs.io.github.retrooper")
101-
102-
relocate("com.j256.ormlite", "cn.chengzhimeow.mhdftools.libs.com.j256.ormlite")
103-
relocate("com.zaxxer", "cn.chengzhimeow.mhdftools.libs.com.zaxxer")
104-
105-
relocate("io.lettuce", "cn.chengzhimeow.mhdftools.libs.io.lettuce")
106-
107-
relocate("net.objecthunter", "cn.chengzhimeow.mhdftools.libs.net.objecthunter")
108-
109-
relocate("org.intellij", "cn.chengzhimeow.mhdftools.libs.org.intellij")
110-
relocate("org.jetbrains", "cn.chengzhimeow.mhdftools.libs.org.jetbrains")
111-
relocate("org.yaml", "cn.chengzhimeow.mhdftools.libs.org.yaml")
89+
mutableListOf(
90+
"org.h2",
91+
"com.mysql",
92+
"cn.chengzhimeow.ccscheduler",
93+
"cn.chengzhimeow.ccyaml",
94+
"cn.chengzhiya",
95+
"com.alibaba",
96+
"org.reflections",
97+
"com.github.retrooper",
98+
"io.github.retrooper",
99+
"com.j256.ormlite",
100+
"com.zaxxer",
101+
"io.lettuce",
102+
"net.objecthunter",
103+
"org.intellij",
104+
"org.jetbrains",
105+
"org.yaml"
106+
).forEach { relocate(it, "cn.chengzhimeow.mhdftools.libs.$it") }
112107
}
113108

114109
jar {

‎common/src/main/java/cn/chengzhimeow/mhdftools/manager/LibraryManager.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import java.io.File;
1717
import java.util.List;
18+
import java.util.Objects;
1819

1920
public final class LibraryManager {
2021
private static LibraryManager instance;
@@ -33,15 +34,19 @@ private LibraryManager() {
3334
private boolean checkMcVersion(ConfigurationSection mcVersion) {
3435
if (mcVersion == null) return true;
3536

36-
String type = mcVersion.getString("type");
37-
int value = mcVersion.getInt("value");
37+
String type = mcVersion.getString("type", "==");
38+
assert type != null;
39+
40+
String value = mcVersion.getString("value");
41+
if (value == null) return true;
42+
int version = Integer.parseInt(value.replace(".", ""));
3843

3944
return switch (type) {
40-
case "<" -> PluginManager.getInstance().minecraftVersion < value;
41-
case "<=" -> PluginManager.getInstance().minecraftVersion <= value;
42-
case "==" -> PluginManager.getInstance().minecraftVersion == value;
43-
case ">=" -> PluginManager.getInstance().minecraftVersion >= value;
44-
case ">" -> PluginManager.getInstance().minecraftVersion > value;
45+
case "<" -> PluginManager.getInstance().minecraftVersion < version;
46+
case "<=" -> PluginManager.getInstance().minecraftVersion <= version;
47+
case "==" -> PluginManager.getInstance().minecraftVersion == version;
48+
case ">=" -> PluginManager.getInstance().minecraftVersion >= version;
49+
case ">" -> PluginManager.getInstance().minecraftVersion > version;
4550
default -> true;
4651
};
4752
}
@@ -67,6 +72,7 @@ else if (groupIdValue instanceof List) {
6772
ConfigurationSection mcVersion = section.getConfigurationSection("mc_version");
6873
if (!this.checkMcVersion(mcVersion)) continue;
6974
groupId = section.getString("value");
75+
break;
7076
}
7177
}
7278

@@ -78,7 +84,8 @@ else if (artifactIdValue instanceof List) {
7884
for (ConfigurationSection section : sectionList) {
7985
ConfigurationSection mcVersion = section.getConfigurationSection("mc_version");
8086
if (!this.checkMcVersion(mcVersion)) continue;
81-
groupId = section.getString("value");
87+
artifactId = section.getString("value");
88+
break;
8289
}
8390
}
8491

@@ -91,19 +98,22 @@ else if (versionValue instanceof List) {
9198
ConfigurationSection mcVersion = section.getConfigurationSection("mc_version");
9299
if (!this.checkMcVersion(mcVersion)) continue;
93100
version = section.getString("value");
101+
break;
94102
}
95103
}
96104

97105
if (config.has("dependency")) {
98-
String[] dependency = config.getString("dependency").split(":");
106+
String[] dependency = Objects.requireNonNull(config.getString("dependency")).split(":");
99107
groupId = dependency[0];
100108
if (dependency.length >= 2) artifactId = dependency[1];
101109
if (dependency.length == 3) version = dependency[2];
102110
}
103111

112+
Boolean relocateGroupId = config.getBoolean("relocate.group_id", true);
113+
assert relocateGroupId != null;
104114
RelocateConfig relocate = new RelocateConfig(
105115
config.getBoolean("relocate.enable"),
106-
config.getBoolean("relocate.group_id", true),
116+
relocateGroupId,
107117
config.getStringList("relocate.relocator").toArray(String[]::new)
108118
);
109119

‎common/src/main/resources/library/bukkit.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,23 @@ library:
5858
- repo: "https://repo.codemc.io/repository/maven-public/"
5959
dependency: "com.github.retrooper:packetevents-api"
6060
version: &packetevents_version
61+
- mc_version:
62+
type: ">="
63+
value: "1.21.9"
64+
value: "2.10.1"
6165
- mc_version:
6266
type: "=="
63-
value: 1215
64-
value: "2.9.0"
67+
value: "1.21.8"
68+
value: "2.9.4"
69+
- mc_version:
70+
type: ">="
71+
value: "1.21.6"
72+
value: "2.9.1"
6573
- mc_version:
66-
type: "<="
67-
value: 1214
68-
value: "2.8.0"
69-
- value: "2.9.5"
74+
type: "=="
75+
value: "1.21.5"
76+
value: "2.9.0"
77+
- value: "2.8.0"
7078
relocate: &packetevents_relocate
7179
enable: true
7280
relocator:

‎gradle.properties‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
project.version=4.0.0-beta-3
2-
server.paper=io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT
1+
project.version=4.0.0-beta-4
2+
server.paper=io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT
33
server.bungeecord=net.md-5:bungeecord-api:1.21-R0.1-SNAPSHOT
44
server.velocity=com.velocitypowered:velocity-api:3.3.0-SNAPSHOT
55
libs.lombok=org.projectlombok:lombok:1.18.30
6-
libs.cc_yaml=cn.chengzhimeow:CC-Yaml:2.1.1
6+
libs.cc_yaml=cn.chengzhimeow:CC-Yaml:2.1.22
77
libs.cc_condition=cn.chengzhimeow:CC-Condition:2.0.20
8-
libs.cc_scheduler=cn.chengzhimeow:CC-Scheduler:2.0.3
8+
libs.cc_scheduler=cn.chengzhimeow:CC-Scheduler:2.0.4
99
libs.mhdf_library=cn.chengzhiya:MHDF-Library:1.0.3
10-
libs.mhdf_langutil=cn.chengzhiya:MHDF-LangUtil:1.3.1
1110
libs.mhdf_database_api=cn.chengzhiya:MHDF-Database-API:1.0.2
1211
libs.mhdf_database_mysql=cn.chengzhiya:MHDF-Database-MySQL:1.0.2
1312
libs.mhdf_database_h2=cn.chengzhiya:MHDF-Database-H2:1.0.2
@@ -16,9 +15,9 @@ libs.fastjson=com.alibaba.fastjson2:fastjson2:2.0.57
1615
libs.reflections=org.reflections:reflections:0.10.2
1716
libs.lettuce=io.lettuce:lettuce-core:6.5.5.RELEASE
1817
libs.exp4j=net.objecthunter:exp4j:0.4.8
19-
libs.packetevents=com.github.retrooper:packetevents-spigot:2.9.5
18+
libs.packetevents=com.github.retrooper:packetevents-spigot:2.10.1
2019
plugin.placeholderapi=me.clip:placeholderapi:2.11.6
21-
plugin.mythicmobs=io.lumine:Mythic-Dist:5.6.2
22-
plugin.vault=com.github.MilkBowl:VaultAPI:1.7
23-
plugin.craftengine_core=net.momirealms:craft-engine-core:0.0.60
24-
plugin.craftengine_bukkit=net.momirealms:craft-engine-bukkit:0.0.60
20+
plugin.mythicmobs=io.lumine:Mythic-Dist:5.9.5
21+
plugin.vault=com.github.MilkBowl:VaultAPI:1.7.1
22+
plugin.craftengine_core=net.momirealms:craft-engine-core:0.0.65
23+
plugin.craftengine_bukkit=net.momirealms:craft-engine-bukkit:0.0.65

‎plugin/bukkit/build.gradle.kts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ dependencies {
88
implementation(project(":api"))
99
implementation(project(":common"))
1010
implementation(project(":plugin:bukkit:compatibility"))
11+
implementation(project(":plugin:bukkit:modules"))
1112

1213
compileOnly("${rootProject.properties["libs.cc_scheduler"]}")
13-
compileOnly("${rootProject.properties["libs.mhdf_langutil"]}") {
14-
exclude("com.alibaba.fastjson2")
15-
}
1614

1715
compileOnly("${rootProject.properties["libs.mhdf_database_api"]}") {
1816
exclude("org.slf4j")

‎plugin/bukkit/compatibility/item/craftengine/src/main/java/cn/chengzhimeow/mhdftools/bukkit/compatibility/item/CraftEngineImpl.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,22 @@
22

33
import net.momirealms.craftengine.bukkit.api.CraftEngineItems;
44
import net.momirealms.craftengine.core.item.CustomItem;
5-
import net.momirealms.craftengine.core.plugin.CraftEngine;
65
import net.momirealms.craftengine.core.util.Key;
76
import org.bukkit.Material;
87
import org.bukkit.inventory.ItemStack;
98

109
public final class CraftEngineImpl implements Compatibility {
11-
private final CraftEngine api;
12-
13-
public CraftEngineImpl() {
14-
this.api = CraftEngine.instance();
15-
}
16-
1710
@Override
1811
public ItemStack getItemById(String id) {
1912
CustomItem<ItemStack> customItem = CraftEngineItems.byId(Key.of(id));
20-
if (customItem == null) {
21-
return new ItemStack(Material.AIR);
22-
}
13+
if (customItem == null) return new ItemStack(Material.AIR);
2314

2415
return customItem.buildItemStack();
2516
}
2617

2718
@Override
2819
public String getIdByItemStack(ItemStack itemStack) {
29-
Key key = this.api.itemManager().customItemId(itemStack);
20+
Key key = CraftEngineItems.getCustomItemId(itemStack);
3021
if (key == null) return null;
3122

3223
return key.namespace() + ":" + key.value();

‎plugin/bukkit/modules/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dependencies {
2+
compileOnly(project(":api"))
3+
compileOnly(project(":common"))
4+
compileOnly(project(":plugin:bukkit:compatibility"))
5+
}

‎plugin/bukkit/src/main/java/cn/chengzhimeow/mhdftools/bukkit/Main.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
public final class Main extends JavaPlugin {
2626
public static Main instance;
2727

28-
private MinecraftLangManager minecraftLangManager;
29-
3028
private MHDFDatabaseManager databaseManager;
3129
private CacheManager cacheManager;
3230
private PluginHookManager pluginHookManager;
@@ -63,9 +61,6 @@ public void log(String s) {
6361
ConfigsManager.getInstance().updateAll();
6462
ConfigsManager.getInstance().reloadAll();
6563

66-
this.minecraftLangManager = new MinecraftLangManager();
67-
this.minecraftLangManager.init();
68-
6964
LogFilterManager logFilterManager = new LogFilterManager();
7065
logFilterManager.init();
7166
}

‎plugin/bukkit/src/main/java/cn/chengzhimeow/mhdftools/bukkit/manager/MinecraftLangManager.java‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎plugin/bukkit/src/main/java/cn/chengzhimeow/mhdftools/bukkit/util/feature/ChatUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ public static TextComponent applyShowItem(Player player, TextComponent messageCo
9999

100100
ItemMeta meta = item.getItemMeta();
101101
Component displayName;
102-
if (meta.hasDisplayName()) displayName = meta.displayName();
103-
else if (meta.hasCustomName()) displayName = meta.customName();
104-
else displayName = Main.instance.getMinecraftLangManager().getItemName(item);
102+
if (meta.hasCustomName()) displayName = meta.customName();
103+
else if (meta.hasItemName()) displayName = meta.itemName();
104+
else displayName = Component.translatable(item.translationKey());
105105

106106
formatComponent = formatComponent
107107
.replace("{name}", displayName)

0 commit comments

Comments
 (0)