Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-02-02 11:21:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/net/Indyuce/mmoitems/api/crafting/CraftingStation.java
#	src/main/java/net/Indyuce/mmoitems/api/item/template/MMOItemTemplate.java
#	src/main/java/net/Indyuce/mmoitems/api/util/TemplateMap.java
#	src/main/java/net/Indyuce/mmoitems/manager/TemplateManager.java
#	src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
This commit is contained in:
Ethan 2020-09-14 02:18:49 -04:00
commit dd4a4ce278
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/Indyuce/mmoitems/manager/LayoutManager.java
View File

@ -1,15 +1,16 @@
package net.Indyuce.mmoitems.manager;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.Layout;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import org.bukkit.configuration.file.YamlConfiguration;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.Layout;
public class LayoutManager {
private final Map<String, Layout> layouts = new HashMap<>();

1
src/main/java/net/Indyuce/mmoitems/manager/PluginUpdateManager.java
View File

@ -153,7 +153,6 @@ public class PluginUpdateManager {
// simple path changes
rename(config.getConfig().getConfigurationSection(id + ".base"), "regeneration", "health-regeneration");
rename(config.getConfig().getConfigurationSection(id + ".base"), "element.light", "element.lightness");
rename(config.getConfig().getConfigurationSection(id + ".base"), "consume-cooldown", "item-cooldown");
// sound changes
if (config.getConfig().getConfigurationSection(id + ".base").contains("consume-sound")) {