Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-04 15:41:38 +00:00
Code Issues Releases Activity

解决一部分问题

Browse Source
This commit is contained in:
jhqwqmc
2025-11-29 01:02:57 +08:00
parent 49f288c99b
commit ffaa28598a
3 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java
View File

@@ -16,6 +16,7 @@ import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.StringUtils;
import net.momirealms.craftengine.core.util.UniqueKey;
import net.momirealms.craftengine.core.util.VersionHelper;
import net.momirealms.sparrow.nbt.Tag;
import org.bukkit.Bukkit;
import org.bukkit.inventory.ItemStack;
@@ -33,27 +34,20 @@ public abstract class BukkitItemFactory<W extends ItemWrapper<ItemStack>> extend
public static BukkitItemFactory<? extends ItemWrapper<ItemStack>> create(CraftEngine plugin) {
Objects.requireNonNull(plugin, "plugin");
switch (plugin.serverVersion()) {
case "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4" -> {
return new UniversalItemFactory(plugin);
}
case "1.20.5", "1.20.6"-> {
return new ComponentItemFactory1_20_5(plugin);
}
case "1.21", "1.21.1" -> {
return new ComponentItemFactory1_21(plugin);
}
case "1.21.2", "1.21.3" -> {
return new ComponentItemFactory1_21_2(plugin);
}
case "1.21.4" -> {
return new ComponentItemFactory1_21_4(plugin);
}
case "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10" -> {
return new ComponentItemFactory1_21_5(plugin);
}
default -> throw new IllegalStateException("Unsupported server version: " + plugin.serverVersion());
if (VersionHelper.isOrAbove1_21_5()) {
return new ComponentItemFactory1_21_5(plugin);
} else if (VersionHelper.isOrAbove1_21_4()) {
return new ComponentItemFactory1_21_4(plugin);
} else if (VersionHelper.isOrAbove1_21_2()) {
return new ComponentItemFactory1_21_2(plugin);
} else if (VersionHelper.isOrAbove1_21()) {
return new ComponentItemFactory1_21(plugin);
} else if (VersionHelper.isOrAbove1_20_5()) {
return new ComponentItemFactory1_20_5(plugin);
} else if (VersionHelper.isOrAbove1_20()) {
return new UniversalItemFactory(plugin);
}
throw new IllegalStateException("Unsupported server version: " + VersionHelper.MINECRAFT_VERSION.version());
}
public void resetRecipeIngredientSources(ExternalItemSource<ItemStack>[] recipeIngredientSources) {

20
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/CoreReflections.java
View File

@@ -67,8 +67,8 @@ public final class CoreReflections {
public static final Class<?> clazz$ResourceLocation = requireNonNull(
BukkitReflectionUtils.findReobfOrMojmapClass(
"resources.MinecraftKey",
"resources.ResourceLocation"
List.of("resources.MinecraftKey", "resources.Identifier"), // todo 确认 spigot 映射命名
List.of("resources.ResourceLocation", "resources.Identifier")
)
);
@@ -2957,8 +2957,8 @@ public final class CoreReflections {
public static final Class<?> clazz$AbstractArrow = requireNonNull(
BukkitReflectionUtils.findReobfOrMojmapClass(
"world.entity.projectile.EntityArrow",
"world.entity.projectile.AbstractArrow"
List.of("world.entity.projectile.EntityArrow", "world.entity.projectile.arrow.AbstractArrow"), // todo 确认 spigot 映射命名
List.of("world.entity.projectile.AbstractArrow", "world.entity.projectile.arrow.AbstractArrow")
)
);
@@ -2996,8 +2996,8 @@ public final class CoreReflections {
public static final Class<?> clazz$AbstractArrow$Pickup = requireNonNull(
BukkitReflectionUtils.findReobfOrMojmapClass(
"world.entity.projectile.EntityArrow$PickupStatus",
"world.entity.projectile.AbstractArrow$Pickup"
List.of("world.entity.projectile.EntityArrow$PickupStatus", "world.entity.projectile.arrow.AbstractArrow$a"), // todo 确认 spigot 映射命名
List.of("world.entity.projectile.AbstractArrow$Pickup", "world.entity.projectile.arrow.AbstractArrow$Pickup")
)
);
@@ -4385,8 +4385,8 @@ public final class CoreReflections {
public static final Class<?> clazz$ImpossibleTrigger = requireNonNull(
BukkitReflectionUtils.findReobfOrMojmapClass(
"advancements.critereon.CriterionTriggerImpossible",
"advancements.critereon.ImpossibleTrigger"
List.of("advancements.critereon.CriterionTriggerImpossible", "advancements.criterion.CriterionTriggerImpossible"), // todo 确认 spigot 映射命名
List.of("advancements.critereon.ImpossibleTrigger", "advancements.criterion.ImpossibleTrigger")
)
);
@@ -4396,8 +4396,8 @@ public final class CoreReflections {
public static final Class<?> clazz$ImpossibleTrigger$TriggerInstance = requireNonNull(
BukkitReflectionUtils.findReobfOrMojmapClass(
"advancements.critereon.CriterionTriggerImpossible$a",
"advancements.critereon.ImpossibleTrigger$TriggerInstance"
List.of("advancements.critereon.CriterionTriggerImpossible$a", "advancements.criterion.CriterionTriggerImpossible$a"), // todo 确认 spigot 映射命名
List.of("advancements.critereon.ImpossibleTrigger$TriggerInstance", "advancements.criterion.ImpossibleTrigger$TriggerInstance")
)
);

2
gradle.properties
View File

@@ -48,7 +48,7 @@ byte_buddy_version=1.18.1
ahocorasick_version=0.6.3
snake_yaml_version=2.5
anti_grief_version=1.0.5
nms_helper_version=1.0.137
nms_helper_version=1.0.138
evalex_version=3.5.0
reactive_streams_version=1.0.4
amazon_awssdk_version=2.38.7