Merge remote-tracking branch 'origin/master-1.18' into master-1.19-lts

resources/changelog/1.18.2-1.2.23.txt

@@ -0,0 +1,9 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.15.0 or higher.
+
+Changes:
+* Remove chance of loading panorama override, Closes #1014
+
+Fixes:
+* Fix temple generation hanging in void worlds, Closes #1013
+

src/main/java/org/cyclops/evilcraft/EvilCraft.java

@@ -27,7 +27,6 @@
 import org.cyclops.evilcraft.blockentity.*;
 import org.cyclops.evilcraft.blockentity.tickaction.bloodchest.BloodChestRepairActionRegistry;
 import org.cyclops.evilcraft.blockentity.tickaction.purifier.PurifierActionRegistry;
-import org.cyclops.evilcraft.client.gui.container.ContainerScreenMainMenuEvilifier;
 import org.cyclops.evilcraft.client.particle.*;
 import org.cyclops.evilcraft.core.blockentity.upgrade.Upgrades;
 import org.cyclops.evilcraft.core.broom.BroomModifierRegistry;
@@ -149,11 +148,6 @@ protected void setup(FMLCommonSetupEvent event) {
         // Initialize info book
         getRegistryManager().getRegistry(IInfoBookRegistry.class).registerInfoBook(
                 OriginsOfDarknessBook.getInstance(), "/data/" + Reference.MOD_ID + "/info/book.xml");
-
-        // Add custom panorama's
-        if (MinecraftHelpers.isClientSide()) {
-            ContainerScreenMainMenuEvilifier.evilifyMainMenu();
-        }
     }
 
     @Override

src/main/java/org/cyclops/evilcraft/Reference.java

@@ -22,7 +22,6 @@ public class Reference {
     public static final String TEXTURE_PATH_SKINS = "textures/skin/";
     public static final String TEXTURE_PATH_MODELS = "textures/model/";
     public static final String TEXTURE_PATH_ENTITIES = "textures/entity/";
-    public static final String TEXTURE_PATH_GUIBACKGROUNDS = "textures/gui/title/background/";
     public static final String TEXTURE_PATH_ITEMS = "textures/item/";
     public static final String TEXTURE_PATH_PARTICLES = "textures/particle/";
     public static final String MODEL_PATH = "models/";

src/main/java/org/cyclops/evilcraft/world/gen/structure/WorldStructureDarkTemple.java

@@ -248,9 +248,11 @@ protected void postBuildCorner(LevelAccessor world, BlockPos blockPos, int incX,
         private int getPillarHeightForCornerAt(LevelAccessor world, BlockPos blockPos, int incX, int incZ) {
             BlockPos loopPos = blockPos.offset(4 * incX, 0, 4 * incZ);
             int res = 0;
-
             while (!isSolidBlock(world, loopPos)) {
                 loopPos = loopPos.offset(0, -1, 0);
+                if (loopPos.getY() <= world.getMinBuildHeight()) {
+                    return res;
+                }
                 res++;
             }
             return res;