Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-29 03:49:15 +00:00
Code Issues Releases Activity

Merge remote-tracking branch 'refs/remotes/upstream/dev' into lamp

Browse Source
This commit is contained in:
jhqwqmc
2025-09-10 09:24:21 +08:00
parent c9d7723881 0968d4987e
commit da6acea474
13 changed files with 183 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/SXItemSource.java
View File

@@ -13,7 +13,7 @@ public class SXItemSource implements ExternalItemSource<ItemStack> {
@Override
public String plugin() {
return "sxitem";
return "sx-item";
}
@Nullable

2
bukkit/loader/build.gradle.kts
View File

@@ -50,7 +50,7 @@ bukkit {
name = "CraftEngine"
apiVersion = "1.20"
authors = listOf("XiaoMoMi")
contributors = listOf("jhqwqmc", "iqtesterr", "WhiteProject1", "Catnies", "xiaozhangup", "TamashiiMon", "Halogly", "ArubikU", "Maxsh001", "Sasha2294", "MrPanda8")
contributors = listOf("https://github.com/Xiao-MoMi/craft-engine/graphs/contributors")
softDepend = listOf("PlaceholderAPI", "WorldEdit", "FastAsyncWorldEdit", "Skript")
foliaSupported = true
}

2
bukkit/paper-loader/build.gradle.kts
View File

@@ -53,7 +53,7 @@ paper {
name = "CraftEngine"
apiVersion = "1.20"
authors = listOf("XiaoMoMi")
contributors = listOf("jhqwqmc", "iqtesterrr", "WhiteProject1", "Catnies", "xiaozhangup", "TamashiiMon", "Halogly", "ArubikU", "Maxsh001", "Sasha2294", "MrPanda8")
contributors = listOf("https://github.com/Xiao-MoMi/craft-engine/graphs/contributors")
foliaSupported = true
serverDependencies {
register("PlaceholderAPI") {

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

@@ -917,7 +917,7 @@ public final class CoreReflections {
);
public static final Method method$IdMapper$add = requireNonNull(
ReflectionUtils.getMethod(clazz$IdMapper, void.class, Object.class)
ReflectionUtils.getMethod(clazz$IdMapper, void.class, new String[] {"add", "b"}, Object.class)
);
public static final Object instance$Block$BLOCK_STATE_REGISTRY;

12
bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitCEWorld.java
View File

@@ -7,14 +7,13 @@ import net.momirealms.craftengine.core.block.entity.render.BlockEntityRenderer;
import net.momirealms.craftengine.core.block.entity.render.BlockEntityRendererConfig;
import net.momirealms.craftengine.core.plugin.config.Config;
import net.momirealms.craftengine.core.util.SectionPosUtils;
import net.momirealms.craftengine.core.world.BlockPos;
import net.momirealms.craftengine.core.world.CEWorld;
import net.momirealms.craftengine.core.world.ChunkPos;
import net.momirealms.craftengine.core.world.World;
import net.momirealms.craftengine.core.world.*;
import net.momirealms.craftengine.core.world.chunk.storage.StorageAdaptor;
import net.momirealms.craftengine.core.world.chunk.storage.WorldDataStorage;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
public class BukkitCEWorld extends CEWorld {
@@ -39,8 +38,9 @@ public class BukkitCEWorld extends CEWorld {
);
super.lightSections.clear();
super.isUpdatingLights = false;
super.lightSections.addAll(super.pendingLightSections);
super.pendingLightSections.clear();
List<SectionPos> pendingLightSections = super.pendingLightSections;
super.pendingLightSections = new ArrayList<>(Math.max(pendingLightSections.size() / 2, 8));
super.lightSections.addAll(pendingLightSections);
}
}