mirror of
https://github.com/Auxilor/EcoEnchants.git
synced 2024-11-21 14:55:17 +01:00
Added 1.20 support
This commit is contained in:
parent
a604cb05b1
commit
05ce232139
6
eco-core/core-nms/v1_20_R1/build.gradle.kts
Normal file
6
eco-core/core-nms/v1_20_R1/build.gradle.kts
Normal file
@ -0,0 +1,6 @@
|
||||
group = "com.willfp"
|
||||
version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spigotmc:spigot:1.20-R0.1-SNAPSHOT")
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package com.willfp.ecoenchants.proxy.v1_20_R1
|
||||
|
||||
import com.willfp.ecoenchants.enchants.EcoEnchant
|
||||
import com.willfp.ecoenchants.enchants.EcoEnchants
|
||||
import com.willfp.ecoenchants.vanilla.VanillaEnchantmentData
|
||||
import net.minecraft.world.item.enchantment.Enchantment
|
||||
import org.bukkit.craftbukkit.v1_20_R1.enchantments.CraftEnchantment
|
||||
|
||||
class EcoCraftEnchantment(
|
||||
target: Enchantment,
|
||||
private val data: VanillaEnchantmentData
|
||||
) : CraftEnchantment(target) {
|
||||
override fun getMaxLevel(): Int = data.maxLevel ?: super.getMaxLevel()
|
||||
|
||||
override fun conflictsWith(other: org.bukkit.enchantments.Enchantment): Boolean {
|
||||
if (other is EcoEnchant) {
|
||||
return other.conflictsWith(this)
|
||||
}
|
||||
|
||||
return data.conflicts?.contains(other.key) ?: super.conflictsWith(other)
|
||||
}
|
||||
|
||||
fun register() {
|
||||
EcoEnchants.register(this)
|
||||
}
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package com.willfp.ecoenchants.proxy.v1_20_R1
|
||||
|
||||
import com.willfp.ecoenchants.proxy.proxies.EcoCraftEnchantmentManagerProxy
|
||||
import com.willfp.ecoenchants.vanilla.VanillaEnchantmentData
|
||||
import net.minecraft.core.Registry
|
||||
import net.minecraft.core.registries.BuiltInRegistries
|
||||
import net.minecraft.core.registries.Registries
|
||||
import org.bukkit.NamespacedKey
|
||||
import org.bukkit.enchantments.Enchantment
|
||||
|
||||
class EcoCraftEnchantmentManager : EcoCraftEnchantmentManagerProxy {
|
||||
override fun registerNewCraftEnchantment(
|
||||
enchantment: Enchantment,
|
||||
data: VanillaEnchantmentData
|
||||
) {
|
||||
for (enchant in BuiltInRegistries.g) {
|
||||
val key = org.bukkit.craftbukkit.v1_20_R1.util.CraftNamespacedKey.fromMinecraft(
|
||||
BuiltInRegistries.g.b(enchant)
|
||||
)
|
||||
if (key.key != enchantment.key.key) {
|
||||
continue
|
||||
}
|
||||
EcoCraftEnchantment(enchant, data).register()
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
package com.willfp.ecoenchants.proxy.v1_20_R1
|
||||
|
||||
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy
|
||||
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer
|
||||
import org.bukkit.entity.Player
|
||||
|
||||
class OpenInventory : OpenInventoryProxy {
|
||||
override fun getOpenInventory(player: Player): Any {
|
||||
return (player as CraftPlayer).handle.bR
|
||||
}
|
||||
}
|
@ -19,3 +19,4 @@ include(":eco-core:core-nms:v1_18_R2")
|
||||
include(":eco-core:core-nms:v1_19_R1")
|
||||
include(":eco-core:core-nms:v1_19_R2")
|
||||
include(":eco-core:core-nms:v1_19_R3")
|
||||
include(":eco-core:core-nms:v1_20_R1")
|
||||
|
Loading…
Reference in New Issue
Block a user