-
Notifications
You must be signed in to change notification settings - Fork 53
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
Additions and fixes #344
Merged
Additions and fixes #344
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
18e05da
Patched GUI bug
WillFP f1815ae
Updated to 6.65.5
WillFP 4d6399d
Added 1.20.2 support
WillFP 80d24b8
Updated to 6.65.6
WillFP de6a3e7
Fixed IntegrationRegistry
WillFP 80cdaf6
Updated FabledSkyblock integration
WillFP 72608c3
Updated to 6.65.7
WillFP 8668d36
Fixed GUI lag exploit
WillFP 1fe6a3c
Updated to 6.66.0
WillFP 8fc9c71
Fixed custom AI goals on 1.20
WillFP fea3152
Updated to 6.66.1
WillFP d072ac1
Changed to MIT license
WillFP 67d7009
- Added CustomBiomesManager to add support for custom world generator…
0ft3n 6248daf
Removed the custom biomes manager (moved to libreforge)
0ft3n 9e583f1
Merge branch 'master' into develop
0ft3n 747e702
Bring develop up to date
0ft3n e0f631b
Merge remote-tracking branch 'origin/master' into develop
0ft3n 74a8dce
Added ability to configure literal cache ttl
0ft3n b6b4d7e
Fixed console commands in config slots
0ft3n 7defdcc
Merge branch 'master' into develop
0ft3n 6b46ea7
Added `random` function for math taking min and max arguments
0ft3n db41e11
Added HuskClaims antigrief support
0ft3n 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 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 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 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
64 changes: 64 additions & 0 deletions
64
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserEntity.kt
This file contains 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,64 @@ | ||
| package com.willfp.eco.internal.items | ||
|
|
||
| import com.willfp.eco.core.items.args.LookupArgParser | ||
| import org.bukkit.block.CreatureSpawner | ||
| import org.bukkit.entity.EntityType | ||
| import org.bukkit.inventory.ItemStack | ||
| import org.bukkit.inventory.meta.BlockStateMeta | ||
| import org.bukkit.inventory.meta.ItemMeta | ||
| import java.util.function.Predicate | ||
|
|
||
| object ArgParserEntity : LookupArgParser { | ||
| override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? { | ||
| if (meta !is BlockStateMeta) { | ||
| return null | ||
| } | ||
|
|
||
| if (meta.hasBlockState() || meta.blockState !is CreatureSpawner) { | ||
| return null | ||
| } | ||
|
|
||
| val state = meta.blockState as CreatureSpawner | ||
|
|
||
| var type: String? = null | ||
|
|
||
| for (arg in args) { | ||
| val argSplit = arg.split(":") | ||
| if (!argSplit[0].equals("entity", ignoreCase = true)) { | ||
| continue | ||
| } | ||
| if (argSplit.size < 2) { | ||
| continue | ||
| } | ||
| type = argSplit[1] | ||
| } | ||
|
|
||
| type ?: return null | ||
|
|
||
| val entityType = runCatching { EntityType.valueOf(type.uppercase()) }.getOrNull() ?: return null | ||
|
|
||
| state.spawnedType = entityType | ||
|
|
||
| meta.blockState = state | ||
|
|
||
| return Predicate { | ||
| val testMeta = ((it.itemMeta as? BlockStateMeta) as? CreatureSpawner) ?: return@Predicate false | ||
|
|
||
| testMeta.spawnedType?.name?.equals(type, true) == true | ||
| } | ||
| } | ||
|
|
||
| override fun serializeBack(meta: ItemMeta): String? { | ||
| if (meta !is BlockStateMeta) { | ||
| return null | ||
| } | ||
|
|
||
| if (meta.hasBlockState() || meta.blockState !is CreatureSpawner) { | ||
| return null | ||
| } | ||
|
|
||
| val state = meta.blockState as CreatureSpawner | ||
|
|
||
| return state.spawnedType?.let { "entity:${state.spawnedType!!.name}" } ?: return null | ||
| } | ||
| } |
This file contains 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 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
135 changes: 135 additions & 0 deletions
135
.../main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt
This file contains 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,135 @@ | ||
| package com.willfp.eco.internal.spigot.integrations.antigrief | ||
|
|
||
| import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration | ||
| import net.crashcraft.crashclaim.CrashClaim | ||
| import net.crashcraft.crashclaim.permissions.PermissionRoute | ||
| import net.william278.huskclaims.api.HuskClaimsAPI | ||
| import net.william278.huskclaims.libraries.cloplib.operation.Operation | ||
| import net.william278.huskclaims.libraries.cloplib.operation.OperationPosition | ||
| import net.william278.huskclaims.libraries.cloplib.operation.OperationType | ||
| import net.william278.huskclaims.position.Position | ||
| import net.william278.huskclaims.position.World | ||
| import org.bukkit.Location | ||
| import org.bukkit.block.Block | ||
| import org.bukkit.entity.LivingEntity | ||
| import org.bukkit.entity.Monster | ||
| import org.bukkit.entity.Player | ||
| import kotlin.jvm.optionals.getOrElse | ||
|
|
||
| class AntigriefHuskClaims : AntigriefIntegration { | ||
| override fun canBreakBlock( | ||
| player: Player, | ||
| block: Block | ||
| ): Boolean { | ||
| val api = HuskClaimsAPI.getInstance() ?: return true | ||
|
|
||
| val user = api.getOnlineUser(player.uniqueId) ?: return true | ||
|
|
||
| return api.isOperationAllowed( | ||
| Operation.of( | ||
| user, | ||
| OperationType.BLOCK_BREAK, | ||
| Position.at( | ||
| block.x.toDouble(), | ||
| block.y.toDouble(), | ||
| block.z.toDouble(), | ||
| api.getWorld(block.location.world.name) | ||
| ), | ||
| true | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun canCreateExplosion( | ||
| player: Player, | ||
| location: Location | ||
| ): Boolean { | ||
| val api = HuskClaimsAPI.getInstance() ?: return true | ||
|
|
||
| val user = api.getOnlineUser(player.uniqueId) ?: return true | ||
|
|
||
| return api.isOperationAllowed( | ||
| Operation.of( | ||
| user, | ||
| OperationType.EXPLOSION_DAMAGE_ENTITY, | ||
| Position.at( | ||
| location.x, | ||
| location.y, | ||
| location.z, | ||
| api.getWorld(location.world.name) | ||
| ), | ||
| true | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun canPlaceBlock( | ||
| player: Player, | ||
| block: Block | ||
| ): Boolean { | ||
| val api = HuskClaimsAPI.getInstance() ?: return true | ||
|
|
||
| val user = api.getOnlineUser(player.uniqueId) ?: return true | ||
|
|
||
| return api.isOperationAllowed( | ||
| Operation.of( | ||
| user, | ||
| OperationType.BLOCK_PLACE, | ||
| Position.at( | ||
| block.x.toDouble(), | ||
| block.y.toDouble(), | ||
| block.z.toDouble(), | ||
| api.getWorld(block.location.world.name) | ||
| ), | ||
| true | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun canInjure( | ||
| player: Player, | ||
| victim: LivingEntity | ||
| ): Boolean { | ||
| val api = HuskClaimsAPI.getInstance() ?: return true | ||
|
|
||
| val user = api.getOnlineUser(player.uniqueId) ?: return true | ||
|
|
||
| return api.isOperationAllowed( | ||
| Operation.of( | ||
| user, | ||
| when (victim) { | ||
| is Monster -> OperationType.PLAYER_DAMAGE_MONSTER | ||
| is Player -> OperationType.PLAYER_DAMAGE_PLAYER | ||
| else -> OperationType.PLAYER_DAMAGE_ENTITY | ||
| }, | ||
| Position.at( | ||
| victim.x, | ||
| victim.y, | ||
| victim.z, | ||
| api.getWorld(victim.location.world.name) | ||
| ), | ||
| true | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun canPickupItem(player: Player, location: Location): Boolean { | ||
| return true | ||
| } | ||
|
|
||
| override fun getPluginName(): String { | ||
| return "HuskClaims" | ||
| } | ||
|
|
||
| override fun equals(other: Any?): Boolean { | ||
| if (other !is AntigriefIntegration) { | ||
| return false | ||
| } | ||
|
|
||
| return other.pluginName == this.pluginName | ||
| } | ||
|
|
||
| override fun hashCode(): Int { | ||
| return this.pluginName.hashCode() | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you fix this to actually pull from the config