diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 33d12cf..8804622 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,6 +6,11 @@ + + + + + - { - "keyToString": { - "Gradle.EntityLib:test-plugin [runServer].executor": "Debug", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "git-widget-placeholder": "master", - "ignore.virus.scanning.warn.message": "true", - "jdk.selected.JAVA_MODULE": "corretto-17", - "kotlin-language-version-configured": "true", - "last_opened_file_path": "D:/Github/EntityLib", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "project.structure.last.edited": "Modules", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.0", - "settings.editor.selected.configurable": "preferences.pluginManager", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -208,6 +214,8 @@ + + diff --git a/src/main/java/me/tofaa/entitylib/entity/WrapperEntity.java b/src/main/java/me/tofaa/entitylib/entity/WrapperEntity.java index 6cb6b62..638a6a7 100644 --- a/src/main/java/me/tofaa/entitylib/entity/WrapperEntity.java +++ b/src/main/java/me/tofaa/entitylib/entity/WrapperEntity.java @@ -42,13 +42,11 @@ public class WrapperEntity implements Tickable { if (spawned) return false; this.location = location; this.spawned = true; - int data = 0; Optional velocity; double veloX = 0, veloY = 0, veloZ = 0; if (meta instanceof ObjectData) { ObjectData od = (ObjectData) meta; - data = od.getObjectData(); if (od.requiresVelocityPacketAtSpawn()) { final WrapperPlayServerEntityVelocity veloPacket = getVelocityPacket(); diff --git a/src/main/java/me/tofaa/entitylib/meta/types/DisplayMeta.java b/src/main/java/me/tofaa/entitylib/meta/types/DisplayMeta.java index c215a0a..957bbb2 100644 --- a/src/main/java/me/tofaa/entitylib/meta/types/DisplayMeta.java +++ b/src/main/java/me/tofaa/entitylib/meta/types/DisplayMeta.java @@ -10,7 +10,7 @@ import me.tofaa.entitylib.meta.Metadata; public class DisplayMeta extends EntityMeta { public static final byte OFFSET = EntityMeta.MAX_OFFSET; - public static final byte MAX_OFFSET = OFFSET + 14; + public static final byte MAX_OFFSET = OFFSET + 15; public DisplayMeta(int entityId, Metadata metadata) { super(entityId, metadata); diff --git a/test-plugin/build.gradle b/test-plugin/build.gradle index f8a7b47..4e03610 100644 --- a/test-plugin/build.gradle +++ b/test-plugin/build.gradle @@ -32,6 +32,6 @@ dependencies { tasks { runServer { - minecraftVersion("1.19.4") + minecraftVersion("1.20.4") } } \ No newline at end of file diff --git a/test-plugin/src/main/java/me/tofaa/entitylib/SpawnClickableFrogCommand.java b/test-plugin/src/main/java/me/tofaa/entitylib/SpawnClickableFrogCommand.java index e170b3a..54c72ff 100644 --- a/test-plugin/src/main/java/me/tofaa/entitylib/SpawnClickableFrogCommand.java +++ b/test-plugin/src/main/java/me/tofaa/entitylib/SpawnClickableFrogCommand.java @@ -26,7 +26,7 @@ public class SpawnClickableFrogCommand implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) { Player player = (Player) commandSender; - WrapperEntity e = EntityLib.createEntity(UUID.randomUUID(), EntityTypes.FROG); + WrapperEntity e = EntityLib.createEntity(UUID.randomUUID(), EntityTypes.TEXT_DISPLAY); FrogMeta meta = (FrogMeta) e.getMeta(); meta.setHasGlowingEffect(true); meta.setCustomNameVisible(true); diff --git a/test-plugin/src/main/java/me/tofaa/entitylib/TestDisplayCommand.java b/test-plugin/src/main/java/me/tofaa/entitylib/TestDisplayCommand.java index 6e11437..5363f85 100644 --- a/test-plugin/src/main/java/me/tofaa/entitylib/TestDisplayCommand.java +++ b/test-plugin/src/main/java/me/tofaa/entitylib/TestDisplayCommand.java @@ -1,12 +1,12 @@ package me.tofaa.entitylib; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; +import com.github.retrooper.packetevents.util.Vector3f; import io.github.retrooper.packetevents.util.SpigotConversionUtil; import me.tofaa.entitylib.entity.WrapperEntity; import me.tofaa.entitylib.meta.display.TextDisplayMeta; import me.tofaa.entitylib.meta.types.DisplayMeta; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -22,10 +22,13 @@ public class TestDisplayCommand implements CommandExecutor { Player player = (Player) commandSender; WrapperEntity e = EntityLib.createEntity(UUID.randomUUID(), EntityTypes.TEXT_DISPLAY); TextDisplayMeta meta = (TextDisplayMeta) e.getMeta(); - meta.setText(Component.text("Hello World!", NamedTextColor.GOLD)); + meta.setHasGlowingEffect(true); + meta.setText(Component.text("Hello World!")); meta.setBillboardConstraints(DisplayMeta.BillboardConstraints.CENTER); - e.addViewer((player.getUniqueId())); - e.spawn(SpigotConversionUtil.fromBukkitLocation((player.getLocation().clone().add(0, 2, 0)))); - return true; + meta.setScale(new Vector3f(2, 2, 2)); + meta.setTranslation(new Vector3f(10, 0, 0)); + e.addViewer(player.getUniqueId()); + e.spawn(SpigotConversionUtil.fromBukkitLocation(player.getLocation())); + return false; } }