Merge pull request #74 from NovaUniverse/scoreboard-changes

Update to support new scoreboard
NovaUniverse · Sep 25, 2023 · e3bbf5a · e3bbf5a
2 parents 56de3aa + ddae3a2
commit e3bbf5a
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 554 deletions.
diff --git a/..._18_R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_18_R1/PlayerBoardV1_18_R1.java b/..._18_R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_18_R1/PlayerBoardV1_18_R1.java
diff --git a/...va/net/zeeraa/novacore/spigot/version/v1_18_R1/VersionIndependentUtilsImplementation.java b/...va/net/zeeraa/novacore/spigot/version/v1_18_R1/VersionIndependentUtilsImplementation.java
@@ -18,7 +18,6 @@
 import net.novauniverse.novacore1_17plus.shared.DyeColorToMaterialMapper_1_17;
 import net.zeeraa.novacore.commons.utils.ListUtils;
 import net.zeeraa.novacore.spigot.abstraction.ChunkLoader;
-import net.zeeraa.novacore.spigot.abstraction.INetheriteBoard;
 import net.zeeraa.novacore.spigot.abstraction.ItemBuilderRecordList;
 import net.zeeraa.novacore.spigot.abstraction.MaterialNameList;
 import net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader;
@@ -34,8 +33,6 @@
 import net.zeeraa.novacore.spigot.abstraction.enums.VersionIndependentSound;
 import net.zeeraa.novacore.spigot.abstraction.log.AbstractionLogger;
 import net.zeeraa.novacore.spigot.abstraction.manager.CustomSpectatorManager;
-import net.zeeraa.novacore.spigot.abstraction.netheriteboard.BPlayerBoard;
-
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
 import org.bukkit.FluidCollisionMode;
@@ -70,7 +67,6 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.util.RayTraceResult;
 
 import java.lang.reflect.Field;
@@ -1089,9 +1085,4 @@ public float getBlockBlastResistance(Material material) {
 	public GameProfile getGameProfile(Player player) {
 		return ((CraftPlayer) player).getHandle().fp();
 	}
-
-	@Override
-	public BPlayerBoard initPlayerBoard(INetheriteBoard netheriteBoard, Player player, Scoreboard scoreboard, String name) throws Exception {
-		return new PlayerBoardV1_18_R1(netheriteBoard, player, scoreboard, name);
-	}
 }
diff --git a/..._18_R2/src/main/java/net/zeeraa/novacore/spigot/version/v1_18_R2/PlayerBoardV1_18_R2.java b/..._18_R2/src/main/java/net/zeeraa/novacore/spigot/version/v1_18_R2/PlayerBoardV1_18_R2.java
diff --git a/...va/net/zeeraa/novacore/spigot/version/v1_18_R2/VersionIndependentUtilsImplementation.java b/...va/net/zeeraa/novacore/spigot/version/v1_18_R2/VersionIndependentUtilsImplementation.java
@@ -17,7 +17,6 @@
 import net.novauniverse.novacore1_17plus.shared.DyeColorToMaterialMapper_1_17;
 import net.zeeraa.novacore.commons.utils.ListUtils;
 import net.zeeraa.novacore.spigot.abstraction.ChunkLoader;
-import net.zeeraa.novacore.spigot.abstraction.INetheriteBoard;
 import net.zeeraa.novacore.spigot.abstraction.ItemBuilderRecordList;
 import net.zeeraa.novacore.spigot.abstraction.MaterialNameList;
 import net.zeeraa.novacore.spigot.abstraction.VersionIndependentItems;
@@ -40,7 +39,6 @@
 import net.zeeraa.novacore.spigot.abstraction.commons.EntityBoundingBox;
 import net.zeeraa.novacore.spigot.abstraction.log.AbstractionLogger;
 import net.zeeraa.novacore.spigot.abstraction.manager.CustomSpectatorManager;
-import net.zeeraa.novacore.spigot.abstraction.netheriteboard.BPlayerBoard;
 
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
@@ -71,7 +69,6 @@
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.util.RayTraceResult;
 
 import java.text.DecimalFormat;
@@ -1073,9 +1070,4 @@ public float getBlockBlastResistance(Material material) {
 	public GameProfile getGameProfile(Player player) {
 		return ((CraftPlayer) player).getHandle().fq();
 	}
-
-	@Override
-	public BPlayerBoard initPlayerBoard(INetheriteBoard netheriteBoard, Player player, Scoreboard scoreboard, String name) throws Exception {
-		return new PlayerBoardV1_18_R2(netheriteBoard, player, scoreboard, name);
-	}
 }
diff --git a/..._19_R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_19_R1/PlayerBoardV1_19_R1.java b/..._19_R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_19_R1/PlayerBoardV1_19_R1.java
diff --git a/...va/net/zeeraa/novacore/spigot/version/v1_19_R1/VersionIndependentUtilsImplementation.java b/...va/net/zeeraa/novacore/spigot/version/v1_19_R1/VersionIndependentUtilsImplementation.java
@@ -18,7 +18,6 @@
 import net.novauniverse.spigot.version.shared.v1_16plus.SharedBannerItemStackCreator;
 import net.zeeraa.novacore.commons.utils.ListUtils;
 import net.zeeraa.novacore.spigot.abstraction.ChunkLoader;
-import net.zeeraa.novacore.spigot.abstraction.INetheriteBoard;
 import net.zeeraa.novacore.spigot.abstraction.ItemBuilderRecordList;
 import net.zeeraa.novacore.spigot.abstraction.MaterialNameList;
 import net.zeeraa.novacore.spigot.abstraction.VersionIndependentItems;
@@ -41,8 +40,6 @@
 import net.zeeraa.novacore.spigot.abstraction.commons.EntityBoundingBox;
 import net.zeeraa.novacore.spigot.abstraction.log.AbstractionLogger;
 import net.zeeraa.novacore.spigot.abstraction.manager.CustomSpectatorManager;
-import net.zeeraa.novacore.spigot.abstraction.netheriteboard.BPlayerBoard;
-
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.block.Block;
@@ -72,7 +69,6 @@
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.util.RayTraceResult;
 
 import java.text.DecimalFormat;
@@ -1075,9 +1071,4 @@ public float getBlockBlastResistance(Material material) {
 	public GameProfile getGameProfile(Player player) {
 		return ((CraftPlayer) player).getHandle().fz();
 	}
-
-	@Override
-	public BPlayerBoard initPlayerBoard(INetheriteBoard netheriteBoard, Player player, Scoreboard scoreboard, String name) throws Exception {
-		return new PlayerBoardV1_19_R1(netheriteBoard, player, scoreboard, name);
-	}
 }