Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to MC 1 21 4. Remove code for older versions. #2568

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Update to MC 1 21 4. Remove code for older versions. #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,12 @@
<version>${spigot.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc......</groupId>
<artifactId>spigot</artifactId>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc.....</groupId>
<artifactId>spigot</artifactId>
Expand Down
52 changes: 0 additions & 52 deletions src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/PasteHandlerImpl.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/PasteHandlerImpl.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/PasteHandlerImpl.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ..._20_4_R0_1_SNAPSHOT/PasteHandlerImpl.java → ..._21_4_R0_1_SNAPSHOT/PasteHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package world.bentobox.bentobox.nms.v1_20_4_R0_1_SNAPSHOT;
package world.bentobox.bentobox.nms.v1_21_4_R0_1_SNAPSHOT;

import java.util.concurrent.CompletableFuture;

import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_20_R3.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData;

import net.minecraft.core.BlockPosition;
import net.minecraft.world.level.block.state.IBlockData;
Expand Down
6 changes: 3 additions & 3 deletions ...4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java → ...4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package world.bentobox.bentobox.nms.v1_20_4_R0_1_SNAPSHOT;
package world.bentobox.bentobox.nms.v1_21_4_R0_1_SNAPSHOT;

import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_20_R3.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData;

import net.minecraft.core.BlockPosition;
import net.minecraft.world.level.World;
Expand Down
38 changes: 24 additions & 14 deletions src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,64 +197,74 @@ public enum ServerVersion {
/**
* @since 1.21.0
*/
V1_19(Compatibility.COMPATIBLE),
V1_19(Compatibility.INCOMPATIBLE),
/**
* @since 1.21.0
*/
V1_19_1(Compatibility.COMPATIBLE),
V1_19_1(Compatibility.INCOMPATIBLE),
/**
* @since 1.21.0
*/
V1_19_2(Compatibility.COMPATIBLE),
V1_19_2(Compatibility.INCOMPATIBLE),
/**
* @since 1.22.0
*/
V1_19_3(Compatibility.COMPATIBLE),
V1_19_3(Compatibility.INCOMPATIBLE),
/**
* @since 1.22.1
*/
V1_19_4(Compatibility.COMPATIBLE),
V1_19_4(Compatibility.INCOMPATIBLE),
/**
* @since 1.24.0
*/
V1_20(Compatibility.INCOMPATIBLE),
/**
* @since 1.24.0
*/
V1_20_1(Compatibility.COMPATIBLE),
V1_20_1(Compatibility.INCOMPATIBLE),
/**
* @since 2.0.0
*/
V1_20_2(Compatibility.COMPATIBLE),
V1_20_2(Compatibility.INCOMPATIBLE),
/**
* @since 2.0.0
*/
V1_20_3(Compatibility.COMPATIBLE),
V1_20_3(Compatibility.INCOMPATIBLE),
/**
* @since 2.0.0
*/
V1_20_4(Compatibility.COMPATIBLE),
V1_20_4(Compatibility.INCOMPATIBLE),
/**
* @since 2.4.0
*/
V1_20_5(Compatibility.COMPATIBLE),
V1_20_5(Compatibility.INCOMPATIBLE),
/**
* @since 2.4.0
*/
V1_20_6(Compatibility.COMPATIBLE),
V1_20_6(Compatibility.INCOMPATIBLE),
/**
* @since 2.4.0
*/
V1_21(Compatibility.COMPATIBLE),
V1_21(Compatibility.INCOMPATIBLE),
/**
* @since 2.5.0
*/
V1_21_1(Compatibility.COMPATIBLE),
V1_21_1(Compatibility.INCOMPATIBLE),

/**
* @since 2.7.0
*/
V1_21_2(Compatibility.INCOMPATIBLE), V1_21_3(Compatibility.COMPATIBLE);
V1_21_2(Compatibility.INCOMPATIBLE),

/**
* @since 3.0.0
*/
V1_21_3(Compatibility.COMPATIBLE),

/**
* @since 3.0.1
*/
V1_21_4(Compatibility.COMPATIBLE),;

private final Compatibility compatibility;

Expand Down
Loading