Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-87 Finish sending logic #91

Merged
merged 84 commits into from
Sep 21, 2024
Merged

GH-87 Finish sending logic #91

merged 84 commits into from
Sep 21, 2024

Conversation

Jakubk15
Copy link
Member

@Jakubk15 Jakubk15 commented Nov 26, 2023 •
edited
Loading

Resolves #87

Jakubk15 and others added 8 commits November 3, 2023 19:31
@Jakubk15
Add ItemStorage logic
de158d5
@Rollczi
Change default database type to SQLITE
cef9cc9
@CitralFlo @Jakubk15
GH-89 Update lite commands version and all commands
e7a11f9 
* Update lite commands version and all commands. Fix issues

* Update src/main/java/com/eternalcode/parcellockers/parcel/command/ParcelCommand.java

---------

Co-authored-by: Jakubk15 <[email protected]>
@Rollczi
Merge branch 'master' into finish-sending-logic
13cf46a 
# Conflicts:
#	build.gradle.kts
@Rollczi
Update item handling in Parcel GUI and make other code improvements. …
5f8d260 
…Add Optional GSON serializer.
@Rollczi
Update item handling in Parcel GUI and make other code improvements. …
d036183 
…Add Optional GSON serializer.
@Rollczi
Bump litecommands
dd40bf0
@Rollczi
Bump litecommands
6eb6561
@Jakubk15 Jakubk15 changed the title Finish sending logic GH-87 Finish sending logic Nov 26, 2023
@Jakubk15
Copy link
Member Author

Jakubk15 commented Dec 5, 2023

GsonItemSerializer requires work to properly serialize data in database

@Jakubk15
Copy link
Member Author

Jakubk15 commented Dec 5, 2023 •
edited
Loading 

