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

格式化q米提交的部分代码

Browse Source
This commit is contained in:
jhqwqmc
2025-06-26 17:55:35 +08:00
parent e0e55fb331
commit bc34b367b0
8 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java
View File

@@ -50,7 +50,7 @@ public class BukkitFurniture implements Furniture {
// cache
private final List<Integer> fakeEntityIds;
private final List<Integer> entityIds;
private final Map<Integer, HitBox> hitBoxes = new Int2ObjectArrayMap<>();
private final Map<Integer, HitBox> hitBoxes = new Int2ObjectArrayMap<>();
private final Map<Integer, AABB> aabb = new Int2ObjectArrayMap<>();
private final boolean minimized;
private final boolean hasExternalModel;
@@ -345,7 +345,7 @@ public class BukkitFurniture implements Furniture {
EntityType type;
if (limitPlayerRotation) {
type = EntityType.ARMOR_STAND;
loc = VersionHelper.isOrAbove1_20_2() ? loc.subtract(0,0.9875,0) : loc.subtract(0,0.990625,0);
loc = VersionHelper.isOrAbove1_20_2() ? loc.subtract(0, 0.9875, 0) : loc.subtract(0, 0.990625, 0);
if (function == null) {
function = entity -> {
ArmorStand armorStand = (ArmorStand) entity;
@@ -364,18 +364,18 @@ public class BukkitFurniture implements Furniture {
armorStand.setGravity(false);
armorStand.setPersistent(false);
armorStand.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_SEAT_BASE_ENTITY_KEY, PersistentDataType.INTEGER, furniture.baseEntityId());
//armorStand.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_SEAT_VECTOR_3F_KEY, PersistentDataType.STRING, seat.offset().x + ", " + seat.offset().y + ", " + seat.offset().z);
// armorStand.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_SEAT_VECTOR_3F_KEY, PersistentDataType.STRING, seat.offset().x + ", " + seat.offset().y + ", " + seat.offset().z);
};
}
} else {
type = EntityType.ITEM_DISPLAY;
loc = VersionHelper.isOrAbove1_20_2() ? loc : loc.subtract(0,0.25,0);
loc = VersionHelper.isOrAbove1_20_2() ? loc : loc.subtract(0, 0.25, 0);
if (function == null) {
function = entity -> {
ItemDisplay itemDisplay = (ItemDisplay) entity;
itemDisplay.setPersistent(false);
itemDisplay.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_SEAT_BASE_ENTITY_KEY, PersistentDataType.INTEGER, furniture.baseEntityId());
//itemDisplay.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_SEAT_VECTOR_3F_KEY, PersistentDataType.STRING, seat.offset().x + ", " + seat.offset().y + ", " + seat.offset().z);
// itemDisplay.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_SEAT_VECTOR_3F_KEY, PersistentDataType.STRING, seat.offset().x + ", " + seat.offset().y + ", " + seat.offset().z);
};
}
}

6
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
View File

@@ -97,7 +97,8 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
Bukkit.getPluginManager().registerEvents(this.dismountListener, this.plugin.javaPlugin());
Bukkit.getPluginManager().registerEvents(this.furnitureEventListener, this.plugin.javaPlugin());
if (VersionHelper.isFolia()) {
BiConsumer<Entity, Runnable> taskExecutor = (entity, runnable) -> entity.getScheduler().run(this.plugin.javaPlugin(), (t) -> runnable.run(), () -> {});
BiConsumer<Entity, Runnable> taskExecutor = (entity, runnable) -> entity.getScheduler().run(this.plugin.javaPlugin(), (t) -> runnable.run(), () -> {
});
for (World world : Bukkit.getWorlds()) {
List<Entity> entities = world.getEntities();
for (Entity entity : entities) {
@@ -426,7 +427,8 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
Object nmsEntity = FastNMS.INSTANCE.method$CraftEntity$getHandle(bukkitEntity);
return FastNMS.INSTANCE.method$Entity$canBeCollidedWith(nmsEntity);
}
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
return false;
}
}

9
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/seat/BukkitSeatEntity.java
View File

@@ -24,7 +24,8 @@ public abstract class BukkitSeatEntity extends BukkitEntity implements SeatEntit
}
@Override
public void add(NetWorkUser to) {}
public void add(NetWorkUser to) {
}
@Override
public void dismount(Player player) {
@@ -35,10 +36,12 @@ public abstract class BukkitSeatEntity extends BukkitEntity implements SeatEntit
}
@Override
public void onDismount(Player player) {}
public void onDismount(Player player) {
}
@Override
public void event(Player player, Object event) {}
public void event(Player player, Object event) {
}
@Override
public void destroy() {

3
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/seat/CrawlSeat.java
View File

@@ -72,7 +72,8 @@ public class CrawlSeat extends AbstractSeat {
try {
if (VersionHelper.isOrAbove1_20_5()) {
Object attributeInstance = CoreReflections.constructor$AttributeInstance.newInstance(MAttributeHolders.SCALE, (Consumer<?>) (o) -> {});
Object attributeInstance = CoreReflections.constructor$AttributeInstance.newInstance(MAttributeHolders.SCALE, (Consumer<?>) (o) -> {
});
CoreReflections.method$AttributeInstance$setBaseValue.invoke(attributeInstance, 0.6);
packets.add(
NetworkReflections.constructor$ClientboundUpdateAttributesPacket0

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

@@ -7,8 +7,8 @@ import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
import net.momirealms.craftengine.bukkit.block.behavior.BukkitBlockBehaviors;
import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
import net.momirealms.craftengine.bukkit.entity.furniture.hitbox.BukkitHitBoxTypes;
import net.momirealms.craftengine.bukkit.entity.projectile.BukkitProjectileManager;
import net.momirealms.craftengine.bukkit.entity.furniture.seat.BukkitSeatTypes;
import net.momirealms.craftengine.bukkit.entity.projectile.BukkitProjectileManager;
import net.momirealms.craftengine.bukkit.font.BukkitFontManager;
import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
import net.momirealms.craftengine.bukkit.item.behavior.BukkitItemBehaviors;

7
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
View File

@@ -130,7 +130,8 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes
Channel channel = future.channel();
injectServerChannel(channel);
this.injectedChannels.add(channel);
}, (object) -> {});
}, (object) -> {
});
CoreReflections.field$ServerConnectionListener$channels.set(serverConnection, monitor);
} catch (ReflectiveOperationException e) {
throw new RuntimeException("Failed to init server connection", e);
@@ -162,7 +163,7 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes
registerNMSPacketConsumer(PacketConsumers.MOVE_POS_ENTITY, NetworkReflections.clazz$ClientboundMoveEntityPacket$Pos);
registerNMSPacketConsumer(PacketConsumers.ROTATE_HEAD, NetworkReflections.clazz$ClientboundRotateHeadPacket);
registerNMSPacketConsumer(PacketConsumers.SET_ENTITY_MOTION, NetworkReflections.clazz$ClientboundSetEntityMotionPacket);
registerNMSPacketConsumer(PacketConsumers.SET_CONTAINER_SLOT, NetworkReflections.clazz$ClientboundContainerSetSlotPacket);
registerNMSPacketConsumer(PacketConsumers.SET_CONTAINER_SLOT, NetworkReflections.clazz$ClientboundContainerSetSlotPacket);
registerNMSPacketConsumer(PacketConsumers.CLIENT_INFO, NetworkReflections.clazz$ServerboundClientInformationPacket);
registerS2CByteBufPacketConsumer(PacketConsumers.LEVEL_CHUNK_WITH_LIGHT, this.packetIds.clientboundLevelChunkWithLightPacket());
registerS2CByteBufPacketConsumer(PacketConsumers.SECTION_BLOCK_UPDATE, this.packetIds.clientboundSectionBlocksUpdatePacket());
@@ -690,7 +691,7 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes
ByteBuf temp = ctx.alloc().buffer();
try {
if (compressor != null) {
callEncode(compressor, ctx, input, temp);
callEncode(compressor, ctx, input, temp);
}
} finally {
input.clear().writeBytes(temp);

18
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
View File

@@ -36,7 +36,6 @@ import net.momirealms.craftengine.bukkit.util.*;
import net.momirealms.craftengine.core.block.ImmutableBlockState;
import net.momirealms.craftengine.core.entity.player.InteractionHand;
import net.momirealms.craftengine.core.entity.seat.SeatEntity;
import net.momirealms.craftengine.core.entity.seat.SeatEntity;
import net.momirealms.craftengine.core.font.FontManager;
import net.momirealms.craftengine.core.font.IllegalCharacterProcessResult;
import net.momirealms.craftengine.core.item.CustomItem;
@@ -524,7 +523,8 @@ public class PacketConsumers {
return;
}
EnumSet<? extends Enum<?>> enums = FastNMS.INSTANCE.field$ClientboundPlayerInfoUpdatePacket$actions(packet);
outer: {
outer:
{
for (Object entry : enums) {
if (entry == NetworkReflections.instance$ClientboundPlayerInfoUpdatePacket$Action$UPDATE_DISPLAY_NAME) {
break outer;
@@ -1130,7 +1130,8 @@ public class PacketConsumers {
} catch (Exception e) {
CraftEngine.instance().logger().warn("Failed to handle ServerboundPlayerActionPacket", e);
}
}, () -> {});
}, () -> {
});
} else {
handlePlayerActionPacketOnMainThread(player, world, pos, packet);
}
@@ -1303,7 +1304,8 @@ public class PacketConsumers {
} catch (Throwable e) {
CraftEngine.instance().logger().warn("Failed to handle ServerboundSetCreativeModeSlotPacket", e);
}
}, () -> {});
}, () -> {
});
} else {
handleSetCreativeSlotPacketOnMainThread(player, packet);
}
@@ -1441,7 +1443,8 @@ public class PacketConsumers {
} catch (Throwable e) {
CraftEngine.instance().logger().warn("Failed to handle ServerboundPickItemFromEntityPacket", e);
}
}, () -> {});
}, () -> {
});
} else {
BukkitCraftEngine.instance().scheduler().sync().run(() -> {
try {
@@ -1688,7 +1691,8 @@ public class PacketConsumers {
}
if (VersionHelper.isFolia()) {
platformPlayer.getScheduler().run(BukkitCraftEngine.instance().javaPlugin(), t -> mainThreadTask.run(), () -> {});
platformPlayer.getScheduler().run(BukkitCraftEngine.instance().javaPlugin(), t -> mainThreadTask.run(), () -> {
});
} else {
BukkitCraftEngine.instance().scheduler().executeSync(mainThreadTask);
}
@@ -1930,7 +1934,7 @@ public class PacketConsumers {
@SuppressWarnings("unchecked")
public static final BiConsumer<NetWorkUser, ByteBufPacketEvent> SET_ENTITY_DATA = (user, event) -> {
try {
SeatEntity seat = ((BukkitServerPlayer)user).seat();
SeatEntity seat = ((BukkitServerPlayer) user).seat();
if (seat != null) {
seat.handleSetEntityData(user, event);
}