Added Empyreal Wood, more work on End Biomes

Glitchfiend · Jan 14, 2024 · a6e7266 · a6e7266
1 parent 3fd887e
commit a6e7266
Show file tree

Hide file tree

Showing 234 changed files with 2,293 additions and 219 deletions.
diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-14T10:15:31.5981195	Registries
+// 1.20.4	2024-01-14T14:06:30.6167642	Registries
 bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
 41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
 1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
@@ -13,9 +13,7 @@ d0c0bdd9fc7b09e7d046e35faea8cc6d752b468a data/biomesoplenty/worldgen/biome/crag.
 401cb408a8b99f3fd8b696f9759d9f1f8a1a945e data/biomesoplenty/worldgen/biome/dead_forest.json
 506de7d82a9bf0a7caea3390590dc9d1fa2028b0 data/biomesoplenty/worldgen/biome/dryland.json
 d4a9226ceaef3cf4eed45892e027c1eabf9fcd72 data/biomesoplenty/worldgen/biome/dune_beach.json
-253f26c8caa759d436ace9d8d5fe7ddc55ee4f8c data/biomesoplenty/worldgen/biome/end_aeries.json
 1d2989a8aed931ff5de5fabff53cd9014d8f0c21 data/biomesoplenty/worldgen/biome/end_corruption.json
-253f26c8caa759d436ace9d8d5fe7ddc55ee4f8c data/biomesoplenty/worldgen/biome/end_drifts.json
 32b9b82ab839f70df725c3aceaf2ea2a0bb2cbd3 data/biomesoplenty/worldgen/biome/end_reef.json
 01773716ee0f40a49bb0f57b9abd91d5195f0be2 data/biomesoplenty/worldgen/biome/end_wilds.json
 a89d541384f1a879bb82d9c984d98c512474d27c data/biomesoplenty/worldgen/biome/erupting_inferno.json
@@ -347,7 +345,7 @@ c548e3e1710931daabe90c90b6b7ad46c66bedda data/biomesoplenty/worldgen/configured_
 5b240cfa80edf39078866602b63410068a2dae30 data/biomesoplenty/worldgen/placed_feature/acacia_twiglet_small.json
 0381b44f5e62e5796b4a89805d3c337730562c51 data/biomesoplenty/worldgen/placed_feature/anomaly.json
 176edb4fcaa5785050c8543834fc6c30848fe124 data/biomesoplenty/worldgen/placed_feature/aspen_tree.json
-262fcb297eaf8332542e67df044ed67d3c6f9211 data/biomesoplenty/worldgen/placed_feature/barnacles.json
+be901a659bb8f63b29dfd8cb8c85b0b2f2793ec9 data/biomesoplenty/worldgen/placed_feature/barnacles.json
 7395a3d04e360d03dc998ebc9cf6b8d66e41433d data/biomesoplenty/worldgen/placed_feature/big_dripleaf.json
 ea928d87f641694fd67f7dd56ffb25f2cf02d033 data/biomesoplenty/worldgen/placed_feature/big_flowering_tree.json
 0e5d77a2ea27daea073139ed83382706b1562332 data/biomesoplenty/worldgen/placed_feature/big_hellbark_tree.json
@@ -375,7 +373,7 @@ ea74748c10a9cb9224fc0be2822956acc94867a1 data/biomesoplenty/worldgen/placed_feat
 5c6e712bb74bc268bb6659e0f73e7797fdb2d353 data/biomesoplenty/worldgen/placed_feature/cypress_tree.json
 195481b0426113a9bcaf519cc9064cbebf8507b4 data/biomesoplenty/worldgen/placed_feature/cypress_tree_medium.json
 4143fbe4921960b7c766593a0c0fb4bef8c2e88a data/biomesoplenty/worldgen/placed_feature/dark_oak_poplar_tree.json
