Upstream/WildLoaders
1
0
Fork 0
mirror of https://github.com/BG-Software-LLC/WildLoaders.git synced 2024-11-21 11:46:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
OmerBenGera 2024-08-31 11:31:44 +03:00
commit 5869603497
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NMS/v1_21/build.gradle
View File

@ -11,7 +11,7 @@ java {
group 'NMS:v1_21' group 'NMS:v1_21'
dependencies { 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 project(":API")
compileOnly rootProject compileOnly rootProject
} }

6
NMS/v1_21/src/main/java/com/bgsoftware/wildloaders/nms/v1_21/loader/ChunkLoaderBlockEntity.java
View File

@ -11,6 +11,7 @@ import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; 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() { public void tick() {
if (removed || ++currentTick <= 20) if (removed || ++currentTick <= 20)
return; return;

4
build.gradle
View File

@ -5,7 +5,7 @@ plugins {
} }
group 'WildLoaders' group 'WildLoaders'
version = "2024.2" version = "2024.3"
project.ext { project.ext {
archiveFolder = file("archive/") archiveFolder = file("archive/")
@ -69,7 +69,7 @@ dependencies {
implementation 'com.bgsoftware.common.updater:Updater:b1' implementation 'com.bgsoftware.common.updater:Updater:b1'
implementation 'com.bgsoftware.common.config:CommentedConfiguration:b1' implementation 'com.bgsoftware.common.config:CommentedConfiguration:b1'
implementation 'com.bgsoftware.common.dependencies:DependenciesManager:b2' 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' implementation 'org.bstats:bstats-bukkit:3.0.0'

3
src/main/java/com/bgsoftware/wildloaders/WildLoadersPlugin.java
View File

@ -4,6 +4,7 @@ import com.bgsoftware.common.dependencies.DependenciesManager;
import com.bgsoftware.common.nmsloader.INMSLoader; import com.bgsoftware.common.nmsloader.INMSLoader;
import com.bgsoftware.common.nmsloader.NMSHandlersFactory; import com.bgsoftware.common.nmsloader.NMSHandlersFactory;
import com.bgsoftware.common.nmsloader.NMSLoadException; import com.bgsoftware.common.nmsloader.NMSLoadException;
import com.bgsoftware.common.nmsloader.config.NMSConfiguration;
import com.bgsoftware.common.updater.Updater; import com.bgsoftware.common.updater.Updater;
import com.bgsoftware.wildloaders.api.WildLoaders; import com.bgsoftware.wildloaders.api.WildLoaders;
import com.bgsoftware.wildloaders.api.WildLoadersAPI; import com.bgsoftware.wildloaders.api.WildLoadersAPI;
@ -101,7 +102,7 @@ public final class WildLoadersPlugin extends JavaPlugin implements WildLoaders {
private boolean loadNMSAdapter() { private boolean loadNMSAdapter() {
try { try {
INMSLoader nmsLoader = NMSHandlersFactory.createNMSLoader(this); INMSLoader nmsLoader = NMSHandlersFactory.createNMSLoader(this, NMSConfiguration.forPlugin(this));
this.nmsAdapter = nmsLoader.loadNMSHandler(NMSAdapter.class); this.nmsAdapter = nmsLoader.loadNMSHandler(NMSAdapter.class);
return true; return true;