2.0.0-alpha.4.1 (#203)

* Switched from HMI to RetroCommands

* Removed broken reimplementation of Divisor's old PlayerAPI. (#139)

* Removed Indigo renderer (#140)

* Updated UnsafeEvents

* ContextVariable

* ContextVariable#get

* Feature/register helper (#146)

* Added register helper methods to RegistryEvent

* Remove unused BulkConsumer.

* Updated all registries to be entry type bound.

* Updated all usages of Registry#register to new helper methods where applicable.

* Moved bulk registration helpers implementation to Registry interface and redirected event method helpers to that.

* Swapped namespace and rawIdGetter placements so they better reflect the original method arguments.

* cleanup/java-hacks (#145)

* Cleaned up Java hacks related to entrypoints

* Removed EnumFactory.

* Removed NativeImage Unsafe buffer cleaner invocation.

* Replaced fake BlockItem with null, since MixinExtras allows that, unlike vanilla Mixin's Redirect.

* Removed UnsafeProvider.

* Updated javadoc for EntrypointManager#registerLookup

* Fix a NPE in shears override

* Fix a NPE in FuelRegistry

* Added StationFlatteningBlock#onStateReplaced

* Fixed #159

* Change version

* Merge pull request #165 from ThexXTURBOXx/develop

Don't close filesystems when resolving mod namespaces

* Update modmenu

* Merge pull request #168

* Yeet

* Wait this is wrong

* Merge branch 'develop' into namespace-change

* Make stapi get angree (#169)

* Update BiomeMixin.java (#196)

* Add Block Support to CustomTooltipProvider (#187)

* Add Block support to CustomTooltipProvider

* Add some documentation to the interface

* Make Leaves' Log Check Work With Modded Logs and Leaves (#186)

* Fix

* And comment this out cause it's ugly

* Fix (#185)

* FUCK (#200)

* Why mine (#197)

* Potentially make mine scream (#188)

* Implement onBonemealUse on Vanilla Crops (#170)

* Yeet

* Also do sapling, also fix multiplayer

* Use the appropriate random

---------

Co-authored-by: mineLdiver <aabesedin@mail.ru>

* Fixed cal L moment (cascaded test worldgen)

* Change version

---------

Co-authored-by: Nico Mexis <nico.mexis@kabelmail.de>
Co-authored-by: calmilamsy <bumbill00@gmail.com>

Author: 3 people

gradle.properties

@@ -22,10 +22,10 @@ fabric.loom.multiProjectOptimisation=true
     spasm_version = 0.2.2
 
 # Mod Properties
-    mod_version = 2.0.0-alpha.4
+    mod_version = 2.0.0-alpha.4.1
     maven_group = net.modificationstation
     archives_base_name = StationAPI
 
 # Test properties
-    modmenu_version = 1.8.5-beta.9
+    modmenu_version = 1.8.5-beta.11
     rc_version = 0.5.4

src/test/java/net/modificationstation/sltest/block/Blocks.java

@@ -7,6 +7,8 @@
 import net.modificationstation.stationapi.api.event.registry.BlockRegistryEvent;
 import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
 import net.modificationstation.stationapi.api.template.block.TemplateBlock;
+import net.modificationstation.stationapi.api.template.block.TemplateLeavesBlock;
+import net.modificationstation.stationapi.api.template.block.TemplateLogBlock;
 import net.modificationstation.stationapi.api.util.Identifier;
 
 import java.lang.invoke.MethodHandles;
@@ -25,7 +27,9 @@ public enum Blocks {
     ALTAR("altar", "altar", id -> new BlockAltar(id, Material.STONE).setHardness(3)),
     VARIATION_BLOCK("variation_block", "variationBlock", id -> new VariationBlock(id, Material.STONE).setHardness(.5F).setSoundGroup(Block.DEFAULT_SOUND_GROUP).disableAutoItemRegistration()),
     EMISSION_CHECKER("emission_checker", "emissionChecker", LampBlock::new),
-    INDISPENSABLE_BLOCK("indispensable_block", "indispensableBlock", IndispensableBlock::new);
+    INDISPENSABLE_BLOCK("indispensable_block", "indispensableBlock", IndispensableBlock::new),
+    MODDED_LEAVES("modded_leaves", "moddedLeaves", id -> new TemplateLeavesBlock(id, 52)),
+    MODDED_LOG("modded_log", "moddedLog", TemplateLogBlock::new);
 
     private final Runnable register;
     private Block block;

src/test/java/net/modificationstation/sltest/level/gen/ChunkListener.java

@@ -1,6 +1,8 @@
 package net.modificationstation.sltest.level.gen;
 
 import net.mine_diver.unsafeevents.listener.EventListener;
+import net.minecraft.block.Block;
+import net.modificationstation.sltest.block.Blocks;
 import net.modificationstation.stationapi.api.event.world.gen.WorldGenEvent;
 
 public class ChunkListener {
@@ -11,5 +13,10 @@ public void populate(WorldGenEvent.ChunkDecoration event) {
 //            for (int z = 0; z < 16; z++)
 //                if ((event.biome == Biome.FOREST || event.biome == Biome.SEASONAL_FOREST) && event.random.nextBoolean())
 //                    event.level.setTile(event.x + x, 90, event.z + z, BlockBase.DIAMOND_BLOCK.id);
+        // Modded leaves and log test
+        event.world.setBlock(event.x + 8, 100, event.z + 8, Blocks.MODDED_LOG.get().id);
+//        event.world.setBlock(event.x + 1, 100, event.z, Block.LEAVES.id);
+//        event.world.setBlock(event.x + 2, 100, event.z, Blocks.MODDED_LEAVES.get().id);
+//        event.world.setBlock(event.x + 3, 100, event.z, Block.LEAVES.id);
     }
 }

station-api-base/src/main/java/net/modificationstation/stationapi/api/util/Namespace.java

@@ -25,17 +25,18 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
+import java.util.Collections;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
+import java.util.zip.ZipError;
 
 @Slf4j
 public final class Namespace implements Comparable<@NotNull Namespace> {
     private static final boolean CHECK_MISSING_MODS = false;
+    private static final Map<String, String> CREATE_FILESYSTEM_ARGS = Collections.singletonMap("create", "true");
 
     @NotNull
     private static final Cache<@NotNull String, @NotNull Namespace> CACHE = Caffeine.newBuilder().softValues().build();
@@ -77,9 +78,24 @@ public final class Namespace implements Comparable<@NotNull Namespace> {
                     // i'm so sorry
                     if (Files.isRegularFile(callerPath)) { // regular case
                         final URI callerRoot;
-                        try (val fs = FileSystems.newFileSystem(callerPath)) {
+                        val uri = callerPath.toUri();
+                        try {
+                            FileSystem fs;
+                            boolean created = false;
+                            val jarUri = new URI("jar:" + uri.getScheme(), uri.getHost(), uri.getPath(), uri.getFragment());
+                            try {
+                                fs = FileSystems.newFileSystem(jarUri, CREATE_FILESYSTEM_ARGS);
+                                created = true;
+                            } catch (FileSystemAlreadyExistsException ignore2) {
+                                fs = FileSystems.getFileSystem(jarUri);
+                            } catch (IOException | ZipError e) {
+                                throw new IOException("Error accessing " + uri + ": " + e, e);
+                            }
                             callerRoot = fs.getPath("/").toUri();
-                        } catch (IOException e) {
+                            if (created) {
+                                fs.close();
+                            }
+                        } catch (IOException | URISyntaxException e) {
                             throw new RuntimeException(e);
                         }
                         candidates = mods

station-blocks-v0/src/main/java/net/modificationstation/stationapi/api/registry/tag/BlockTags.java

@@ -11,6 +11,7 @@
 public final class BlockTags {
     public static final TagKey<Block>
             LOGS = of("logs"),
+            LEAVES = of("leaves"),
             PLANKS = of("planks"),
             INFINIBURN = of("infiniburn");
 

station-blocks-v0/src/main/java/net/modificationstation/stationapi/mixin/block/LeavesBlockMixin.java

@@ -0,0 +1,28 @@
+package net.modificationstation.stationapi.mixin.block;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.block.Block;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.world.World;
+import net.modificationstation.stationapi.api.block.BlockState;
+import net.modificationstation.stationapi.api.registry.tag.BlockTags;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(LeavesBlock.class)
+public class LeavesBlockMixin {
+
+    @WrapOperation(method = "onTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockId(III)I"))
+    private int makeModdedLogsAndLeavesWork(World instance, int x, int y, int z, Operation<Integer> original) {
+        BlockState state = instance.getBlockState(x, y, z);
+        if (state.isIn(BlockTags.LOGS)) {
+            return Block.LOG.id;
+        }
+        if (state.isIn(BlockTags.LEAVES)) {
+            return Block.LEAVES.id;
+        }
+
+        return original.call(instance, x, y, z);
+    }
+}

station-blocks-v0/src/main/resources/station-blocks-v0.mixins.json

@@ -7,6 +7,7 @@
     "BlockItemMixin",
     "BlockMixin",
     "FireBlockMixin",
+    "LeavesBlockMixin",
     "SecondaryBlockItemMixin",
     "StatsMixin"
   ],

station-flattening-v0/src/main/java/net/modificationstation/stationapi/impl/world/StationClientWorld.java

@@ -0,0 +1,5 @@
+package net.modificationstation.stationapi.impl.world;
+
+public interface StationClientWorld {
+    boolean stationAPI$isModded();
+}

station-flattening-v0/src/main/java/net/modificationstation/stationapi/impl/world/chunk/FlattenedChunk.java

@@ -11,6 +11,7 @@
 import net.minecraft.world.LightType;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.dimension.Dimension;
 import net.modificationstation.stationapi.api.StationAPI;
 import net.modificationstation.stationapi.api.block.BlockState;
 import net.modificationstation.stationapi.api.block.States;
@@ -144,7 +145,7 @@ public void setLight(LightType type, int x, int y, int z, int light) {
     @Override
     public int getLight(int x, int y, int z, int light) {
         ChunkSection section = getSection(y);
-        int lightLevel = section == null ? 15 : section.getLight(LightType.SKY, x, y & 15, z);
+        int lightLevel = section == null ? (world.dimension.field_2177 /* hasCeiling */ ? 0 : 15) : section.getLight(LightType.SKY, x, y & 15, z);
         if (lightLevel > 0) {
             field_953 = true;
         }

station-flattening-v0/src/main/java/net/modificationstation/stationapi/mixin/flattening/CaveGenBaseMixin.java

@@ -20,6 +20,9 @@ public void stationapi_setWorld(World world) {
     @Override
     @Unique
     public World stationapi_getWorld() {
+        if (stationapi_world == null) {
+            throw new RuntimeException("stationapi_world is null, use CaveGenBaseImpl.stationapi_setWorld in your custom ChunkSource constructor to fix.");
+        }
         return stationapi_world;
     }
 }