ruined arena

new ant sacrifice portals
dorrie overhaul
new foliage in overworld biomes

fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java

@@ -169,6 +169,10 @@ public final class AntarchyConfigModuleFabric {
         private static boolean isMiscSetting(String name) {
             return name.equals("disableInfinityBookPortalCreation")
                     || name.equals("rainbowAntsLeadToInfinityDimensions")
+                    || name.equals("permanentPortalsEnabled")
+                    || name.equals("elythiaPortalEnabled")
+                    || name.equals("thoraxisPortalEnabled")
+                    || name.equals("cavarynPortalEnabled")
                     || name.equals("hushweedSporeLifetimeSeconds")
                     || name.equals("elythiaFireflyParticlesEnabled")
                     || name.equals("duplicatorTreeEnabled")

fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabric.java

@@ -38,6 +38,46 @@ public final class AntarchyFabric implements ModInitializer {
             Registries.BIOME,
             ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "mantis_overworld_spawn_biomes")
     );
+    private static final TagKey<net.minecraft.world.level.biome.Biome> VERY_SHORT_GRASS_SPAWN_BIOMES = TagKey.create(
+            Registries.BIOME,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_short_grass_spawn_biomes")
+    );
+    private static final TagKey<net.minecraft.world.level.biome.Biome> VERY_TALL_GRASS_SPAWN_BIOMES = TagKey.create(
+            Registries.BIOME,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_tall_grass_spawn_biomes")
+    );
+    private static final TagKey<net.minecraft.world.level.biome.Biome> BIG_BUSH_SPAWN_BIOMES = TagKey.create(
+            Registries.BIOME,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_spawn_biomes")
+    );
+    private static final TagKey<net.minecraft.world.level.biome.Biome> BIG_BUSH_2X2_SPAWN_BIOMES = TagKey.create(
+            Registries.BIOME,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_2x2_spawn_biomes")
+    );
+    private static final TagKey<net.minecraft.world.level.biome.Biome> MEGA_TAIGA_SPAWN_BIOMES = TagKey.create(
+            Registries.BIOME,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "mega_taiga_spawn_biomes")
+    );
+    private static final ResourceKey<PlacedFeature> VERY_SHORT_GRASS_FEATURE = ResourceKey.create(
+            Registries.PLACED_FEATURE,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_short_grass")
+    );
+    private static final ResourceKey<PlacedFeature> VERY_TALL_GRASS_FEATURE = ResourceKey.create(
+            Registries.PLACED_FEATURE,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "very_tall_grass")
+    );
+    private static final ResourceKey<PlacedFeature> BIG_BUSH_FEATURE = ResourceKey.create(
+            Registries.PLACED_FEATURE,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush")
+    );
+    private static final ResourceKey<PlacedFeature> BIG_BUSH_2X2_FEATURE = ResourceKey.create(
+            Registries.PLACED_FEATURE,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_2x2")
+    );
+    private static final ResourceKey<PlacedFeature> BIG_BUSH_3X3_FEATURE = ResourceKey.create(
+            Registries.PLACED_FEATURE,
+            ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "big_bush_3x3")
+    );
 
     @Override
     public void onInitialize() {
@@ -91,5 +131,30 @@ public final class AntarchyFabric implements ModInitializer {
                 AntarchyFabricContent.ALPHA_MANTIS.get(),
                 1, 1, 1
         );
+        BiomeModifications.addFeature(
+                BiomeSelectors.tag(VERY_SHORT_GRASS_SPAWN_BIOMES),
+                GenerationStep.Decoration.VEGETAL_DECORATION,
+                VERY_SHORT_GRASS_FEATURE
+        );
+        BiomeModifications.addFeature(
+                BiomeSelectors.tag(VERY_TALL_GRASS_SPAWN_BIOMES),
+                GenerationStep.Decoration.VEGETAL_DECORATION,
+                VERY_TALL_GRASS_FEATURE
+        );
+        BiomeModifications.addFeature(
+                BiomeSelectors.tag(BIG_BUSH_SPAWN_BIOMES),
+                GenerationStep.Decoration.VEGETAL_DECORATION,
+                BIG_BUSH_FEATURE
+        );
+        BiomeModifications.addFeature(
+                BiomeSelectors.tag(BIG_BUSH_2X2_SPAWN_BIOMES),
+                GenerationStep.Decoration.VEGETAL_DECORATION,
+                BIG_BUSH_2X2_FEATURE
+        );
+        BiomeModifications.addFeature(
+                BiomeSelectors.tag(MEGA_TAIGA_SPAWN_BIOMES),
+                GenerationStep.Decoration.VEGETAL_DECORATION,
+                BIG_BUSH_3X3_FEATURE
+        );
     }
 }

fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java

@@ -168,6 +168,7 @@ import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisSpikeConfigura
 import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisSpikeFeature;
 import com.craisinlord.antarchy.content.client.particle.InvertedGeyserBaseParticleOptions;
 import com.craisinlord.antarchy.content.client.particle.InvertedGeyserParticleOptions;
