Set version to 0.2.0-beta.8

Vanilla will return true for empty shapes, so we should as well.

build.gradle

@@ -18,13 +18,10 @@ def aw2at = Aw2AtTask.configureDefault(
     sourceSets.main
 )
 
-sourceSets.create("lithium")
-
 neoForge {
     neoFormVersion = neoform_version
     validateAccessTransformers = true
     accessTransformers.files.setFrom(aw2at.flatMap { t -> t.getOutputFile() })
-    addModdingDependenciesTo sourceSets.lithium
 }
 
 runConfigCommon {
@@ -44,13 +41,6 @@ dependencies {
 
     // todo: does cloth publish a platform-agnostic jar in mojang mappings?
     compileOnly "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
-
-    lithiumCompileOnly("maven.modrinth:lithium:${rootProject.neo_lithium_version}")
-    compileOnly(sourceSets.lithium.output)
-}
-
-tasks.jar {
-    from(sourceSets.lithium.output)
 }
 
 allprojects {

fabric/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 
     runtimeOnly(project(":").sourceSets.main.output)
-    runtimeOnly(project(":").sourceSets.lithium.output)
     shadow(project(":"))
     compileOnly(project(":"))
 
@@ -86,7 +85,6 @@ loom {
         main {
             sourceSet("main")
             sourceSet("main", project.rootProject)
-            sourceSet("lithium", project.rootProject)
         }
     }
 }

fabric/src/main/java/ca/spottedleaf/moonrise/fabric/FabricHooks.java

@@ -42,11 +42,6 @@ public final class FabricHooks extends BaseChunkSystemHooks implements PlatformH
         return "Moonrise";
     }
 
