Skip to content

Commit

Permalink
1.16.13
Browse files Browse the repository at this point in the history
  • Loading branch information
CryptoMorin committed Jul 13, 2023
1 parent 78a5a4b commit 94b8875
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 24 deletions.
Binary file modified addons/Kingdoms-Addon-Map-Viewers-2.0.4.3.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion core/src/main/resources/guis/structures/extractor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ options:
- "Last collected by&8: &2%extractor-last-collector%"
slot: 0
fuel:
name: "&2Fuel&8: &6%fuel%&8/&6%fancy_max_fuel%"
name: "&2Fuel&8: &6%fancy_fuel%&8/&6%fancy_max_fuel%"
material: COAL
refresh: true
slot: 1
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/resources/misc-upgrades.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ invasions:
invasion-teleportation:
enabled: true

# This option can be used to make upgrade trees.
#condition:
# This option can be used to make upgrade trees.
#condition:
# Makes "invasions" upgrade to be a requirement to be maxxed to upgrade this upgrade.
# The "miscupgrades.required.invasions" refers to a custom language entry inside your language files. (e.g. en.yml)
# %kingdoms_kingdom_upgrade% is a functional placeholder: https://github.com/CryptoMorin/KingdomsX/wiki/Placeholders#placeholder-functions
#"{kingdoms_kingdom_upgrade:level type=misc, of=INVASIONS} < 5": "miscupgrades.required.invasions"

# If anti-explosion upgrade is upgraded, you won't be able to upgrade this and any other upgrade that depends on this.
# You could block anti-explosion from being upgraded if this option is upgraded by doing the same thing.
#"{kingdoms_kingdom_upgrade:level type=misc, of=ANTI_EXPLOSION} > 0": "miscupgrades.tree.anti-explosion"
#"{kingdoms_kingdom_upgrade:level type=misc, of=ANTI_EXPLOSION} > 0": "miscupgrades.tree.anti-explosion"

# This amount is reduced from invasions.yml -> teleportation -> teleport-delay
scaling: lvl
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}players` (
`mapSize_height` INT NULL, `mapSize_width` INT NULL,
`readMails` JSON NULL,
`claims` JSON NULL,
`protectedBlocks` JSON NULL,
`mutedChannels` JSON NULL,
`invites` JSON NULL,
SimpleChunkLocation(jailCell) NULL,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
package org.kingdoms.utils.internal.jdk;

import javax.tools.JavaCompiler;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;

public final class Java9 {
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@
import org.bukkit.permissions.PermissionDefault;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.kingdoms.commands.*;
import org.kingdoms.constants.group.Kingdom;
import org.kingdoms.constants.land.location.SimpleChunkLocation;
import org.kingdoms.constants.player.KingdomPlayer;
import org.kingdoms.locale.KingdomsLang;
import org.kingdoms.locale.LocationLocale;
import org.kingdoms.locale.provider.MessageBuilder;
import org.kingdoms.main.Kingdoms;
import org.kingdoms.outposts.*;
import org.kingdoms.utils.MathUtils;
import org.kingdoms.outposts.Outpost;
import org.kingdoms.outposts.OutpostEvent;
import org.kingdoms.outposts.OutpostsLang;
import org.kingdoms.utils.PaperUtils;

import java.util.List;
import java.util.UUID;

public class CommandOutpostTeleport extends KingdomsCommand {
public CommandOutpostTeleport(KingdomsParentCommand parent) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.kingdoms.peacetreaties.config.PeaceTreatyLang;
import org.kingdoms.peacetreaties.managers.RelationshipListener;
import org.kingdoms.peacetreaties.terms.*;
import org.kingdoms.utils.conditions.ConditionProcessor;
import org.kingdoms.utils.MathUtils;
import org.kingdoms.utils.conditions.ConditionProcessor;
import org.kingdoms.utils.config.NodeInterpreter;
import org.kingdoms.utils.internal.Fn;

Expand Down
93 changes: 85 additions & 8 deletions resources/languages/hu/hu.yml

Large diffs are not rendered by default.

0 comments on commit 94b8875

Please sign in to comment.