Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- run: mvn --batch-mode clean org.jacoco:jacoco-maven-plugin:prepare-agent install
- run: mkdir staging && cp target/*.jar staging
- name: Save artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package
path: staging
Expand Down
17 changes: 12 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>1.20.0</build.version>
<build.version>1.20.1</build.version>
<!-- Sonar Cloud -->
<sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization>
Expand Down Expand Up @@ -111,6 +111,13 @@
</profiles>

<repositories>
<repository>
<id>papermc-public</id>
<name>PaperMC Official</name>
<url>https://repo.papermc.io/repository/maven-public/</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
Expand All @@ -120,8 +127,8 @@
<url>https://repo.codemc.io/repository/bentoboxworld/</url>
</repository>
<repository>
<id>ess-repo</id>
<url>https://ci.ender.zone/plugin/repository/everything/</url>
<id>EssentialsX</id>
<url>https://repo.essentialsx.net/releases/</url>
</repository>
</repositories>

Expand Down Expand Up @@ -170,9 +177,9 @@
</dependency>
<!-- EssentialsX -->
<dependency>
<groupId>net.ess3</groupId>
<groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.17.2</version>
<version>2.21.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/world/bentobox/acidisland/AISettings.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
package world.bentobox.acidisland;

import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.bukkit.Difficulty;
import org.bukkit.GameMode;
Expand All @@ -9,15 +15,15 @@
import org.bukkit.entity.EntityType;
import org.bukkit.potion.PotionEffectType;

import com.google.common.base.Enums;

import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.configuration.ConfigComment;
import world.bentobox.bentobox.api.configuration.ConfigEntry;
import world.bentobox.bentobox.api.configuration.StoreAt;
import world.bentobox.bentobox.api.configuration.WorldSettings;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.database.objects.adapters.*;
import world.bentobox.bentobox.database.objects.adapters.Adapter;
import world.bentobox.bentobox.database.objects.adapters.FlagBooleanSerializer;
import world.bentobox.bentobox.database.objects.adapters.PotionEffectListAdapter;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/world/bentobox/acidisland/AcidIsland.java
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private World getWorld(String worldName2, Environment env, @Nullable ChunkGenera
// Set world name
worldName2 = env.equals(World.Environment.NETHER) ? worldName2 + NETHER : worldName2;
worldName2 = env.equals(World.Environment.THE_END) ? worldName2 + THE_END : worldName2;
WorldCreator wc = WorldCreator.name(worldName2).type(WorldType.FLAT).environment(env);
WorldCreator wc = WorldCreator.name(worldName2).environment(env).type(WorldType.NORMAL);
World w = settings.isUseOwnGenerator() ? wc.createWorld() : wc.generator(chunkGenerator2).createWorld();
// Set spawn rates
if (w != null && getSettings() != null) {
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/world/bentobox/acidisland/AISettingsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

Expand Down
Loading