-bd6c74a95487b39da5b3d9ff003d485685b547c9 data/biomesoplenty/worldgen/placed_feature/dead_coral.json
+4fc8f62355f448dd4f4cf4787f8c4779df0193c6 data/biomesoplenty/worldgen/placed_feature/dead_coral.json
 491adc1fc84802b69d5bb5800507d773cb23e54b data/biomesoplenty/worldgen/placed_feature/dead_grass_45.json
 cec9215a5d9f08511ddbddd59bec252ce4c4d204 data/biomesoplenty/worldgen/placed_feature/dead_tree_wasteland.json
 57486a3dd4ba0cb77a463c588a2af146eb586b40 data/biomesoplenty/worldgen/placed_feature/dead_twiglet_tree.json

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_aeries.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_aeries.json
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_drifts.json b/common/src/generated/resources/data/biomesoplenty/worldgen/biome/end_drifts.json
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/barnacles.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/barnacles.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 4
+      "count": 3
     },
     {
       "type": "minecraft:in_square"

diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/dead_coral.json b/common/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/dead_coral.json
@@ -2,10 +2,8 @@
   "feature": "biomesoplenty:dead_coral",
   "placement": [
     {
-      "type": "minecraft:noise_based_count",
-      "noise_factor": 400.0,
-      "noise_offset": 0.0,
-      "noise_to_count_ratio": 20
+      "type": "minecraft:count",
+      "count": 2
     },
     {
       "type": "minecraft:in_square"

diff --git a/common/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/common/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
@@ -33,8 +33,6 @@ public class BOPBiomes
     public static final ResourceKey<Biome> DUNE_BEACH = registerOverworld("dune_beach");
     public static final ResourceKey<Biome> END_WILDS = registerOverworld("end_wilds");
     public static final ResourceKey<Biome> END_REEF = registerOverworld("end_reef");
-    public static final ResourceKey<Biome> END_DRIFTS = registerOverworld("end_drifts");
-    public static final ResourceKey<Biome> END_AERIES = registerOverworld("end_aeries");
     public static final ResourceKey<Biome> END_CORRUPTION = registerOverworld("end_corruption");
     public static final ResourceKey<Biome> ERUPTING_INFERNO = register("erupting_inferno");
     public static final ResourceKey<Biome> FIELD = registerOverworld("field");

diff --git a/common/src/main/java/biomesoplenty/api/block/BOPBlockSetTypes.java b/common/src/main/java/biomesoplenty/api/block/BOPBlockSetTypes.java
@@ -23,4 +23,5 @@ public class BOPBlockSetTypes
     public static final BlockSetType MAGIC = register(new BlockSetType(BOPAPI.MOD_ID + ":magic"));
     public static final BlockSetType UMBRAN = register(new BlockSetType(BOPAPI.MOD_ID + ":umbran"));
     public static final BlockSetType HELLBARK = register(new BlockSetType(BOPAPI.MOD_ID + ":hellbark"));
+    public static final BlockSetType EMPYREAL = register(new BlockSetType(BOPAPI.MOD_ID + ":empyreal"));
 }
diff --git a/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/common/src/main/java/biomesoplenty/api/block/BOPBlocks.java
@@ -343,6 +343,25 @@ public class BOPBlocks
     public static Block HELLBARK_WALL_SIGN;
     public static Block HELLBARK_HANGING_SIGN;
     public static Block HELLBARK_WALL_HANGING_SIGN;
+    public static Block EMPYREAL_SAPLING;
+    public static Block EMPYREAL_LEAVES;
+    public static Block EMPYREAL_LOG;
+    public static Block STRIPPED_EMPYREAL_LOG;
+    public static Block EMPYREAL_WOOD;
+    public static Block STRIPPED_EMPYREAL_WOOD;
+    public static Block EMPYREAL_PLANKS;
+    public static Block EMPYREAL_SLAB;
+    public static Block EMPYREAL_STAIRS;
+    public static Block EMPYREAL_FENCE;
+    public static Block EMPYREAL_FENCE_GATE;
+    public static Block EMPYREAL_DOOR;
+    public static Block EMPYREAL_TRAPDOOR;
+    public static Block EMPYREAL_PRESSURE_PLATE;
+    public static Block EMPYREAL_BUTTON;
+    public static Block EMPYREAL_SIGN;
+    public static Block EMPYREAL_WALL_SIGN;
+    public static Block EMPYREAL_HANGING_SIGN;
+    public static Block EMPYREAL_WALL_HANGING_SIGN;
 
     public static Block ROSE;
     public static Block VIOLET;
@@ -405,6 +424,7 @@ public class BOPBlocks
     public static Block POTTED_MAGIC_SAPLING;
     public static Block POTTED_UMBRAN_SAPLING;
     public static Block POTTED_HELLBARK_SAPLING;
+    public static Block POTTED_EMPYREAL_SAPLING;
     public static Block POTTED_ROSE;
     public static Block POTTED_VIOLET;
     public static Block POTTED_LAVENDER;

diff --git a/common/src/main/java/biomesoplenty/api/block/BOPWoodTypes.java b/common/src/main/java/biomesoplenty/api/block/BOPWoodTypes.java
@@ -23,4 +23,5 @@ public class BOPWoodTypes
     public static final WoodType MAGIC = register(new WoodType(BOPAPI.MOD_ID + ":magic", BOPBlockSetTypes.MAGIC));
     public static final WoodType UMBRAN = register(new WoodType(BOPAPI.MOD_ID + ":umbran", BOPBlockSetTypes.UMBRAN));
     public static final WoodType HELLBARK = register(new WoodType(BOPAPI.MOD_ID + ":hellbark", BOPBlockSetTypes.HELLBARK));
+    public static final WoodType EMPYREAL = register(new WoodType(BOPAPI.MOD_ID + ":empyreal", BOPBlockSetTypes.EMPYREAL));
 }
diff --git a/common/src/main/java/biomesoplenty/api/item/BOPItems.java b/common/src/main/java/biomesoplenty/api/item/BOPItems.java
@@ -362,6 +362,26 @@ public class BOPItems
     public static Item HELLBARK_BOAT;
     public static Item HELLBARK_CHEST_BOAT;
 
+    public static Item EMPYREAL_SAPLING;
+    public static Item EMPYREAL_LEAVES;
+    public static Item EMPYREAL_LOG;
+    public static Item STRIPPED_EMPYREAL_LOG;
+    public static Item EMPYREAL_WOOD;
+    public static Item STRIPPED_EMPYREAL_WOOD;
+    public static Item EMPYREAL_PLANKS;
+    public static Item EMPYREAL_SLAB;
+    public static Item EMPYREAL_STAIRS;
+    public static Item EMPYREAL_FENCE;
+    public static Item EMPYREAL_FENCE_GATE;
+    public static Item EMPYREAL_DOOR;
+    public static Item EMPYREAL_TRAPDOOR;
+    public static Item EMPYREAL_PRESSURE_PLATE;
+    public static Item EMPYREAL_BUTTON;
+    public static Item EMPYREAL_SIGN;
+    public static Item EMPYREAL_HANGING_SIGN;
+    public static Item EMPYREAL_BOAT;
+    public static Item EMPYREAL_CHEST_BOAT;
+
     public static Item ROSE;
     public static Item VIOLET;
     public static Item LAVENDER;
@@ -423,6 +443,7 @@ public class BOPItems
     public static Item POTTED_MAGIC_SAPLING;
     public static Item POTTED_UMBRAN_SAPLING;
     public static Item POTTED_HELLBARK_SAPLING;
+    public static Item POTTED_EMPYREAL_SAPLING;
     public static Item POTTED_ROSE;
     public static Item POTTED_VIOLET;
     public static Item POTTED_LAVENDER;

diff --git a/common/src/main/java/biomesoplenty/biome/BOPEndBiomes.java b/common/src/main/java/biomesoplenty/biome/BOPEndBiomes.java
@@ -54,20 +54,6 @@ public static Biome endReef(HolderGetter<PlacedFeature> placedFeatureGetter, Hol
         return baseEndBiome(biomeBuilder);
     }
 
-    public static Biome endDrifts(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
-    {
-        BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
-        biomeBuilder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, EndPlacements.END_GATEWAY_RETURN);
-        return baseEndBiome(biomeBuilder);
-    }
-
-    public static Biome endAeries(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
-    {
-        BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
-        biomeBuilder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, EndPlacements.END_GATEWAY_RETURN);
-        return baseEndBiome(biomeBuilder);
-    }
-
     public static Biome endCorruption(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
     {
         BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);

diff --git a/common/src/main/java/biomesoplenty/block/SaplingBlockBOP.java b/common/src/main/java/biomesoplenty/block/SaplingBlockBOP.java
@@ -94,6 +94,10 @@ else if (this == BOPBlocks.DEAD_SAPLING)
        {
           return ground == BOPBlocks.DRIED_SALT || super.canSurvive(state, worldIn, pos);
        }
+       else if (this == BOPBlocks.EMPYREAL_SAPLING)
+       {
+           return ground == Blocks.END_STONE || ground == BOPBlocks.ALGAL_END_STONE || super.canSurvive(state, worldIn, pos);
+       }
 
        return super.canSurvive(state, worldIn, pos);
    }

diff --git a/common/src/main/java/biomesoplenty/block/trees/BOPTreeGrowers.java b/common/src/main/java/biomesoplenty/block/trees/BOPTreeGrowers.java
@@ -15,6 +15,7 @@
 public class BOPTreeGrowers
 {
     public static final TreeGrower DEAD = register("dead", 0.5F, Optional.empty(), Optional.empty(), Optional.of(BOPTreeFeatures.DEAD_TWIGLET_TREE), Optional.of(BOPTreeFeatures.SMALL_DEAD_TREE), Optional.empty(), Optional.empty());
+    public static final TreeGrower EMPYREAL = register("empyreal", Optional.of(BOPTreeFeatures.PINE_TREE), Optional.empty());
     public static final TreeGrower FIR = register("fir", Optional.of(BOPTreeFeatures.FIR_TREE), Optional.empty(), Optional.of(BOPTreeFeatures.FIR_TREE_LARGE), Optional.empty());
     public static final TreeGrower FLOWERING_OAK = register("flowering_oak", 0.1F, Optional.empty(), Optional.empty(), Optional.of(BOPTreeFeatures.FLOWERING_OAK_TREE), Optional.of(BOPTreeFeatures.BIG_FLOWERING_OAK_TREE), Optional.of(BOPTreeFeatures.FLOWERING_OAK_TREE_BEES), Optional.of(BOPTreeFeatures.BIG_FLOWERING_OAK_TREE_BEES));
     public static final TreeGrower HELLBARK = register("hellbark", Optional.of(BOPTreeFeatures.HELLBARK_TREE), Optional.of(BOPTreeFeatures.BIG_HELLBARK_TREE));

diff --git a/common/src/main/java/biomesoplenty/entity/BoatBOP.java b/common/src/main/java/biomesoplenty/entity/BoatBOP.java
@@ -136,6 +136,8 @@ public Item getDropItem()
                 return BOPItems.UMBRAN_BOAT;
             case HELLBARK:
                 return BOPItems.HELLBARK_BOAT;
+            case EMPYREAL:
+                return BOPItems.EMPYREAL_BOAT;
         }
         return Items.OAK_BOAT;
     }
