Skip to content

Commit

Permalink
HotFix
Browse files Browse the repository at this point in the history
  • Loading branch information
PeachesMLG committed Jun 4, 2021
1 parent 9f0fb0f commit ae2d6ac
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.iridium.iridiumskyblock.configs;

import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumskyblock.bank.CrystalsBankItem;
import com.iridium.iridiumskyblock.bank.ExperienceBankItem;
Expand All @@ -12,7 +13,7 @@
* The bank item configuration used by IridiumSkyblock (bankitems.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class BankItems {

public CrystalsBankItem crystalsBankItem = new CrystalsBankItem(10, new Item(XMaterial.NETHER_STAR, 13, 1, "&b&lIsland Crystals", Arrays.asList("&7%amount% Crystals", "&b&l[!] &bLeft click to withdraw", "&b&l[!] &bRight click to deposit")));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.iridium.iridiumskyblock.configs;

import com.google.common.collect.ImmutableMap;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
Expand All @@ -12,7 +13,7 @@
* The block value configuration used by IridiumSkyblock (blockvalues.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class BlockValues {

public Map<XMaterial, ValuableBlock> blockValues = ImmutableMap.<XMaterial, ValuableBlock>builder()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.iridium.iridiumskyblock.configs;

import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumskyblock.Booster;

import java.util.Arrays;


@JsonIgnoreProperties(ignoreUnknown = true)
public class Boosters {

public Booster farmingBooster = new Booster(new Item(XMaterial.WHEAT, 10, 1, "&b&lFarming Booster", Arrays.asList(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.iridium.iridiumskyblock.configs;

import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumskyblock.commands.*;


@JsonIgnoreProperties(ignoreUnknown = true)
public class Commands {

public AboutCommand aboutCommand = new AboutCommand();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.iridium.iridiumskyblock.configs;

import com.google.common.collect.ImmutableMap;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumcore.utils.NumberFormatter;
import com.iridium.iridiumskyblock.generators.GeneratorType;
Expand All @@ -13,7 +14,7 @@
* The main configuration of IridiumSkyblock (configuration.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class Configuration {

public String prefix = "<GRADIENT:09C6F9>&lIridiumSkyblock</GRADIENT:045DE9> &8»";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
import com.iridium.iridiumcore.Background;
import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnore;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumskyblock.configs.inventories.*;

import java.util.Arrays;
import java.util.Collections;


@JsonIgnoreProperties(ignoreUnknown = true)
public class Inventories {

@JsonIgnore
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.iridium.iridiumskyblock.configs;

import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;

import java.util.Arrays;
import java.util.List;

/**
* The message configuration used by IridiumSkyblock (messages.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class Messages {

public String reloaded = "%prefix% &7Configuration has been reloaded.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.common.collect.ImmutableMap;
import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumcore.dependencies.xseries.XSound;
import com.iridium.iridiumskyblock.Mission;
Expand All @@ -16,7 +17,7 @@
* The mission configuration used by IridiumSkyblock (missions.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class Missions {

public Map<String, Mission> missions = ImmutableMap.<String, Mission>builder()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.iridium.iridiumskyblock.configs;

import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumskyblock.IslandRank;
import com.iridium.iridiumskyblock.Permission;
Expand All @@ -11,7 +12,7 @@
* The Island permission configuration used by IridiumSkyblock (permissions.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class Permissions {

public String allowed = "&a&lALLOWED";
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/iridium/iridiumskyblock/configs/SQL.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.iridium.iridiumskyblock.configs;

import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumskyblock.managers.DatabaseManager;

/**
* The SQL database connection file used by IridiumSkyblock (sql.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class SQL {

public Driver driver = Driver.SQLITE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.common.collect.ImmutableMap;
import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XBiome;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import lombok.AllArgsConstructor;
Expand All @@ -14,7 +15,7 @@
* The schematic configuration used by IridiumSkyblock (schematics.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class Schematics {

public Map<String, SchematicConfig> schematics = ImmutableMap.<String, SchematicConfig>builder()
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/iridium/iridiumskyblock/configs/Shop.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.common.collect.ImmutableMap;
import com.iridium.iridiumcore.Background;
import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumcore.dependencies.xseries.XSound;
import com.iridium.iridiumskyblock.shop.ShopItem;
Expand All @@ -20,7 +21,7 @@
* The shop configuration used by IridiumSkyblock (shop.yml).
* Is deserialized automatically on plugin startup and reload.
*/

@JsonIgnoreProperties(ignoreUnknown = true)
public class Shop {

public Map<String, ShopCategoryConfig> categories = ImmutableMap.<String, ShopCategoryConfig>builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.common.collect.ImmutableMap;
import com.iridium.iridiumcore.Item;
import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties;
import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
import com.iridium.iridiumskyblock.Upgrade;
import com.iridium.iridiumskyblock.upgrades.MemberUpgrade;
Expand All @@ -11,7 +12,7 @@

import java.util.Arrays;


@JsonIgnoreProperties(ignoreUnknown = true)
public class Upgrades {
public Upgrade<SizeUpgrade> sizeUpgrade = new Upgrade<>(true,
new Item(XMaterial.GRASS_BLOCK, 10, 1, "&b&lIsland Size", Arrays.asList(
Expand Down

0 comments on commit ae2d6ac

Please sign in to comment.