Mod integration polishing

DaFuqs · Jan 20, 2021 · 5c3d526 · 5c3d526
1 parent 3a9c303
commit 5c3d526
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/main/java/de/dafuqs/starrysky/dimension/SpheroidLoader.java b/src/main/java/de/dafuqs/starrysky/dimension/SpheroidLoader.java
@@ -57,8 +57,8 @@ public enum SpheroidDimensionType {
         put(SpheroidDistributionType.ESSENTIAL,  50.0F);
         put(SpheroidDistributionType.DECORATIVE, 10.0F);
         put(SpheroidDistributionType.ORE,         6.0F);
-        put(SpheroidDistributionType.FLUID,       3.0F);
         put(SpheroidDistributionType.WOOD,        3.0F);
+        put(SpheroidDistributionType.FLUID,       1.0F);
         put(SpheroidDistributionType.TREASURE,    1.0F);
         put(SpheroidDistributionType.DUNGEON,     0.1F);
     }};

diff --git a/src/main/java/de/dafuqs/starrysky/spheroid/lists/SpheroidListBYG.java b/src/main/java/de/dafuqs/starrysky/spheroid/lists/SpheroidListBYG.java
@@ -745,8 +745,6 @@ private static void setupEnd(SpheroidLoader spheroidLoader) {
         spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.WOOD, 0.4F, ETHER_WOOD);
 
         // VISCAL ISLES
-        SpheroidType ETHER_WOOD_WITHOUT_LEAVES = new ModularSpheroidType(null, 6, 8, ether_log);
-        spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.WOOD, 0.4F, ETHER_WOOD_WITHOUT_LEAVES);
         BlockState vermilion_sculk = getDefaultBlockState(MOD_ID,"vermilion_sculk");
         BlockState vermilion_sculk_growth = getDefaultBlockState(MOD_ID,"vermilion_sculk_growth");
         PlantDecorator VERMILION_SCULK_GROWTH_DECORATOR = new PlantDecorator(vermilion_sculk_growth, 0.15F);

diff --git a/src/main/java/de/dafuqs/starrysky/spheroid/lists/SpheroidListBetterEnd.java b/src/main/java/de/dafuqs/starrysky/spheroid/lists/SpheroidListBetterEnd.java
@@ -17,7 +17,7 @@
 
 public class SpheroidListBetterEnd extends SpheroidList {
 
-    private static final String MOD_ID = "betherend";
+    private static final String MOD_ID = "betterend";
 
 
     public static boolean shouldGenerate() {
@@ -73,13 +73,13 @@ public static void setup(SpheroidLoader spheroidLoader) {
         //BlockState dense_vine = getDefaultBlockState(MOD_ID,"dense_vine"); // growing downwards on glowshrooms, Bottom, middle, top TODO
 
         SpheroidType END_MOSS = new ModularSpheroidType(null, 8, 14, end_stone)
-                .setBottomBlockState(end_moss)
+                .setTopBlockState(end_moss)
                 .addDecorator(CREEPING_MOSS_DECORATOR, 0.8F)
                 .addDecorator(UMBRELLA_MOSS_DECORATOR, 0.8F)
                 .addDecorator(UMBRELLA_MOSS_TALL_DECORATOR, 0.8F);
         spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.DECORATIVE, 0.4F, END_MOSS);
         SpheroidType UMBRELLA_MOSS = new ModularSpheroidType(null, 8, 14, end_stone)
-                .setBottomBlockState(end_mycelium)
+                .setTopBlockState(end_mycelium)
                 .addDecorator(CREEPING_MOSS_DECORATOR, 0.8F)
                 .addDecorator(UMBRELLA_MOSS_DECORATOR, 0.8F)
                 .addDecorator(UMBRELLA_MOSS_TALL_DECORATOR, 0.8F)
@@ -208,11 +208,11 @@ public static void setup(SpheroidLoader spheroidLoader) {
         spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.DECORATIVE, 0.3F, AMBER_MOSS);
 
         BlockState amber_ore = getDefaultBlockState(MOD_ID,"amber_ore");
-        SpheroidType AMBER_ORE = new ShellSpheroidType(null, 6, 13, end_stone, amber_ore, 2, 4);
+        SpheroidType AMBER_ORE = new ShellSpheroidType(null, 6, 13, amber_ore, end_stone, 2, 4);
         spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.ORE, 0.4F, AMBER_ORE);
 
         BlockState helix_tree_log = getDefaultBlockState(MOD_ID,"helix_tree_log");
-        BlockState helix_tree_leaves = getDefaultBlockState(MOD_ID,"helix_tree_leaves").with(LeavesBlock.DISTANCE, 1);
+        BlockState helix_tree_leaves = getDefaultBlockState(MOD_ID,"helix_tree_leaves");
 
         SpheroidType HELIX_TREE_WOOD = new ShellSpheroidType(null, 6, 11, helix_tree_log, helix_tree_leaves, 2, 3);
         spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.WOOD, 1.0F, HELIX_TREE_WOOD);