@@ -174,7 +176,8 @@ public enum ModelType
         DEAD("dead", BOPBlocks.DEAD_PLANKS),
         MAGIC("magic", BOPBlocks.MAGIC_PLANKS),
         UMBRAN("umbran", BOPBlocks.UMBRAN_PLANKS),
-        HELLBARK("hellbark", BOPBlocks.HELLBARK_PLANKS);
+        HELLBARK("hellbark", BOPBlocks.HELLBARK_PLANKS),
+        EMPYREAL("empyreal", BOPBlocks.EMPYREAL_PLANKS);
 
         private final String name;
         private final Block planks;

diff --git a/common/src/main/java/biomesoplenty/entity/ChestBoatBOP.java b/common/src/main/java/biomesoplenty/entity/ChestBoatBOP.java
@@ -132,6 +132,8 @@ public Item getDropItem()
                 return BOPItems.UMBRAN_CHEST_BOAT;
             case HELLBARK:
                 return BOPItems.HELLBARK_CHEST_BOAT;
+            case EMPYREAL:
+                return BOPItems.EMPYREAL_CHEST_BOAT;
         }
         return Items.OAK_CHEST_BOAT;
     }

diff --git a/common/src/main/java/biomesoplenty/init/ModBiomes.java b/common/src/main/java/biomesoplenty/init/ModBiomes.java
@@ -41,10 +41,8 @@ public static void setupTerraBlender()
 
         // Register end biomes
         EndBiomeRegistry.registerHighlandsBiome(BOPBiomes.END_WILDS, 10);
