Skip to content

Commit feea3bc

Browse files
tastybentoBONNe
andauthored
Release 1.9.2 (#119)
* Version 1.7.3 * Add ${argLine} to get jacoco coverage * Updated Jacoco POM entry * Address bugs reported by SonarCloud * Updated ReadMe * Add max mobs option #99 * Use updated Bucket event * Added tests to cover #99 * Fixes help text for user command. Fixes #105 * Fixed maxmobs typo instead of maxmob * Remove unused imports * Update to new Bukkit Loader * Remove debug * Create plugin.yml (#106) * Create plugin.yml * Update pom.xml * Update GreenhousesPladdon.java * Removed static getInstance usage * Version 1.7.4 * Refactored to reduce complexity * Update surefire plugin * Refactored to reduce complexity * Minor typos and grammar fixes * Reduced complexity * Refactor to reduce complexity * Refactor to reduce complexity * Update Github Action build script * Added distribution required for Github Action * Update pom.xml * Fixes mob spawning when no maxmob value given. Found while doing #108 * Code clean up. * BentoBox 2.0.0 * Update pom.xml 1.7.5 * Update to latest Spigot API * Version 1.8.0 * Added mobs to biomes * Improved errors. * Return the pladdon that was made * Update biomes.yml Added mangrove swamp #111 * Update to 1.21.3 and CodeMC distro (#112) * Update to 1.21.3 and CodeMC distro * Fix tests * Checks world before running command #114 (#115) * 117 cannot make greenhouse in nether (#118) * Version 1.9.2 * Allow nether world (and end) usage of greenhouses. #117 * Update GitHub build script to Java 21 * Update compile plugin to support Java 21 --------- Co-authored-by: BONNe <[email protected]>
1 parent 2f2cd5e commit feea3bc

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ jobs:
1111
name: Build
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
17-
- name: Set up JDK 17
18-
uses: actions/setup-java@v3
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
1919
with:
2020
distribution: 'adopt'
21-
java-version: 17
21+
java-version: 21
2222
- name: Cache SonarCloud packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.sonar/cache
2626
key: ${{ runner.os }}-sonar
2727
restore-keys: ${{ runner.os }}-sonar
2828
- name: Cache Maven packages
29-
uses: actions/cache@v3
29+
uses: actions/cache@v4
3030
with:
3131
path: ~/.m2
3232
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4141
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
42-
<java.version>17</java.version>
42+
<java.version>21</java.version>
4343
<powermock.version>2.0.9</powermock.version>
4444
<!-- More visible way how to change dependency versions -->
45-
<spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
45+
<spigot.version>1.21.5-R0.1-SNAPSHOT</spigot.version>
4646
<bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
4747
<!-- Revision variable removes warning about dynamic version -->
4848
<revision>${build.version}-SNAPSHOT</revision>
4949
<!-- This allows to change between versions and snapshots. -->
50-
<build.version>1.9.1</build.version>
50+
<build.version>1.9.2</build.version>
5151
<build.number>-LOCAL</build.number>
5252
<sonar.projectKey>BentoBoxWorld_Greenhouses</sonar.projectKey>
5353
<sonar.organization>bentobox-world</sonar.organization>
@@ -183,7 +183,7 @@
183183
<plugin>
184184
<groupId>org.apache.maven.plugins</groupId>
185185
<artifactId>maven-compiler-plugin</artifactId>
186-
<version>3.7.0</version>
186+
<version>3.8.1</version>
187187
<configuration>
188188
<release>${java.version}</release>
189189
</configuration>

src/main/java/world/bentobox/greenhouses/ui/user/MakeCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void setup() {
5151
*/
5252
@Override
5353
public boolean execute(User user, String label, List<String> args) {
54-
if (!user.getWorld().equals(getWorld())) {
54+
if (!Util.getWorld(user.getWorld()).equals(getWorld())) {
5555
user.sendMessage("general.errors.wrong-world");
5656
return false;
5757
}

src/main/java/world/bentobox/greenhouses/ui/user/RemoveCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import world.bentobox.bentobox.api.commands.CompositeCommand;
66
import world.bentobox.bentobox.api.user.User;
7+
import world.bentobox.bentobox.util.Util;
78
import world.bentobox.greenhouses.Greenhouses;
89

910
/**
@@ -35,7 +36,7 @@ public void setup() {
3536
*/
3637
@Override
3738
public boolean execute(User user, String label, List<String> args) {
38-
if (!user.getWorld().equals(getWorld())) {
39+
if (!Util.getWorld(user.getWorld()).equals(getWorld())) {
3940
user.sendMessage("general.errors.wrong-world");
4041
return false;
4142
}

src/main/java/world/bentobox/greenhouses/ui/user/UserCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import world.bentobox.bentobox.api.commands.CompositeCommand;
77
import world.bentobox.bentobox.api.user.User;
8+
import world.bentobox.bentobox.util.Util;
89
import world.bentobox.greenhouses.Greenhouses;
910

1011
/**
@@ -45,7 +46,7 @@ public void setup() {
4546
*/
4647
@Override
4748
public boolean execute(User user, String label, List<String> args) {
48-
if (!user.getWorld().equals(getWorld())) {
49+
if (!Util.getWorld(user.getWorld()).equals(getWorld())) {
4950
user.sendMessage("general.errors.wrong-world");
5051
return false;
5152
}

0 commit comments

Comments
 (0)