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

修改

Browse Source
This commit is contained in:
jhqwqmc
2025-12-06 19:34:35 +08:00
parent e2170f54ba
commit b1d91cb0f0
9 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/MMOItemsSource.java
View File

@@ -27,7 +27,9 @@ public class MMOItemsSource implements ExternalItemSource<ItemStack> {
split = split[0].split("_", 2);
}
if (split.length == 1) return new ItemStack(Material.AIR);
MMOItem mmoItem = MMOItems.plugin.getMMOItem(Type.get(split[0]), split[1].toUpperCase(Locale.ROOT));
// 这里与使用和mmoitems相同的转换id方法
String mmoItemId = split[1].toUpperCase().replace("-", "_").replace(" ", "_");
MMOItem mmoItem = MMOItems.plugin.getMMOItem(Type.get(split[0]), mmoItemId);
return mmoItem == null ? new ItemStack(Material.AIR) : requireNonNull(mmoItem.newBuilder().build());
}

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/entity/renderer/element/ItemDisplayBlockEntityElementConfig.java
View File

@@ -182,7 +182,13 @@ public class ItemDisplayBlockEntityElementConfig implements BlockEntityElementCo
@Override
public int hashCode() {
return Objects.hashCode(xRot, yRot, position, translation, rotation);
int result = 17;
result = 31 * result + Double.hashCode(xRot);
result = 31 * result + Double.hashCode(yRot);
result = 31 * result + (position != null ? position.hashCode() : 0);
result = 31 * result + (translation != null ? translation.hashCode() : 0);
result = 31 * result + (rotation != null ? rotation.hashCode() : 0);
return result;
}
public static class Factory implements BlockEntityElementConfigFactory<ItemDisplayBlockEntityElement> {

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/entity/renderer/element/TextDisplayBlockEntityElementConfig.java
View File

@@ -156,7 +156,13 @@ public class TextDisplayBlockEntityElementConfig implements BlockEntityElementCo
@Override
public int hashCode() {
return Objects.hashCode(xRot, yRot, position, translation, rotation);
int result = 17;
result = 31 * result + Double.hashCode(xRot);
result = 31 * result + Double.hashCode(yRot);
result = 31 * result + (position != null ? position.hashCode() : 0);
result = 31 * result + (translation != null ? translation.hashCode() : 0);
result = 31 * result + (rotation != null ? rotation.hashCode() : 0);
return result;
}
public static class Factory implements BlockEntityElementConfigFactory<TextDisplayBlockEntityElement> {

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/element/ItemDisplayFurnitureElement.java
View File

@@ -43,7 +43,7 @@ public class ItemDisplayFurnitureElement implements FurnitureElement {
this.position.x, this.position.y, this.position.z, 0, this.position.yRot,
MEntityTypes.ITEM_DISPLAY, 0, CoreReflections.instance$Vec3$Zero, 0
),
FastNMS.INSTANCE.constructor$ClientboundSetEntityDataPacket(this.entityId, this.config.metadata().apply(player, this.colorSource))
FastNMS.INSTANCE.constructor$ClientboundSetEntityDataPacket(this.entityId, this.config.metadata.apply(player, this.colorSource))
)), false);
}

34
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/element/ItemDisplayFurnitureElementConfig.java
View File

@@ -31,23 +31,23 @@ import java.util.function.BiFunction;
public class ItemDisplayFurnitureElementConfig implements FurnitureElementConfig<ItemDisplayFurnitureElement> {
public static final Factory FACTORY = new Factory();
private final BiFunction<Player, FurnitureColorSource, List<Object>> metadata;
private final Key itemId;
private final Vector3f scale;
private final Vector3f position;
private final Vector3f translation;
private final float xRot;
private final float yRot;
private final Quaternionf rotation;
private final ItemDisplayContext displayContext;
private final Billboard billboard;
private final float shadowRadius;
private final float shadowStrength;
private final boolean applyDyedColor;
private final Color glowColor;
private final int blockLight;
private final int skyLight;
private final float viewRange;
public final BiFunction<Player, FurnitureColorSource, List<Object>> metadata;
public final Key itemId;
public final Vector3f scale;
public final Vector3f position;
public final Vector3f translation;
public final float xRot;
public final float yRot;
public final Quaternionf rotation;
public final ItemDisplayContext displayContext;
public final Billboard billboard;
public final float shadowRadius;
public final float shadowStrength;
public final boolean applyDyedColor;
public final Color glowColor;
public final int blockLight;
public final int skyLight;
public final float viewRange;
public ItemDisplayFurnitureElementConfig(Key itemId,
Vector3f scale,

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BlockStateGenerator.java
View File

@@ -181,7 +181,7 @@ public final class BlockStateGenerator {
if (state == null) return thisObj;
Property<Boolean> waterloggedProperty = (Property<Boolean>) state.owner().value().getProperty("waterlogged");
if (waterloggedProperty == null) return thisObj;
return state.with(waterloggedProperty, (Boolean) args[1]).customBlockState().literalObject();
return state.with(waterloggedProperty, (boolean) args[1]).customBlockState().literalObject();
}
}

6
core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/SelfHostHttpServer.java
View File

@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
public final class SelfHostHttpServer {
private static volatile SelfHostHttpServer instance;
private static SelfHostHttpServer instance;
private final Cache<String, String> oneTimePackUrls = Caffeine.newBuilder()
.maximumSize(1024)
.scheduler(Scheduler.systemScheduler())
@@ -93,13 +93,9 @@ public final class SelfHostHttpServer {
}
public static SelfHostHttpServer instance() {
if (instance == null) {
synchronized (SelfHostHttpServer.class) {
if (instance == null) {
instance = new SelfHostHttpServer();
}
}
}
return instance;
}

3
core/src/main/java/net/momirealms/craftengine/core/util/MarkedArrayList.java
View File

@@ -2,13 +2,10 @@ package net.momirealms.craftengine.core.util;
import org.jetbrains.annotations.NotNull;
import java.io.Serial;
import java.util.ArrayList;
import java.util.Collection;
public class MarkedArrayList<T> extends ArrayList<T> {
@Serial
private static final long serialVersionUID = 1L;
public MarkedArrayList() {
}

3
core/src/main/java/net/momirealms/craftengine/core/util/MarkedHashMap.java
View File

@@ -1,9 +1,6 @@
package net.momirealms.craftengine.core.util;
import java.io.Serial;
import java.util.HashMap;
public class MarkedHashMap<K, V> extends HashMap<K, V> {
@Serial
private static final long serialVersionUID = 1L;
}