feat: itemquantifiable, allowing for more precise recipe displays

chore: updated Minestom version hash Took 3 hours 11 minutes
Swofty-Developments · Jul 27, 2024 · 98c149b · 98c149b
1 parent a4d2918
commit 98c149b
Show file tree

Hide file tree

Showing 313 changed files with 1,506 additions and 1,508 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/anticheat/build.gradle.kts b/anticheat/build.gradle.kts
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.Minestom:Minestom:2be6f9c507") {
+    implementation("net.minestom:minestom-snapshots:12794d4263") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
 }

diff --git a/anticheat/src/main/java/net/swofty/anticheat/engine/SwoftyPlayer.java b/anticheat/src/main/java/net/swofty/anticheat/engine/SwoftyPlayer.java
@@ -26,7 +26,7 @@ public class SwoftyPlayer {
 
     private List<PlayerTickInformation> lastTicks = new ArrayList<>();
     private PlayerTickInformation currentTick = new PlayerTickInformation(new Pos(0, 0, 0), new Vel(0, 0, 0), false);
-    private PlayerWorld world = new PlayerWorld();
+    private final PlayerWorld world = new PlayerWorld();
 
     private final LinkedBlockingDeque<PingRequest> pingRequests = new LinkedBlockingDeque<>();
     private long ping;

diff --git a/anticheat/src/main/java/net/swofty/anticheat/loader/minestom/MinestomLoader.java b/anticheat/src/main/java/net/swofty/anticheat/loader/minestom/MinestomLoader.java
@@ -1,10 +1,12 @@
 package net.swofty.anticheat.loader.minestom;
 
+import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.GlobalEventHandler;
 import net.minestom.server.event.player.PlayerPacketEvent;
 import net.minestom.server.event.player.PlayerPacketOutEvent;
+import net.minestom.server.instance.Instance;
 import net.minestom.server.listener.manager.PacketPlayListenerConsumer;
 import net.minestom.server.network.packet.client.ClientPacket;
 import net.minestom.server.network.packet.client.common.ClientPingRequestPacket;
@@ -13,6 +15,9 @@
 import net.minestom.server.network.packet.server.SendablePacket;
 import net.minestom.server.network.packet.server.ServerPacket;
 import net.minestom.server.network.packet.server.common.PingPacket;
+import net.minestom.server.network.packet.server.play.BlockChangePacket;
+import net.minestom.server.network.packet.server.play.ChunkDataPacket;
+import net.minestom.server.network.packet.server.play.data.ChunkData;
 import net.swofty.anticheat.event.SwoftyEventHandler;
 import net.swofty.anticheat.event.events.AnticheatPacketEvent;
 import net.swofty.anticheat.event.packet.*;

diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts
@@ -16,7 +16,7 @@ java {
 
 dependencies {
     implementation(project(":packer"))
-    implementation("com.github.Minestom:Minestom:2be6f9c507") {
+    implementation("net.minestom:minestom-snapshots:12794d4263") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
 }
diff --git a/loader/build.gradle.kts b/loader/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     implementation(project(":spark"))
     implementation(project(":anticheat"))
     implementation("org.slf4j:slf4j-api:2.0.13")
-    implementation("com.github.Minestom:Minestom:2be6f9c507") {
+    implementation("net.minestom:minestom-snapshots:12794d4263") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation("dev.hollowcube:polar:1.10.0")

diff --git a/proxy.api/build.gradle.kts b/proxy.api/build.gradle.kts
@@ -21,7 +21,7 @@ repositories {
 dependencies {
     implementation(project(":commons"))
     implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.2")
-    implementation("com.github.Minestom:Minestom:2be6f9c507") {
+    implementation("net.minestom:minestom-snapshots:12794d4263") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation("net.kyori:adventure-api:4.17.0")

diff --git a/spark/build.gradle.kts b/spark/build.gradle.kts
@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.Minestom:Minestom:2be6f9c507") {
+    implementation("net.minestom:minestom-snapshots:12794d4263") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation(files("dependencies/spark-1.10.1.10-minestom.jar"))

diff --git a/type.generic/build.gradle.kts b/type.generic/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     implementation(project(":commons"))
     implementation(project(":packer"))
     implementation(project(":proxy.api"))
-    implementation("com.github.Minestom:Minestom:2be6f9c507") {
+    implementation("net.minestom:minestom-snapshots:12794d4263") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation("dev.hollowcube:polar:1.10.0")

diff --git a/...neric/src/main/java/net/swofty/types/generic/collection/collections/CombatCollection.java b/...neric/src/main/java/net/swofty/types/generic/collection/collections/CombatCollection.java
@@ -5,7 +5,7 @@
 import net.swofty.types.generic.collection.CollectionCategory;
 import net.swofty.types.generic.collection.CustomCollectionAward;
 import net.swofty.types.generic.item.ItemTypeLinker;
-import net.swofty.types.generic.item.MaterialQuantifiable;
+import net.swofty.types.generic.item.ItemQuantifiable;
 import net.swofty.types.generic.item.SkyBlockItem;
 import net.swofty.types.generic.item.impl.Minion;
 import net.swofty.types.generic.item.impl.SkyBlockRecipe;
@@ -290,9 +290,9 @@ public int xp() {
                         }, new UnlockRecipe() {
                             @Override
                             public SkyBlockRecipe<?> getRecipe() {
-                                Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
-                                ingredientMap.put('A', new MaterialQuantifiable(ItemType.ENCHANTED_EYE_OF_ENDER, 16));
-                                ingredientMap.put('B', new MaterialQuantifiable(ItemType.ENCHANTED_DIAMOND, 1));
+                                Map<Character, ItemQuantifiable> ingredientMap = new HashMap<>();
+                                ingredientMap.put('A', new ItemQuantifiable(ItemType.ENCHANTED_EYE_OF_ENDER, 16));
+                                ingredientMap.put('B', new ItemQuantifiable(ItemType.ENCHANTED_DIAMOND, 1));
                                 List<String> pattern = List.of(
                                         "A",
                                         "A",
@@ -505,9 +505,9 @@ public int xp() {
                         }, new UnlockRecipe() {
                             @Override
                             public SkyBlockRecipe getRecipe() {
-                                Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
-                                ingredientMap.put('A', new MaterialQuantifiable(ItemType.ENCHANTED_GHAST_TEAR, 5));
-                                ingredientMap.put(' ', new MaterialQuantifiable(ItemType.AIR, 1));
+                                Map<Character, ItemQuantifiable> ingredientMap = new HashMap<>();
+                                ingredientMap.put('A', new ItemQuantifiable(ItemType.ENCHANTED_GHAST_TEAR, 5));
+                                ingredientMap.put(' ', new ItemQuantifiable(ItemType.AIR, 1));
                                 List<String> pattern = List.of(
                                         " A ",
                                         "AAA",
@@ -735,9 +735,9 @@ public int xp() {
                         new ItemCollectionReward(5000, new UnlockRecipe() {
                             @Override
                             public SkyBlockRecipe getRecipe() {
-                                Map<Character, MaterialQuantifiable> ingredientMap = new HashMap<>();
-                                ingredientMap.put('A', new MaterialQuantifiable(ItemType.ENCHANTED_ROTTEN_FLESH, 32));
-                                ingredientMap.put(' ', new MaterialQuantifiable(ItemType.AIR, 1));
+                                Map<Character, ItemQuantifiable> ingredientMap = new HashMap<>();
+                                ingredientMap.put('A', new ItemQuantifiable(ItemType.ENCHANTED_ROTTEN_FLESH, 32));
+                                ingredientMap.put(' ', new ItemQuantifiable(ItemType.AIR, 1));
                                 List<String> pattern = List.of(
                                         "AAA",
                                         "A A",