+import com.craisinlord.antarchy.content.portal.PermanentPortalType;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -519,6 +520,10 @@ public final class AntarchyFabricContent {
             () -> new OuranwoodLeavesBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).randomTicks()));
     public static final DeferredBlock<OuranwoodAcornBlock> OURANWOOD_ACORN_BLOCK = BLOCKS.register("ouranwood_acorn",
             () -> new OuranwoodAcornBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SAPLING).randomTicks().noCollission()));
+    // public static final DeferredBlock<OuranwoodVineBlock> OURANWOOD_VINE = BLOCKS.register("ouranwood_vine",
+    //         () -> OURANWOOD_VINE_INSTANCE);
+    // public static final DeferredBlock<OuranwoodVinePlantBlock> OURANWOOD_VINE_PLANT = BLOCKS.register("ouranwood_vine_plant",
+    //         () -> OURANWOOD_VINE_PLANT_INSTANCE);
     public static final DeferredBlock<MilkweedBlock> ORANGE_MILKWEED = BLOCKS.register("orange_milkweed",
             () -> new MilkweedBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY)));
     public static final DeferredBlock<MilkweedBlock> PINK_MILKWEED = BLOCKS.register("pink_milkweed",
@@ -636,6 +641,12 @@ public final class AntarchyFabricContent {
                     AntarchyFabricContent::cloudBucketItem,
                     BlockBehaviour.Properties.ofFullCopy(Blocks.POWDER_SNOW).noLootTable().noOcclusion()
             ));
