Skip to content

Commit 9ad42d9

Browse files
authored
Merge pull request #4 from ZorTik/development
1.8 compatibility.
2 parents ebf398f + fdfecc9 commit 9ad42d9

6 files changed

Lines changed: 38 additions & 31 deletions

File tree

.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules/ConfigurationLib.main.iml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ repositories {
1414
name = 'spigotmc-repo'
1515
url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
1616
}
17+
maven {
18+
name = 'sonatype'
19+
url = "https://oss.sonatype.org/content/repositories/snapshots/"
20+
}
1721
}
1822

1923
dependencies {
2024
implementation group: 'org.jetbrains', name: 'annotations', version: '20.1.0'
21-
compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
25+
compileOnly 'org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT'
2226
compileOnly 'org.projectlombok:lombok:1.18.24'
2327
annotationProcessor 'org.projectlombok:lombok:1.18.24'
2428
}

src/main/java/me/zort/configurationlib/configuration/bukkit/BukkitSectionNode.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
package me.zort.configurationlib.configuration.bukkit;
22

33
import lombok.Getter;
4-
import lombok.RequiredArgsConstructor;
54
import me.zort.configurationlib.*;
6-
import me.zort.configurationlib.configuration.bukkit.adapter.ItemStackAdapter;
5+
import me.zort.configurationlib.configuration.bukkit.adapter.DefaultItemAdapter;
76
import me.zort.configurationlib.util.Colorizer;
87
import me.zort.configurationlib.util.ItemValidator;
98
import me.zort.configurationlib.util.NodeTypeToken;
109
import me.zort.configurationlib.util.Placeholders;
1110
import org.apache.commons.lang.ArrayUtils;
1211
import org.bukkit.Bukkit;
1312
import org.bukkit.Material;
14-
import org.bukkit.NamespacedKey;
1513
import org.bukkit.configuration.ConfigurationSection;
1614
import org.bukkit.enchantments.Enchantment;
1715
import org.bukkit.inventory.ItemFlag;
1816
import org.bukkit.inventory.ItemStack;
1917
import org.bukkit.inventory.meta.ItemMeta;
2018
import org.bukkit.inventory.meta.SkullMeta;
21-
import org.jetbrains.annotations.NotNull;
2219
import org.jetbrains.annotations.Nullable;
2320

2421
import java.lang.reflect.Field;
@@ -42,7 +39,7 @@ public BukkitSectionNode(@Nullable SectionNode<ConfigurationSection> parent, Con
4239
init();
4340

4441
if(parent == null) {
45-
registerAdapter(ItemStack.class, new ItemStackAdapter());
42+
registerAdapter(ItemStack.class, new DefaultItemAdapter());
4643
}
4744
}
4845

@@ -181,7 +178,8 @@ public ItemStack getAsItem(Placeholders placeholders) {
181178
}
182179
if(section.contains("enchantments")) {
183180
for(String key : section.getConfigurationSection("enchantments").getKeys(false)) {
184-
Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(key.toLowerCase()));
181+
//Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(key.toLowerCase()));
182+
Enchantment enchantment = Enchantment.getByName(key.toUpperCase());
185183
if(enchantment == null) {
186184
continue;
187185
}
@@ -248,13 +246,4 @@ private static int verMajor() {
248246
return Integer.parseInt(verString);
249247
}
250248

251-
private static class DefaultItemDeserializer implements NodeDeserializer<ItemStack, ConfigurationSection> {
252-
253-
@Override
254-
public ItemStack deserialize(@NotNull ItemStack deserializeInto, NodeContext<Node<ConfigurationSection>, ConfigurationSection> context, Placeholders placeholders) {
255-
return ((BukkitSectionNode) context.getNode()).getAsItem(placeholders);
256-
}
257-
258-
}
259-
260249
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package me.zort.configurationlib.configuration.bukkit.adapter;
2+
3+
import me.zort.configurationlib.Node;
4+
import me.zort.configurationlib.NodeContext;
5+
import me.zort.configurationlib.NodeDeserializer;
6+
import me.zort.configurationlib.configuration.bukkit.BukkitSectionNode;
7+
import me.zort.configurationlib.util.Placeholders;
8+
import org.bukkit.configuration.ConfigurationSection;
9+
import org.bukkit.inventory.ItemStack;
10+
import org.jetbrains.annotations.NotNull;
11+
12+
public class DefaultItemAdapter implements NodeDeserializer<ItemStack, ConfigurationSection> {
13+
14+
@Override
15+
public ItemStack deserialize(@NotNull ItemStack deserializeInto, NodeContext<Node<ConfigurationSection>, ConfigurationSection> context, Placeholders placeholders) {
16+
return ((BukkitSectionNode) context.getNode()).getAsItem(placeholders);
17+
}
18+
19+
}

src/main/java/me/zort/configurationlib/configuration/bukkit/adapter/ItemStackAdapter.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)