Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

refactoring

Browse source
This commit is contained in:
Pyrbu 2023-04-27 00:59:39 +01:00
parent 0c345935e6
commit 4c160a44c4
19 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/src/main/java/lol/pyr/znpcsplus/api/ZApi.java
View file

@ -1,6 +1,7 @@
package lol.pyr.znpcsplus.api; package lol.pyr.znpcsplus.api;
import lol.pyr.znpcsplus.api.npc.NPC; import lol.pyr.znpcsplus.api.npc.NPC;
import lol.pyr.znpcsplus.api.npc.NPCRegistry;
import lol.pyr.znpcsplus.api.npc.NPCType; import lol.pyr.znpcsplus.api.npc.NPCType;
import lol.pyr.znpcsplus.util.ZLocation; import lol.pyr.znpcsplus.util.ZLocation;
import org.bukkit.World; import org.bukkit.World;

2
api/src/main/java/lol/pyr/znpcsplus/api/npc/EntityProperty.java → api/src/main/java/lol/pyr/znpcsplus/api/entity/EntityProperty.java
View file

@ -1,4 +1,4 @@
package lol.pyr.znpcsplus.api.npc; package lol.pyr.znpcsplus.api.entity;
import lol.pyr.znpcsplus.api.skin.SkinDescriptor; import lol.pyr.znpcsplus.api.skin.SkinDescriptor;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;

4
api/src/main/java/lol/pyr/znpcsplus/api/PropertyHolder.java → api/src/main/java/lol/pyr/znpcsplus/api/entity/PropertyHolder.java
View file

