Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Implemented 1.18 NMS

Browse Source
This commit is contained in:
Auxilor
2021-11-29 08:14:11 +00:00
parent bc4c1362ed
commit bd2f2a8e9d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/EcoCraftEnchantmentManager.java
View File

@@ -7,7 +7,7 @@ import com.willfp.ecoenchants.proxy.v1_18_R1.enchants.EcoCraftEnchantment;
import net.minecraft.core.IRegistry;
import net.minecraft.world.item.enchantment.Enchantment;
import org.bukkit.NamespacedKey;
import org.bukkit.craftbukkit.v1_17_R1.util.CraftNamespacedKey;
import org.bukkit.craftbukkit.v1_18_R1.util.CraftNamespacedKey;
import java.util.Map;
@@ -16,8 +16,8 @@ public final class EcoCraftEnchantmentManager implements EcoCraftEnchantmentMana
public void registerNewCraftEnchantments() {
Map<org.bukkit.enchantments.Enchantment, VanillaEnchantmentMetadata> metadataMap = VanillaEnchantments.getMetadataMap();
for (Enchantment enchantment : IRegistry.X) {
NamespacedKey key = CraftNamespacedKey.fromMinecraft(IRegistry.X.getKey(enchantment));
for (Enchantment enchantment : IRegistry.Y) {
NamespacedKey key = CraftNamespacedKey.fromMinecraft(IRegistry.Y.b(enchantment));
VanillaEnchantmentMetadata metadata = metadataMap.get(org.bukkit.enchantments.Enchantment.getByKey(key));
new EcoCraftEnchantment(enchantment, metadata).register();
}

4
eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/OpenInventory.java
View File

@@ -1,13 +1,13 @@
package com.willfp.ecoenchants.proxy.v1_18_R1;
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public final class OpenInventory implements OpenInventoryProxy {
@Override
public Object getOpenInventory(@NotNull final Player player) {
return ((CraftPlayer) player).getHandle().bV;
return ((CraftPlayer) player).getHandle().bW;
}
}

4
eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/enchants/EcoCraftEnchantment.java
View File

@@ -4,7 +4,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.support.vanilla.VanillaEnchantmentMetadata;
import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
import net.minecraft.world.item.enchantment.Enchantment;
import org.bukkit.craftbukkit.v1_17_R1.enchantments.CraftEnchantment;
import org.bukkit.craftbukkit.v1_18_R1.enchantments.CraftEnchantment;
import org.jetbrains.annotations.NotNull;
public class EcoCraftEnchantment extends CraftEnchantment {
@@ -18,7 +18,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
@Override
public int getMaxLevel() {
return metadata.maxLevel() == null ? this.getHandle().getMaxLevel() : metadata.maxLevel();
return metadata.maxLevel() == null ? this.getHandle().a() : metadata.maxLevel();
}
@Override

2
settings.gradle
View File

@@ -5,7 +5,7 @@ include ':eco-core'
include ':eco-core:core-nms'
include ':eco-core:core-nms:v1_16_R3'
include ':eco-core:core-nms:v1_17_R1'
//include ':eco-core:core-nms:v1_18_R1'
include ':eco-core:core-nms:v1_18_R1'
include ':eco-core:core-proxy'
include ':eco-core:core-plugin'
include ':eco-core:core-stub'