-        EndBiomeRegistry.registerHighlandsBiome(BOPBiomes.END_REEF, 10);
-        EndBiomeRegistry.registerHighlandsBiome(BOPBiomes.END_DRIFTS, 10);
-        EndBiomeRegistry.registerHighlandsBiome(BOPBiomes.END_AERIES, 10);
-        EndBiomeRegistry.registerHighlandsBiome(BOPBiomes.END_CORRUPTION, 10);
+        EndBiomeRegistry.registerHighlandsBiome(BOPBiomes.END_REEF, 6);
+        EndBiomeRegistry.registerHighlandsBiome(BOPBiomes.END_CORRUPTION, 3);
     }
 
     public static void bootstrapBiomes(BootstapContext<Biome> context)
@@ -126,8 +124,6 @@ public static void bootstrapBiomes(BootstapContext<Biome> context)
         // End biomes
         register(context, BOPBiomes.END_WILDS, BOPEndBiomes.endWilds(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.END_REEF, BOPEndBiomes.endReef(placedFeatureGetter, carverGetter));
-        register(context, BOPBiomes.END_DRIFTS, BOPEndBiomes.endDrifts(placedFeatureGetter, carverGetter));
-        register(context, BOPBiomes.END_AERIES, BOPEndBiomes.endAeries(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.END_CORRUPTION, BOPEndBiomes.endCorruption(placedFeatureGetter, carverGetter));
     }
 

diff --git a/common/src/main/java/biomesoplenty/init/ModBlockEntities.java b/common/src/main/java/biomesoplenty/init/ModBlockEntities.java
@@ -24,12 +24,12 @@ public class ModBlockEntities
     public static void registerBlockEntities(BiConsumer<ResourceLocation, BlockEntityType<?>> func)
     {
         BOPBlockEntities.SIGN = register(func, "sign", BlockEntityType.Builder.of(SignBlockEntityBOP::new,
-                FIR_SIGN, PINE_SIGN, MAPLE_SIGN, REDWOOD_SIGN, MAHOGANY_SIGN, JACARANDA_SIGN, PALM_SIGN, WILLOW_SIGN, DEAD_SIGN, MAGIC_SIGN, UMBRAN_SIGN, HELLBARK_SIGN,
-                        FIR_WALL_SIGN, PINE_WALL_SIGN, MAPLE_WALL_SIGN, REDWOOD_WALL_SIGN, MAHOGANY_WALL_SIGN, JACARANDA_WALL_SIGN, PALM_WALL_SIGN, WILLOW_WALL_SIGN, DEAD_WALL_SIGN, MAGIC_WALL_SIGN, UMBRAN_WALL_SIGN, HELLBARK_WALL_SIGN));
+                FIR_SIGN, PINE_SIGN, MAPLE_SIGN, REDWOOD_SIGN, MAHOGANY_SIGN, JACARANDA_SIGN, PALM_SIGN, WILLOW_SIGN, DEAD_SIGN, MAGIC_SIGN, UMBRAN_SIGN, HELLBARK_SIGN, EMPYREAL_SIGN,
+                        FIR_WALL_SIGN, PINE_WALL_SIGN, MAPLE_WALL_SIGN, REDWOOD_WALL_SIGN, MAHOGANY_WALL_SIGN, JACARANDA_WALL_SIGN, PALM_WALL_SIGN, WILLOW_WALL_SIGN, DEAD_WALL_SIGN, MAGIC_WALL_SIGN, UMBRAN_WALL_SIGN, HELLBARK_WALL_SIGN, EMPYREAL_WALL_SIGN));
 
         BOPBlockEntities.HANGING_SIGN = register(func, "hanging_sign", BlockEntityType.Builder.of(HangingSignBlockEntityBOP::new,
-                FIR_HANGING_SIGN, PINE_HANGING_SIGN, MAPLE_HANGING_SIGN, REDWOOD_HANGING_SIGN, MAHOGANY_HANGING_SIGN, JACARANDA_HANGING_SIGN, PALM_HANGING_SIGN, WILLOW_HANGING_SIGN, DEAD_HANGING_SIGN, MAGIC_HANGING_SIGN, UMBRAN_HANGING_SIGN, HELLBARK_HANGING_SIGN,
-                        FIR_WALL_HANGING_SIGN, PINE_WALL_HANGING_SIGN, MAPLE_WALL_HANGING_SIGN, REDWOOD_WALL_HANGING_SIGN, MAHOGANY_WALL_HANGING_SIGN, JACARANDA_WALL_HANGING_SIGN, PALM_WALL_HANGING_SIGN, WILLOW_WALL_HANGING_SIGN, DEAD_WALL_HANGING_SIGN, MAGIC_WALL_HANGING_SIGN, UMBRAN_WALL_HANGING_SIGN, HELLBARK_WALL_HANGING_SIGN));
+                FIR_HANGING_SIGN, PINE_HANGING_SIGN, MAPLE_HANGING_SIGN, REDWOOD_HANGING_SIGN, MAHOGANY_HANGING_SIGN, JACARANDA_HANGING_SIGN, PALM_HANGING_SIGN, WILLOW_HANGING_SIGN, DEAD_HANGING_SIGN, MAGIC_HANGING_SIGN, UMBRAN_HANGING_SIGN, HELLBARK_HANGING_SIGN, EMPYREAL_HANGING_SIGN,
+                        FIR_WALL_HANGING_SIGN, PINE_WALL_HANGING_SIGN, MAPLE_WALL_HANGING_SIGN, REDWOOD_WALL_HANGING_SIGN, MAHOGANY_WALL_HANGING_SIGN, JACARANDA_WALL_HANGING_SIGN, PALM_WALL_HANGING_SIGN, WILLOW_WALL_HANGING_SIGN, DEAD_WALL_HANGING_SIGN, MAGIC_WALL_HANGING_SIGN, UMBRAN_WALL_HANGING_SIGN, HELLBARK_WALL_HANGING_SIGN, EMPYREAL_WALL_HANGING_SIGN));
 
         BOPBlockEntities.ANOMALY = register(func, "anomaly", BlockEntityType.Builder.of(AnomalyBlockEntity::new, ANOMALY));
     }