@@ -284,7 +284,7 @@ public static void setup(SpheroidLoader spheroidLoader) {
         PlantDecorator charnia_cyan_decorator = new PlantDecorator(charnia_cyan, 0.2F);
         PlantDecorator charnia_green_decorator = new PlantDecorator(charnia_green, 0.2F);
 
-        BlockState brimstome = getDefaultBlockState(MOD_ID,"brimstome");
+        BlockState brimstone = getDefaultBlockState(MOD_ID,"brimstone");
         BlockState sulphuric_rock = getDefaultBlockState(MOD_ID,"sulphuric_rock");
 
         /* TODO
@@ -293,21 +293,21 @@ public static void setup(SpheroidLoader spheroidLoader) {
         BlockState hydrothermal_vent = getDefaultBlockState(MOD_ID,"sulphur_crystal");
          */
 
-        SpheroidType WATER_BRIMSTONE = new LiquidSpheroidType(null, 6, 9, brimstome, Blocks.WATER.getDefaultState(), 2, 3, 20, 80, 50)
+        SpheroidType WATER_BRIMSTONE = new LiquidSpheroidType(null, 6, 9, Blocks.WATER.getDefaultState(), brimstone, 2, 3, 20, 80, 50)
                 .addDecorator(charnia_red_decorator, 0.2F)
                 .addDecorator(charnia_purple_decorator, 0.2F)
                 .addDecorator(charnia_orange_decorator, 0.2F)
                 .addDecorator(charnia_light_blue_decorator, 0.2F)
                 .addDecorator(charnia_cyan_decorator, 0.2F)
                 .addDecorator(charnia_green_decorator, 0.2F);
-        SpheroidType WATER_SULPHURIC_ROCK = new LiquidSpheroidType(null, 6, 11, brimstome, Blocks.WATER.getDefaultState(), 2, 3, 10, 100, 50)
+        SpheroidType WATER_SULPHURIC_ROCK = new LiquidSpheroidType(null, 6, 11, Blocks.WATER.getDefaultState(), brimstone, 2, 3, 10, 100, 50)
                 .addDecorator(charnia_red_decorator, 0.2F)
                 .addDecorator(charnia_purple_decorator, 0.2F)
                 .addDecorator(charnia_orange_decorator, 0.2F)
                 .addDecorator(charnia_light_blue_decorator, 0.2F)
                 .addDecorator(charnia_cyan_decorator, 0.2F)
                 .addDecorator(charnia_green_decorator, 0.2F);
-        SpheroidType BRIMSTONE_SULPHURIC_ROCK = new ShellSpheroidType(null, 6, 12, brimstome, sulphuric_rock, 2, 3);
+        SpheroidType BRIMSTONE_SULPHURIC_ROCK = new ShellSpheroidType(null, 6, 12, sulphuric_rock, brimstone, 2, 3);
 
         spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.FLUID, 0.2F, WATER_BRIMSTONE);
         spheroidLoader.registerSpheroidType(END, SpheroidDistributionType.FLUID, 0.2F, WATER_SULPHURIC_ROCK);

diff --git a/src/main/java/de/dafuqs/starrysky/spheroid/lists/SpheroidListVanillaEnd.java b/src/main/java/de/dafuqs/starrysky/spheroid/lists/SpheroidListVanillaEnd.java
@@ -35,7 +35,7 @@ public static class SpheroidDecorators {
             .addDecorator(SpheroidDecorators.END_PORTAL, 1.0F);
 
     // SIMPLE
-    public static final SpheroidType END_STONE_SMALL = new ModularSpheroidType(SpheroidAdvancementIdentifier.end_stone, 4, 7,  Blocks.END_STONE.getDefaultState());
+    public static final SpheroidType END_STONE_SMALL = new ModularSpheroidType(SpheroidAdvancementIdentifier.end_stone, 3, 7,  Blocks.END_STONE.getDefaultState());
     public static final SpheroidType END_STONE_LARGE = new ModularSpheroidType(SpheroidAdvancementIdentifier.end_stone, 10, 20,  Blocks.END_STONE.getDefaultState())
             .addDecorator(SpheroidDecorators.CHORUS_FRUIT, 0.2F);
     public static final SpheroidType PURPLE_STAINED_GLASS = new ModularSpheroidType(SpheroidAdvancementIdentifier.stained_glass, 5, 8, Blocks.PURPLE_STAINED_GLASS.getDefaultState());