+    public static final DeferredBlock<AntDimensionPortalBlock> ELYTHIA_PORTAL = BLOCKS.register("elythia_portal",
+            () -> new AntDimensionPortalBlock(PermanentPortalType.ELYTHIA, portalProperties()));
+    public static final DeferredBlock<AntDimensionPortalBlock> THORAXIS_PORTAL = BLOCKS.register("thoraxis_portal",
+            () -> new AntDimensionPortalBlock(PermanentPortalType.THORAXIS, portalProperties()));
+    public static final DeferredBlock<AntDimensionPortalBlock> CAVARYN_PORTAL = BLOCKS.register("cavaryn_portal",
+            () -> new AntDimensionPortalBlock(PermanentPortalType.CAVARYN, portalProperties()));
     public static final DeferredBlock<Block> PALE_NYXITE = BLOCKS.register("pale_nyxite",
             () -> new Block(nyxiteProperties()));
     public static final DeferredBlock<NyxiteSpikeBlock> NYXITE_SPIKE = BLOCKS.register("nyxite_spike",
@@ -1103,6 +1114,12 @@ public final class AntarchyFabricContent {
             () -> new ElythiaFloraFeature(NoneFeatureConfiguration.CODEC, ElythiaFloraFeature.Variant.TORCHFLOWER_FIELDS));
     public static final DeferredHolder<Feature<?>, ElythiaSurfaceCoverFeature> ELYTHIA_SURFACE_COVER = FEATURES.register("elythia_surface_cover",
             () -> new ElythiaSurfaceCoverFeature(NoneFeatureConfiguration.CODEC));
+    public static final DeferredHolder<Feature<?>, com.craisinlord.antarchy.content.worldgen.VeryTallGrassWorldgenFeature> VERY_TALL_GRASS_FEATURE = FEATURES.register("very_tall_grass",
+            () -> new com.craisinlord.antarchy.content.worldgen.VeryTallGrassWorldgenFeature(NoneFeatureConfiguration.CODEC));
+    public static final DeferredHolder<Feature<?>, com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature> BIG_BUSH_2X2_FEATURE = FEATURES.register("big_bush_2x2",
+            () -> new com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature(NoneFeatureConfiguration.CODEC, 1));
+    public static final DeferredHolder<Feature<?>, com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature> BIG_BUSH_3X3_FEATURE = FEATURES.register("big_bush_3x3",
+            () -> new com.craisinlord.antarchy.content.worldgen.BigBushWorldgenFeature(NoneFeatureConfiguration.CODEC, 2));
     public static final DeferredHolder<Feature<?>, ElythiaUndergroundFeature> ELYTHIA_UNDERGROUND = FEATURES.register("elythia_underground",
             () -> new ElythiaUndergroundFeature(NoneFeatureConfiguration.CODEC));
     public static final DeferredHolder<Feature<?>, BrutalflyCocoonFeature> BRUTALFLY_COCOON = FEATURES.register("brutalfly_cocoon",
@@ -1192,6 +1209,7 @@ public final class AntarchyFabricContent {
     public static final DeferredItem<net.minecraft.world.item.BlockItem> OURANWOOD_BUTTON_ITEM = ITEMS.registerSimpleBlockItem(OURANWOOD_BUTTON);
     public static final DeferredItem<net.minecraft.world.item.BlockItem> OURANWOOD_LEAVES_ITEM = ITEMS.registerSimpleBlockItem(OURANWOOD_LEAVES);
     public static final DeferredItem<net.minecraft.world.item.BlockItem> OURANWOOD_ACORN = ITEMS.registerSimpleBlockItem(OURANWOOD_ACORN_BLOCK);
+    // public static final DeferredItem<net.minecraft.world.item.BlockItem> OURANWOOD_VINE_ITEM = ITEMS.registerSimpleBlockItem(OURANWOOD_VINE);
     public static final DeferredItem<net.minecraft.world.item.BlockItem> VERY_SHORT_GRASS_ITEM = ITEMS.registerSimpleBlockItem(VERY_SHORT_GRASS);
     public static final DeferredItem<net.minecraft.world.item.BlockItem> VERY_TALL_GRASS_ITEM = ITEMS.registerSimpleBlockItem(VERY_TALL_GRASS);
     public static final DeferredItem<net.minecraft.world.item.BlockItem> BIG_BUSH_ITEM = ITEMS.register("big_bush",
@@ -2173,6 +2191,13 @@ public final class AntarchyFabricContent {
         return BLOOD_CRYSTAL_CRYSTAL.get();
     }
 
+    // private static OuranwoodVinePlantBlock createOuranwoodVinePlant() {
+    //     OuranwoodVinePlantBlock.bindHeadBlock(OURANWOOD_VINE_INSTANCE);
+    //     OuranwoodVinePlantBlock block = new OuranwoodVinePlantBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WEEPING_VINES_PLANT));
+    //     OuranwoodVineBlock.bindBodyBlock(block);
+    //     return block;
+    // }
+
     private static Block createDirtOre(Block copyFrom) {
         return new Block(dirtOreProperties());
     }
@@ -2192,6 +2217,17 @@ public final class AntarchyFabricContent {
         return BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERRACK);
     }
 
+    private static BlockBehaviour.Properties portalProperties() {
+        return BlockBehaviour.Properties.of()
+                .strength(-1.0F)
+                .noCollission()
+                .noOcclusion()
+                .lightLevel(state -> 11)
+                .noLootTable()
+                .isSuffocating((state, level, pos) -> false)
+                .isViewBlocking((state, level, pos) -> false);
+    }
+
     private static Block createOre(Block copyFrom) {
         return new Block(BlockBehaviour.Properties.ofFullCopy(copyFrom).requiresCorrectToolForDrops());
     }
@@ -2419,6 +2455,14 @@ public final class AntarchyFabricContent {
 
         // Wire common-module accessors after all registrations are complete.
         AntarchyObjects.setHerculesBeetle(() -> HERCULES_BEETLE.get());
+        PermanentPortalType.bindBlocks(
+                () -> MOSSY_OURANWOOD_WOOD.get(),
+                () -> ELYTHIA_PORTAL.get(),
+                () -> NYXITE.get(),
+                () -> THORAXIS_PORTAL.get(),
+                () -> MYRMITE.get(),
+                () -> CAVARYN_PORTAL.get()
+        );
 
         AntarchySoundEvents.bind(
                 SQUIDZOOKA_FIRE,

fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java

@@ -10,6 +10,7 @@ import com.craisinlord.antarchy.content.entity.kraken.KrakenEntity;
 import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi;
 import com.craisinlord.antarchy.content.gravity.AntarchyGravityDirection;
 import com.craisinlord.antarchy.content.gravity.AntarchyGravityTransition;
+import com.craisinlord.antarchy.content.portal.PermanentPortalManager;
 import com.craisinlord.antarchy.content.command.CaterpillarCommand;
 import com.craisinlord.antarchy.content.command.GravityCommand;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@@ -64,6 +65,7 @@ public final class AntarchyFabricEvents {
             if (entity instanceof ServerPlayer sp) {
                 BloodglassManager.handleDeath(sp);
             }
+            PermanentPortalManager.handleSacrifice(entity);
             if (entity instanceof MissileSquidEntity missileSquid) {
                 if (missileSquid.isSpawnedByKraken()) {
                     return;

fabric/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java

@@ -223,6 +223,8 @@ public final class AntarchyFabricClientBootstrap {
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.OURANWOOD_DOOR.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.OURANWOOD_TRAPDOOR.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.OURANWOOD_ACORN_BLOCK.get(), RenderType.cutout());
+        // BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.OURANWOOD_VINE.get(), RenderType.cutout());
+        // BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.OURANWOOD_VINE_PLANT.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.DUPLICATOR_SAPLING.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.ORANGE_MILKWEED.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.PINK_MILKWEED.get(), RenderType.cutout());
@@ -253,6 +255,9 @@ public final class AntarchyFabricClientBootstrap {
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.DREAM_FIRE.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.DREAM_CEILING_FIRE.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.ANTIWATER_BLOCK.get(), RenderType.translucent());
+        BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.ELYTHIA_PORTAL.get(), RenderType.translucent());
+        BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.THORAXIS_PORTAL.get(), RenderType.translucent());
+        BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.CAVARYN_PORTAL.get(), RenderType.translucent());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.TRIFFID_GOO_BLOCK.get(), RenderType.translucent());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.URANIUM_DOOR.get(), RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricContent.TITANIUM_DOOR.get(), RenderType.cutout());