@ -1,6 +1,4 @@
package lol.pyr.znpcsplus.api; package lol.pyr.znpcsplus.api.entity;
import lol.pyr.znpcsplus.api.npc.EntityProperty;
public interface PropertyHolder { public interface PropertyHolder {
<T> T getProperty(EntityProperty<T> key); <T> T getProperty(EntityProperty<T> key);

2
api/src/main/java/lol/pyr/znpcsplus/api/Hologram.java → api/src/main/java/lol/pyr/znpcsplus/api/hologram/Hologram.java
View file

@ -1,4 +1,4 @@
package lol.pyr.znpcsplus.api; package lol.pyr.znpcsplus.api.hologram;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;

4
api/src/main/java/lol/pyr/znpcsplus/api/npc/NPC.java
View file

@ -1,7 +1,7 @@
package lol.pyr.znpcsplus.api.npc; package lol.pyr.znpcsplus.api.npc;
import lol.pyr.znpcsplus.api.Hologram; import lol.pyr.znpcsplus.api.hologram.Hologram;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
public interface NPC extends PropertyHolder { public interface NPC extends PropertyHolder {
Hologram getHologram(); Hologram getHologram();

4
api/src/main/java/lol/pyr/znpcsplus/api/NPCRegistry.java → api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCRegistry.java
View file

@ -1,6 +1,4 @@
package lol.pyr.znpcsplus.api; package lol.pyr.znpcsplus.api.npc;
import lol.pyr.znpcsplus.api.npc.NPC;
import java.util.Collection; import java.util.Collection;

1
api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCType.java
View file

@ -4,6 +4,7 @@ import com.github.retrooper.packetevents.PacketEvents;
import com.github.retrooper.packetevents.manager.server.ServerVersion; import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.protocol.entity.type.EntityType; import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
import lol.pyr.znpcsplus.api.entity.EntityProperty;
import java.util.*; import java.util.*;

2
plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsApi.java
View file

@ -1,7 +1,7 @@
package lol.pyr.znpcsplus; package lol.pyr.znpcsplus;
import lol.pyr.znpcsplus.api.ZApi; import lol.pyr.znpcsplus.api.ZApi;
import lol.pyr.znpcsplus.api.NPCRegistry; import lol.pyr.znpcsplus.api.npc.NPCRegistry;
import lol.pyr.znpcsplus.api.npc.NPC; import lol.pyr.znpcsplus.api.npc.NPC;
import lol.pyr.znpcsplus.api.npc.NPCType; import lol.pyr.znpcsplus.api.npc.NPCType;
import lol.pyr.znpcsplus.util.ZLocation; import lol.pyr.znpcsplus.util.ZLocation;

2
plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java
View file

@ -8,7 +8,7 @@ import io.github.znetworkw.znpcservers.listeners.InventoryListener;
import io.github.znetworkw.znpcservers.utility.BungeeUtils; import io.github.znetworkw.znpcservers.utility.BungeeUtils;
import io.github.znetworkw.znpcservers.utility.SchedulerUtils; import io.github.znetworkw.znpcservers.utility.SchedulerUtils;
import lol.pyr.znpcsplus.api.ZApiProvider; import lol.pyr.znpcsplus.api.ZApiProvider;
import lol.pyr.znpcsplus.api.npc.EntityProperty; import lol.pyr.znpcsplus.api.entity.EntityProperty;
import lol.pyr.znpcsplus.api.npc.NPCType; import lol.pyr.znpcsplus.api.npc.NPCType;
import lol.pyr.znpcsplus.config.Configs; import lol.pyr.znpcsplus.config.Configs;
import lol.pyr.znpcsplus.interaction.InteractionPacketListener; import lol.pyr.znpcsplus.interaction.InteractionPacketListener;

2
plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
View file

@ -4,7 +4,7 @@ import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
import io.github.znetworkw.znpcservers.reflection.Reflections; import io.github.znetworkw.znpcservers.reflection.Reflections;
import io.github.znetworkw.znpcservers.utility.Utils; import io.github.znetworkw.znpcservers.utility.Utils;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
import lol.pyr.znpcsplus.packets.PacketFactory; import lol.pyr.znpcsplus.packets.PacketFactory;
import lol.pyr.znpcsplus.util.ZLocation; import lol.pyr.znpcsplus.util.ZLocation;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
plugin/src/main/java/lol/pyr/znpcsplus/hologram/Hologram.java
View file

@ -10,7 +10,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
public class Hologram extends Viewable implements lol.pyr.znpcsplus.api.Hologram { public class Hologram extends Viewable implements lol.pyr.znpcsplus.api.hologram.Hologram {
private ZLocation location; private ZLocation location;
private final List<HologramLine> lines = new ArrayList<>(); private final List<HologramLine> lines = new ArrayList<>();

10
plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramLine.java
View file

@ -1,8 +1,8 @@
package lol.pyr.znpcsplus.hologram; package lol.pyr.znpcsplus.hologram;
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
import lol.pyr.znpcsplus.api.npc.EntityProperty; import lol.pyr.znpcsplus.api.entity.EntityProperty;
import lol.pyr.znpcsplus.entity.PacketEntity; import lol.pyr.znpcsplus.entity.PacketEntity;
import lol.pyr.znpcsplus.util.ZLocation; import lol.pyr.znpcsplus.util.ZLocation;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@ -42,13 +42,13 @@ public class HologramLine implements PropertyHolder {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public <T> T getProperty(EntityProperty<T> key) { public <T> T getProperty(EntityProperty<T> key) {
if (key == lol.pyr.znpcsplus.api.npc.EntityProperty.INVISIBLE) return (T) Boolean.TRUE; if (key == EntityProperty.INVISIBLE) return (T) Boolean.TRUE;
if (key == lol.pyr.znpcsplus.api.npc.EntityProperty.NAME) return (T) text; if (key == EntityProperty.NAME) return (T) text;
return key.getDefaultValue(); return key.getDefaultValue();
} }
@Override @Override
public boolean hasProperty(EntityProperty<?> key) { public boolean hasProperty(EntityProperty<?> key) {
return key == lol.pyr.znpcsplus.api.npc.EntityProperty.NAME || key == lol.pyr.znpcsplus.api.npc.EntityProperty.INVISIBLE; return key == EntityProperty.NAME || key == EntityProperty.INVISIBLE;
} }
} }

2
plugin/src/main/java/lol/pyr/znpcsplus/npc/NPC.java
View file

@ -1,6 +1,6 @@
package lol.pyr.znpcsplus.npc; package lol.pyr.znpcsplus.npc;
import lol.pyr.znpcsplus.api.npc.EntityProperty; import lol.pyr.znpcsplus.api.entity.EntityProperty;
import lol.pyr.znpcsplus.api.npc.NPCType; import lol.pyr.znpcsplus.api.npc.NPCType;
import lol.pyr.znpcsplus.entity.PacketEntity; import lol.pyr.znpcsplus.entity.PacketEntity;
import lol.pyr.znpcsplus.hologram.Hologram; import lol.pyr.znpcsplus.hologram.Hologram;

2
plugin/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java
View file

@ -7,7 +7,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class NPCRegistry implements lol.pyr.znpcsplus.api.NPCRegistry { public class NPCRegistry implements lol.pyr.znpcsplus.api.npc.NPCRegistry {
private final static NPCRegistry registry = new NPCRegistry(); private final static NPCRegistry registry = new NPCRegistry();
public static NPCRegistry get() { public static NPCRegistry get() {

2
plugin/src/main/java/lol/pyr/znpcsplus/packets/PacketFactory.java
View file

@ -5,7 +5,7 @@ import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.protocol.entity.data.EntityData; import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
import lol.pyr.znpcsplus.ZNPCsPlus; import lol.pyr.znpcsplus.ZNPCsPlus;
import lol.pyr.znpcsplus.entity.PacketEntity; import lol.pyr.znpcsplus.entity.PacketEntity;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
import lol.pyr.znpcsplus.util.LazyLoader; import lol.pyr.znpcsplus.util.LazyLoader;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_14Factory.java
View file

@ -3,8 +3,8 @@ package lol.pyr.znpcsplus.packets;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnEntity; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnEntity;
import lol.pyr.znpcsplus.entity.PacketEntity; import lol.pyr.znpcsplus.entity.PacketEntity;
import lol.pyr.znpcsplus.util.ZLocation; import lol.pyr.znpcsplus.util.ZLocation;
import lol.pyr.znpcsplus.api.npc.EntityProperty; import lol.pyr.znpcsplus.api.entity.EntityProperty;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Optional; import java.util.Optional;

2
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19Factory.java
View file

@ -6,7 +6,7 @@ import com.github.retrooper.packetevents.protocol.player.UserProfile;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoRemove; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoRemove;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoUpdate; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoUpdate;
import lol.pyr.znpcsplus.entity.PacketEntity; import lol.pyr.znpcsplus.entity.PacketEntity;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8Factory.java
View file

@ -11,8 +11,8 @@ import com.github.retrooper.packetevents.util.Vector3d;
import com.github.retrooper.packetevents.wrapper.PacketWrapper; import com.github.retrooper.packetevents.wrapper.PacketWrapper;
import com.github.retrooper.packetevents.wrapper.play.server.*; import com.github.retrooper.packetevents.wrapper.play.server.*;
import lol.pyr.znpcsplus.ZNPCsPlus; import lol.pyr.znpcsplus.ZNPCsPlus;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
import lol.pyr.znpcsplus.api.npc.EntityProperty; import lol.pyr.znpcsplus.api.entity.EntityProperty;
import lol.pyr.znpcsplus.entity.PacketEntity; import lol.pyr.znpcsplus.entity.PacketEntity;
import lol.pyr.znpcsplus.metadata.MetadataFactory; import lol.pyr.znpcsplus.metadata.MetadataFactory;
import lol.pyr.znpcsplus.skin.BaseSkinDescriptor; import lol.pyr.znpcsplus.skin.BaseSkinDescriptor;

4
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9Factory.java
View file

@ -4,8 +4,8 @@ import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
import lol.pyr.znpcsplus.entity.PacketEntity; import lol.pyr.znpcsplus.entity.PacketEntity;
import lol.pyr.znpcsplus.metadata.MetadataFactory; import lol.pyr.znpcsplus.metadata.MetadataFactory;
import lol.pyr.znpcsplus.api.npc.EntityProperty; import lol.pyr.znpcsplus.api.entity.EntityProperty;
import lol.pyr.znpcsplus.api.PropertyHolder; import lol.pyr.znpcsplus.api.entity.PropertyHolder;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;