[20:04:44 ERROR]: Could not pass event InventoryCloseEvent to ParcelLockers v1.0.0-SNAPSHOT
java.lang.ExceptionInInitializerError: null
	at com.eternalcode.parcellockers.parcel.gui.ParcelItemStorageGUI.lambda$show$4(ParcelItemStorageGUI.java:86) ~[ParcelLockers v1.0.0-SNAPSHOT (MC 1.8.8-1.20.x).jar:?]
	at dev.triumphteam.gui.guis.GuiListener.onGuiClose(GuiListener.java:138) ~[ParcelLockers v1.0.0-SNAPSHOT (MC 1.8.8-1.20.x).jar:?]
	at com.destroystokyo.paper.event.executor.asm.generated.GeneratedEventExecutor61.execute(Unknown Source) ~[?:?]
	at org.bukkit.plugin.EventExecutor$2.execute(EventExecutor.java:77) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:?]
	at co.aikar.timings.TimedEventExecutor.execute(TimedEventExecutor.java:81) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:git-Paper-318]
	at org.bukkit.plugin.RegisteredListener.callEvent(RegisteredListener.java:70) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:?]
	at io.papermc.paper.plugin.manager.PaperEventManager.callEvent(PaperEventManager.java:54) ~[paper-1.20.2.jar:git-Paper-318]
	at io.papermc.paper.plugin.manager.PaperPluginManagerImpl.callEvent(PaperPluginManagerImpl.java:126) ~[paper-1.20.2.jar:git-Paper-318]
	at org.bukkit.plugin.SimplePluginManager.callEvent(SimplePluginManager.java:615) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:?]
	at org.bukkit.craftbukkit.v1_20_R2.event.CraftEventFactory.handleInventoryCloseEvent(CraftEventFactory.java:1680) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.server.network.ServerGamePacketListenerImpl.handleContainerClose(ServerGamePacketListenerImpl.java:2866) ~[?:?]
	at org.bukkit.craftbukkit.v1_20_R2.event.CraftEventFactory.callInventoryOpenEventWithTitle(CraftEventFactory.java:1472) ~[paper-1.20.2.jar:git-Paper-318]
	at org.bukkit.craftbukkit.v1_20_R2.event.CraftEventFactory.callInventoryOpenEventWithTitle(CraftEventFactory.java:1460) ~[paper-1.20.2.jar:git-Paper-318]
	at org.bukkit.craftbukkit.v1_20_R2.entity.CraftHumanEntity.openCustomInventory(CraftHumanEntity.java:361) ~[paper-1.20.2.jar:git-Paper-318]
	at org.bukkit.craftbukkit.v1_20_R2.entity.CraftHumanEntity.openInventory(CraftHumanEntity.java:345) ~[paper-1.20.2.jar:git-Paper-318]
	at dev.triumphteam.gui.guis.BaseGui.open(BaseGui.java:422) ~[ParcelLockers v1.0.0-SNAPSHOT (MC 1.8.8-1.20.x).jar:?]
	at com.eternalcode.parcellockers.parcel.gui.ParcelSendingGUI.show(ParcelSendingGUI.java:83) ~[ParcelLockers v1.0.0-SNAPSHOT (MC 1.8.8-1.20.x).jar:?]
	at com.eternalcode.parcellockers.parcel.gui.ParcelItemStorageGUI.lambda$show$1(ParcelItemStorageGUI.java:45) ~[ParcelLockers v1.0.0-SNAPSHOT (MC 1.8.8-1.20.x).jar:?]
	at dev.triumphteam.gui.guis.GuiListener.onGuiClick(GuiListener.java:102) ~[ParcelLockers v1.0.0-SNAPSHOT (MC 1.8.8-1.20.x).jar:?]
	at com.destroystokyo.paper.event.executor.asm.generated.GeneratedEventExecutor63.execute(Unknown Source) ~[?:?]
	at org.bukkit.plugin.EventExecutor$2.execute(EventExecutor.java:77) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:?]
	at co.aikar.timings.TimedEventExecutor.execute(TimedEventExecutor.java:81) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:git-Paper-318]
	at org.bukkit.plugin.RegisteredListener.callEvent(RegisteredListener.java:70) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:?]
	at io.papermc.paper.plugin.manager.PaperEventManager.callEvent(PaperEventManager.java:54) ~[paper-1.20.2.jar:git-Paper-318]
	at io.papermc.paper.plugin.manager.PaperPluginManagerImpl.callEvent(PaperPluginManagerImpl.java:126) ~[paper-1.20.2.jar:git-Paper-318]
	at org.bukkit.plugin.SimplePluginManager.callEvent(SimplePluginManager.java:615) ~[paper-api-1.20.2-R0.1-SNAPSHOT.jar:?]
	at net.minecraft.server.network.ServerGamePacketListenerImpl.handleContainerClick(ServerGamePacketListenerImpl.java:3108) ~[?:?]
	at net.minecraft.network.protocol.game.ServerboundContainerClickPacket.handle(ServerboundContainerClickPacket.java:58) ~[?:?]
	at net.minecraft.network.protocol.game.ServerboundContainerClickPacket.handle(ServerboundContainerClickPacket.java:23) ~[?:?]
	at net.minecraft.network.protocol.PacketUtils.lambda$ensureRunningOnSameThread$0(PacketUtils.java:53) ~[?:?]
	at net.minecraft.server.TickTask.run(TickTask.java:18) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.util.thread.BlockableEventLoop.doRunTask(BlockableEventLoop.java:153) ~[?:?]
	at net.minecraft.util.thread.ReentrantBlockableEventLoop.doRunTask(ReentrantBlockableEventLoop.java:24) ~[?:?]
	at net.minecraft.server.MinecraftServer.doRunTask(MinecraftServer.java:1324) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.server.MinecraftServer.d(MinecraftServer.java:193) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.util.thread.BlockableEventLoop.pollTask(BlockableEventLoop.java:126) ~[?:?]
	at net.minecraft.server.MinecraftServer.pollTaskInternal(MinecraftServer.java:1301) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.server.MinecraftServer.pollTask(MinecraftServer.java:1294) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.util.thread.BlockableEventLoop.managedBlock(BlockableEventLoop.java:136) ~[?:?]
	at net.minecraft.server.MinecraftServer.waitUntilNextTick(MinecraftServer.java:1272) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:1160) ~[paper-1.20.2.jar:git-Paper-318]
	at net.minecraft.server.MinecraftServer.lambda$spin$0(MinecraftServer.java:315) ~[paper-1.20.2.jar:git-Paper-318]
	at java.lang.Thread.run(Thread.java:833) ~[?:?]