-    @Override
-    public boolean isModLoaded(final String modId) {
-        return FabricLoader.getInstance().isModLoaded(modId);
-    }
-
     @Override
     public int getLightEmission(final BlockState blockState, final BlockGetter world, final BlockPos pos) {
         return blockState.getLightEmission();

gradle.properties

@@ -8,9 +8,9 @@ org.gradle.configuration-cache=true
 minecraft_version=1.21.4
 loader_version=0.16.9
 supported_minecraft_versions=1.21.4
-neoforge_version=21.4.59-beta
+neoforge_version=21.4.33-beta
 neoform_version=1.21.4-20241203.161809
-fabric_api_version=0.114.3+1.21.4
+fabric_api_version=0.110.5+1.21.4
 snakeyaml_version=2.3
 concurrentutil_version=0.0.3
 yamlconfig_version=1.0.2
@@ -18,9 +18,9 @@ cloth_version=17.0.144
 modmenu_version=13.0.0-beta.1
 junit_version=5.11.3
 # version ids from modrinth
-fabric_lithium_version=zVOQw7YU
-neo_lithium_version=CfXh2ZF6
+fabric_lithium_version=t1FlWYl9
+neo_lithium_version=iDqQi66g
 # Mod Properties
-mod_version=0.2.0-SNAPSHOT
+mod_version=0.2.0-beta.8
 maven_group=ca.spottedleaf.moonrise
 archives_base_name=moonrise

neoforge/build.gradle

@@ -28,7 +28,6 @@ neoForge {
         moonrise {
             sourceSet sourceSets.main
             sourceSet rootProject.sourceSets.main
-            sourceSet rootProject.sourceSets.lithium
         }
     }
     runs {
@@ -47,7 +46,6 @@ neoForge {
 
 dependencies {
     runtimeOnly(project(":").sourceSets.main.output)
-    runtimeOnly(project(":").sourceSets.lithium.output)
     shadow(project(":"))
     compileOnly(project(":"))
 

neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/NeoForgeHooks.java

@@ -28,8 +28,6 @@ import net.minecraft.world.level.chunk.status.ChunkStatusTasks;
 import net.minecraft.world.level.chunk.storage.SerializableChunkData;
 import net.minecraft.world.level.entity.EntityTypeTest;
 import net.minecraft.world.phys.AABB;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.loading.LoadingModList;
 import net.neoforged.neoforge.common.CommonHooks;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.entity.PartEntity;
@@ -48,15 +46,6 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
         return "Moonrise";
     }
 
-    @Override
-    public boolean isModLoaded(final String modId) {
-        final ModList modList = ModList.get();
-        if (modList == null) {
-            return LoadingModList.get().getModFileById(modId) != null;
-        }
-        return modList.isLoaded(modId);
-    }
-
     @Override
     public int getLightEmission(final BlockState blockState, final BlockGetter world, final BlockPos pos) {
         return blockState.getLightEmission(world, pos);

src/lithium/java/ca/spottledleaf/moonrise/compat/lithium/LithiumHooks.java

@@ -1,18 +0,0 @@
-package ca.spottledleaf.moonrise.compat.lithium;
-
-import net.caffeinemc.mods.lithium.common.world.chunk.ChunkStatusTracker;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.LevelChunk;
-
-public final class LithiumHooks {
-    private LithiumHooks() {}
-
-    public static void onChunkInaccessible(final ServerLevel serverLevel, final ChunkPos pos) {
-        ChunkStatusTracker.onChunkInaccessible(serverLevel, pos);
-    }
-
-    public static void onChunkAccessible(final ServerLevel serverLevel, final LevelChunk chunk) {
-        ChunkStatusTracker.onChunkAccessible(serverLevel, chunk);
-    }
-}

src/main/java/ca/spottedleaf/moonrise/common/PlatformHooks.java

@@ -31,10 +31,6 @@ public interface PlatformHooks extends ChunkSystemHooks {
 
     public String getBrand();
 
-    public default boolean isModLoaded(final String modId) {
-        return false;
-    }
-
     public int getLightEmission(final BlockState blockState, final BlockGetter world, final BlockPos pos);
 
     public Predicate<BlockState> maybeHasLightEmission();

src/main/java/ca/spottedleaf/moonrise/common/util/BaseChunkSystemHooks.java

@@ -1,13 +1,11 @@
 package ca.spottedleaf.moonrise.common.util;
 
 import ca.spottedleaf.concurrentutil.util.Priority;
-import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemLevelChunk;
 import ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader;
 import ca.spottedleaf.moonrise.patches.chunk_system.world.ChunkSystemServerChunkCache;
 import ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel;
-import ca.spottledleaf.moonrise.compat.lithium.LithiumHooks;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.FullChunkStatus;
 import net.minecraft.server.level.ServerLevel;
@@ -21,8 +19,6 @@ import java.util.function.Consumer;
 
 public abstract class BaseChunkSystemHooks implements ChunkSystemHooks {
 
-    private final boolean hasLithium = ((PlatformHooks)this).isModLoaded("lithium");
-
     @Override
     public void scheduleChunkTask(final ServerLevel level, final int chunkX, final int chunkZ, final Runnable run) {
         scheduleChunkTask(level, chunkX, chunkZ, run, Priority.NORMAL);
@@ -105,9 +101,6 @@ public abstract class BaseChunkSystemHooks implements ChunkSystemHooks {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getLoadedChunks().add(
             ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
-        if (this.hasLithium) {
-            LithiumHooks.onChunkAccessible((ServerLevel) chunk.getLevel(), chunk);
-        }
     }
 
     @Override
@@ -115,9 +108,6 @@ public abstract class BaseChunkSystemHooks implements ChunkSystemHooks {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getLoadedChunks().remove(
             ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
-        if (this.hasLithium) {
-            LithiumHooks.onChunkInaccessible((ServerLevel) chunk.getLevel(), chunk.getPos());
-        }
     }
 
     @Override

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/EntityGetterMixin.java

@@ -74,7 +74,7 @@ interface EntityGetterMixin {
     @Overwrite
     default boolean isUnobstructed(final Entity entity, final VoxelShape voxel) {
         if (voxel.isEmpty()) {
-            return false;
+            return true;
         }
 
         final AABB singleAABB = ((CollisionVoxelShape)voxel).moonrise$getSingleAABBRepresentation();

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java

@@ -55,7 +55,7 @@ abstract class LevelMixin implements LevelAccessor, AutoCloseable {
     public boolean isUnobstructed(final Entity entity) {
         final AABB boundingBox = entity.getBoundingBox();
         if (CollisionUtil.isEmpty(boundingBox)) {
-            return false;
+            return true;
         }
 
         final List<Entity> entities = this.getEntities(