-
Notifications
You must be signed in to change notification settings - Fork 18
Various Utils #862
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.
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
Merged
Merged
Various Utils #862
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
ab43912
add better CustomModelDataBuilder
JustAHuman-xD 1700a11
add loot table api
JustAHuman-xD d733949
custom model data stuff
JustAHuman-xD 1e040c4
RebarItem#isRebarItemAndIsNot, RebarBlock#editBlockData
JustAHuman-xD 61bfcfb
remove .Companion
JustAHuman-xD acdf015
more utils
JustAHuman-xD 4a008ce
need to notify windows
JustAHuman-xD 12d4fc6
structure grow handler
JustAHuman-xD dfd2b5c
isBroken util method
JustAHuman-xD f1a6008
Merge branch 'master' into human/pylon-polish-pass
JustAHuman-xD 9d697f2
pr comments
JustAHuman-xD 5a15102
o
JustAHuman-xD 876bf9e
oops
JustAHuman-xD File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...rc/main/kotlin/io/github/pylonmc/rebar/block/interfaces/StructureGrowRebarBlockHandler.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package io.github.pylonmc.rebar.block.interfaces | ||
|
|
||
| import io.github.pylonmc.rebar.block.BlockListener | ||
| import io.github.pylonmc.rebar.block.BlockListener.logEventHandleErr | ||
| import io.github.pylonmc.rebar.block.BlockStorage | ||
| import io.github.pylonmc.rebar.event.api.MultiListener | ||
| import io.github.pylonmc.rebar.event.api.annotation.MultiHandlers | ||
| import io.github.pylonmc.rebar.event.api.annotation.UniversalHandler | ||
| import org.bukkit.event.EventPriority | ||
| import org.bukkit.event.world.StructureGrowEvent | ||
| import org.jetbrains.annotations.ApiStatus | ||
|
|
||
| interface StructureGrowRebarBlockHandler { | ||
| fun onStructureGrow(event: StructureGrowEvent, priority: EventPriority) {} | ||
|
|
||
| @ApiStatus.Internal | ||
| companion object : MultiListener { | ||
| @UniversalHandler | ||
| private fun onStructureGrow(event: StructureGrowEvent, priority: EventPriority) { | ||
| val rebarBlock = BlockStorage.get(event.location) | ||
| if (rebarBlock is StructureGrowRebarBlockHandler) { | ||
| try { | ||
| MultiHandlers.handleEvent(rebarBlock, "onStructureGrow", event, priority) | ||
| } catch (e: Exception) { | ||
| BlockListener.logEventHandleErr(event, e, rebarBlock) | ||
| } | ||
| } else if (priority == EventPriority.LOWEST) { | ||
| event.isCancelled = true | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
rebar/src/main/kotlin/io/github/pylonmc/rebar/item/builder/CustomModelDataBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package io.github.pylonmc.rebar.item.builder | ||
|
|
||
| import io.papermc.paper.datacomponent.DataComponentTypes | ||
| import io.papermc.paper.datacomponent.item.CustomModelData | ||
| import org.bukkit.Color | ||
| import org.bukkit.inventory.ItemStack | ||
|
|
||
| @Suppress("UnstableApiUsage") | ||
| class CustomModelDataBuilder { | ||
|
JustAHuman-xD marked this conversation as resolved.
|
||
| val strings = mutableListOf<String>() | ||
| val floats = mutableListOf<Float>() | ||
| val flags = mutableListOf<Boolean>() | ||
| val colors = mutableListOf<Color>() | ||
|
|
||
| fun addString(string: String) = apply { | ||
| this.strings.add(string) | ||
| } | ||
|
|
||
| fun addStrings(strings: List<String>) = apply { | ||
| this.strings.addAll(strings) | ||
| } | ||
|
|
||
| fun addStrings(vararg strings: String) = apply { | ||
| strings.forEach { addString(it) } | ||
| } | ||
|
|
||
| fun addFloat(float: Float) = apply { | ||
| this.floats.add(float) | ||
| } | ||
|
|
||
| fun addFloats(floats: List<Float>) = apply { | ||
| this.floats.addAll(floats) | ||
| } | ||
|
|
||
| fun addFloats(vararg floats: Float) = apply { | ||
| floats.forEach { addFloat(it) } | ||
| } | ||
|
|
||
| fun addFlag(flag: Boolean) = apply { | ||
| this.flags.add(flag) | ||
| } | ||
|
|
||
| fun addFlags(flags: List<Boolean>) = apply { | ||
| this.flags.addAll(flags) | ||
| } | ||
|
|
||
| fun addFlags(vararg flags: Boolean) = apply { | ||
| flags.forEach { addFlag(it) } | ||
| } | ||
|
|
||
| fun addColor(color: Color) = apply { | ||
| this.colors.add(color) | ||
| } | ||
|
|
||
| fun addColors(colors: List<Color>) = apply { | ||
| this.colors.addAll(colors) | ||
| } | ||
|
|
||
| fun addColors(vararg colors: Color) = apply { | ||
| colors.forEach { addColor(it) } | ||
| } | ||
|
|
||
| fun build(): CustomModelData = CustomModelData.customModelData() | ||
| .addStrings(this.strings) | ||
| .addFloats(this.floats) | ||
| .addFlags(this.flags) | ||
| .addColors(this.colors) | ||
| .build() | ||
|
|
||
| companion object { | ||
| fun of(customModelData: CustomModelData?): CustomModelDataBuilder { | ||
| val builder = CustomModelDataBuilder() | ||
| if (customModelData != null) { | ||
| builder.addStrings(customModelData.strings()) | ||
| builder.addFloats(customModelData.floats()) | ||
| builder.addFlags(customModelData.flags()) | ||
| builder.addColors(customModelData.colors()) | ||
| } | ||
| return builder | ||
| } | ||
|
|
||
| fun of(itemStack: ItemStack) = of(itemStack.getData(DataComponentTypes.CUSTOM_MODEL_DATA)) | ||
|
|
||
| fun of(builder: ItemStackBuilder) = of(builder.stack) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.