Caused by: java.lang.IllegalArgumentException
Caused by: java.lang.IllegalArgumentException

	at com.google.gson.internal.$Gson$Preconditions.checkArgument($Gson$Preconditions.java:54) ~[gson-2.10.1.jar:?]
	at com.google.gson.GsonBuilder.registerTypeAdapter(GsonBuilder.java:606) ~[gson-2.10.1.jar:?]
	at com.eternalcode.parcellockers.util.ItemUtil.<clinit>(ItemUtil.java:16) ~[ParcelLockers v1.0.0-SNAPSHOT (MC 1.8.8-1.20.x).jar:?]
	... 43 more

Jakubk15
Jakubk15 commented Aug 31, 2024
View reviewed changes
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
...main/java/com/eternalcode/parcellockers/gui/implementation/locker/ParcelSendingGUIState.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/ReceiverSelectionGui.java Outdated Show resolved Hide resolved
vLuckyyy
vLuckyyy requested changes Sep 1, 2024
View reviewed changes
build.gradle.kts Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/ParcelLockers.java Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/util/legacy/LegacyColorProcessor.java Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/util/legacy/Legacy.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/util/RandomUtil.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/util/ItemUtil.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/util/ItemUtil.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/util/InventoryUtil.java Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/util/DurationUtil.java Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/user/UserRepository.java Outdated Show resolved Hide resolved
vLuckyyy
vLuckyyy requested changes Sep 1, 2024
View reviewed changes
.github/CODEOWNERS Show resolved Hide resolved
README.md Show resolved Hide resolved
assets/ParcelLockers.svg Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/ParcelLockers.java Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/ParcelLockersCommand.java Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/command/handler/PermissionMessage.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/configuration/ConfigurationManager.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/configuration/implementation/ConfigItem.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/conversation/ParcelLockerPlacePrompt.java Show resolved Hide resolved
...in/java/com/eternalcode/parcellockers/gui/implementation/locker/DestinationSelectionGUI.java Show resolved Hide resolved
imDMK
imDMK reviewed Sep 5, 2024
View reviewed changes
src/main/java/com/eternalcode/parcellockers/configuration/implementation/ConfigItem.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/command/handler/InvalidUsageImpl.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/ParcelListGUI.java Outdated Show resolved Hide resolved
src/main/java/com/eternalcode/parcellockers/locker/controller/LockerPlaceController.java
return false;
}

return new HashSet<>(firstMeta.getLore()).containsAll(secondMeta.getLore())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it better to just use the compareTo method at this point?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

equals method is more intuitive and directly checks for equality.
compareTo is generally used for ordering and might be less clear in this context.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. The current way you compare the name and lore of items creates a new hashset each time, which can be inefficient. The compareTo method compares the items directly (with enchants etc) which is a better solution. Let the rest of the members comment on this.

src/main/java/com/eternalcode/parcellockers/parcel/command/argument/ParcelLockerArgument.java Outdated Show resolved Hide resolved
@igoyek igoyek removed their request for review September 5, 2024 21:31
P1otrulla
P1otrulla previously approved these changes Sep 12, 2024
View reviewed changes
Copy link
Member

@P1otrulla P1otrulla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chyba nic nie wpadło mi w oczy, ale przy duży ten PR

src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/ParcelItemStorageGUI.java Outdated Show resolved Hide resolved
@Jakubk15
Use #clone on ConfigItems and add config message to illegal items
963b119
@Jakubk15
Merge remote-tracking branch 'origin/finish-sending-logic' into finis…
7c73da7 
…h-sending-logic

# Conflicts:
#	src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/ParcelSendingGUI.java
@CitralFlo CitralFlo removed their request for review September 16, 2024 16:51
@Jakubk15 Jakubk15 merged commit cd2b601 into master Sep 21, 2024
1 check passed
@Jakubk15 Jakubk15 deleted the finish-sending-logic branch September 21, 2024 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rollczi Rollczi Rollczi requested changes

@imDMK imDMK imDMK left review comments

@vLuckyyy vLuckyyy vLuckyyy requested changes

@igoyek igoyek igoyek approved these changes

@P1otrulla P1otrulla P1otrulla left review comments

@Kamicjusz Kamicjusz Awaiting requested review from Kamicjusz

@VerniQ VerniQ Awaiting requested review from VerniQ

@Kazaruma Kazaruma Awaiting requested review from Kazaruma

Assignees
No one assigned
Labels
🆕 feature New feature or request 🆕 good first issue Good for newcomers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Parcel sending logic
7 participants
@Jakubk15 @Rollczi @vLuckyyy @igoyek @P1otrulla @imDMK @CitralFlo