From 8e97c8617489e101ff4632eead85fe394e32f0a6 Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Wed, 21 Aug 2024 11:51:51 +0300 Subject: [PATCH 1/3] Adds support to 1.21.1 --- NMS/v1_21/build.gradle | 2 +- build.gradle | 2 +- .../java/com/bgsoftware/wildloaders/WildLoadersPlugin.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NMS/v1_21/build.gradle b/NMS/v1_21/build.gradle index e1f8a19..3e70c79 100644 --- a/NMS/v1_21/build.gradle +++ b/NMS/v1_21/build.gradle @@ -11,7 +11,7 @@ java { group 'NMS:v1_21' dependencies { - paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21-R0.1-SNAPSHOT") + paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.1-R0.1-SNAPSHOT") compileOnly project(":API") compileOnly rootProject } diff --git a/build.gradle b/build.gradle index 58db600..9fa94a0 100644 --- a/build.gradle +++ b/build.gradle @@ -69,7 +69,7 @@ dependencies { implementation 'com.bgsoftware.common.updater:Updater:b1' implementation 'com.bgsoftware.common.config:CommentedConfiguration:b1' implementation 'com.bgsoftware.common.dependencies:DependenciesManager:b2' - implementation 'com.bgsoftware.common.nmsloader:NMSLoader:b5' + implementation 'com.bgsoftware.common.nmsloader:NMSLoader:b7' implementation 'org.bstats:bstats-bukkit:3.0.0' diff --git a/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java b/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java index 08fdfe8..d34eae7 100644 --- a/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java +++ b/src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java @@ -4,6 +4,7 @@ import com.bgsoftware.common.dependencies.DependenciesManager; import com.bgsoftware.common.nmsloader.INMSLoader; import com.bgsoftware.common.nmsloader.NMSHandlersFactory; import com.bgsoftware.common.nmsloader.NMSLoadException; +import com.bgsoftware.common.nmsloader.config.NMSConfiguration; import com.bgsoftware.common.updater.Updater; import com.bgsoftware.wildloaders.api.WildLoaders; import com.bgsoftware.wildloaders.api.WildLoadersAPI; @@ -101,7 +102,7 @@ public final class WildLoadersPlugin extends JavaPlugin implements WildLoaders { private boolean loadNMSAdapter() { try { - INMSLoader nmsLoader = NMSHandlersFactory.createNMSLoader(this); + INMSLoader nmsLoader = NMSHandlersFactory.createNMSLoader(this, NMSConfiguration.forPlugin(this)); this.nmsAdapter = nmsLoader.loadNMSHandler(NMSAdapter.class); return true; From 551a81d5c102af5539c6516031858698b04549b1 Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Fri, 23 Aug 2024 11:39:10 +0300 Subject: [PATCH 2/3] Fixed errors when placing chunk loaders due to invalid block state (#107) --- .../nms/v1_21/loader/ChunkLoaderBlockEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NMS/v1_21/src/main/java/com/bgsoftware/wildloaders/nms/v1_21/loader/ChunkLoaderBlockEntity.java b/NMS/v1_21/src/main/java/com/bgsoftware/wildloaders/nms/v1_21/loader/ChunkLoaderBlockEntity.java index 827875e..8619b99 100644 --- a/NMS/v1_21/src/main/java/com/bgsoftware/wildloaders/nms/v1_21/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1_21/src/main/java/com/bgsoftware/wildloaders/nms/v1_21/loader/ChunkLoaderBlockEntity.java @@ -11,6 +11,7 @@ import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; import java.util.ArrayList; import java.util.Collection; @@ -80,6 +81,11 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } } + @Override + public boolean isValidBlockState(BlockState state) { + return true; + } + public void tick() { if (removed || ++currentTick <= 20) return; From a0676cf6363a0a7646a746d4193ed57c927ba94c Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Sat, 31 Aug 2024 11:31:37 +0300 Subject: [PATCH 3/3] Version 2024.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9fa94a0..7acb9d4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group 'WildLoaders' -version = "2024.2" +version = "2024.3" project.ext { archiveFolder = file("archive/")