Merge pull request #7 from sweetrpg/1.18

Release
sweetrpg · Nov 23, 2024 · ba1c228 · ba1c228
2 parents 733f93f + 6fe4aa3
commit ba1c228
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 536 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,7 +39,8 @@ jobs:
           CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
           MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }}
         with:
-          arguments: curseforge modrinth --console=verbose
+          arguments: curseforge --console=verbose
+#          arguments: curseforge modrinth --console=verbose
       - name: Commit hash file and reset changelog
         run: |
           git config --global user.email "[email protected]"

diff --git a/.release-info/1.18/VERSION b/.release-info/1.18/VERSION
@@ -1 +1 @@
-0.0.24
+0.0.25
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/AddToQueuePacket.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/AddToQueuePacket.java
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/QueueCommandPacket.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/QueueCommandPacket.java
@@ -5,7 +5,6 @@
 import com.sweetrpg.crafttracker.common.network.IPacket;
 import com.sweetrpg.crafttracker.common.network.packet.data.QueueCommandData;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.network.NetworkEvent.Context;
 
@@ -31,11 +30,7 @@ public final void handle(QueueCommandData data, Supplier<Context> ctx) {
         ctx.get().enqueueWork(() -> {
             LogicalSide side = ctx.get().getDirection().getReceptionSide();
             if(side.isClient()) {
-
-            }
-            else if(side.isServer()) {
-//                var player = ctx.get().getSender();
-//                CraftingQueueManager.get(player, player.level).addProduct(player.level, data.itemId, data.quantity);
+                CraftingQueueManager.INSTANCE.computeAll();
             }
         });
 

diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/ToggleCraftListPacket.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/ToggleCraftListPacket.java
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/ToggleShoppingListPacket.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/ToggleShoppingListPacket.java
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/UpdateCraftQueuePacket.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/UpdateCraftQueuePacket.java
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/UpdateShoppingListPacket.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/UpdateShoppingListPacket.java
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/data/AddToQueueData.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/data/AddToQueueData.java
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/data/ToggleCraftListData.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/data/ToggleCraftListData.java
diff --git a/...ain/java/com/sweetrpg/crafttracker/common/network/packet/data/ToggleShoppingListData.java b/...ain/java/com/sweetrpg/crafttracker/common/network/packet/data/ToggleShoppingListData.java
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/network/packet/data/UpdateCraftQueueData.java b/src/main/java/com/sweetrpg/crafttracker/common/network/packet/data/UpdateCraftQueueData.java
diff --git a/...ain/java/com/sweetrpg/crafttracker/common/network/packet/data/UpdateShoppingListData.java b/...ain/java/com/sweetrpg/crafttracker/common/network/packet/data/UpdateShoppingListData.java