Reset base to upstream 0.8.2 (#6)

* update bs

* Reset to 0.8.2 upstream

* spotless

* Change base name to match upstream case

Author: Caedis

gradle.properties

@@ -33,7 +33,7 @@ channel = stable
 mappingsVersion = 12
 
 # Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
 # Select a default username for testing your mod. You can always override this per-run by running
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
@@ -61,6 +61,9 @@ gradleTokenModId =
 # [DEPRECATED] Mod name replacement token.
 gradleTokenModName =
 
+# [DEPRECATED] Mod Group replacement token.
+gradleTokenGroupName =
+
 # [DEPRECATED]
 # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
@@ -114,7 +117,7 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
@@ -123,7 +126,7 @@ includeWellKnownRepositories = true
 usesMavenPublishing = true
 
 # Maven repository to publish the mod to.
-# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
 
 # Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
 #
@@ -156,7 +159,7 @@ curseForgeRelations =
 
 # Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
 # projects. New projects should not use this parameter.
-# customArchiveBaseName =
+customArchiveBaseName = ClimateControl
 
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
@@ -187,5 +190,3 @@ curseForgeRelations =
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
-# Non-GTNH properties
-gradleTokenGroupName = 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
 }
 
 

src/main/java/climateControl/DimensionManager.java

@@ -61,7 +61,7 @@ public class DimensionManager {
 
     public static Logger logger = new Zeno410Logger("DimensionManager").logger();
 
-    private Accessor<GenLayerRiverMix, GenLayerPack> riverMixBiome = new Accessor<GenLayerRiverMix, GenLayerPack>(
+    private Accessor<GenLayerRiverMix, GenLayerPack> riverMixBiome = new Accessor<>(
         "field_75910_b",
         "biomePatternGeneratorChain");
 
@@ -402,14 +402,12 @@ public void onWorldLoad(World world) {
                     // lock manually
                     LockGenLayers biomeLocker = new LockGenLayers();
                     WorldChunkManager chunkGenerator = world.getWorldChunkManager();
-                    Accessor<WorldChunkManager, GenLayer> worldGenLayer = new Accessor<WorldChunkManager, GenLayer>(
-                        "field_76944_d",
-                        "genBiomes");
+                    Accessor<WorldChunkManager, GenLayer> worldGenLayer = new Accessor<>("field_76944_d", "genBiomes");
                     GenLayer toLock = worldGenLayer.get(chunkGenerator);
                     if (toLock instanceof GenLayerRiverMixWrapper) {
                         toLock = original;
                     }
-                    Accessor<GenLayerRiverMix, GenLayer> riverMixBiome = new Accessor<GenLayerRiverMix, GenLayer>(
+                    Accessor<GenLayerRiverMix, GenLayer> riverMixBiome = new Accessor<>(
                         "field_75910_b",
                         "biomePatternGeneratorChain");
                     toLock = riverMixBiome.get((GenLayerRiverMix) toLock);

src/main/java/climateControl/GenLayerUpdater.java

@@ -14,7 +14,7 @@
  */
 public class GenLayerUpdater {
 
-    public static final Accessor<WorldChunkManager, GenLayer> accessGenLayer = new Accessor<WorldChunkManager, GenLayer>(
+    public static final Accessor<WorldChunkManager, GenLayer> accessGenLayer = new Accessor<>(
         "field_76944_d",
         "genBiomes");
 

src/main/java/climateControl/LockGenLayer.java

@@ -26,13 +26,9 @@ public class LockGenLayer extends SavedNumberedItems<PlaneLocated<Integer>> {
 
     public static Logger logger = new Zeno410Logger("LockedBiomes").logger();
 
-    private static Accessor<GenLayerPack, GenLayerPack> genLayerPackParent = new Accessor<GenLayerPack, GenLayerPack>(
-        "field_75909_a",
-        "parent");
+    private static Accessor<GenLayerPack, GenLayerPack> genLayerPackParent = new Accessor<>("field_75909_a", "parent");
 
-    private static Accessor<GenLayer, GenLayer> genLayerParent = new Accessor<GenLayer, GenLayer>(
-        "field_75909_a",
-        "parent");
+    private static Accessor<GenLayer, GenLayer> genLayerParent = new Accessor<>("field_75909_a", "parent");
 
     private final Filter<GenLayer> targetLayerDetector;
     private final String targetName;

src/main/java/climateControl/api/ClimateControlSettings.java

@@ -71,6 +71,10 @@ public class ClimateControlSettings extends Settings {
     private static final String zSpawnOffsetName = "zSpawnOffset";
     private static final String mountainsChains = "Mountains in Mountain Chains";
     private static final String frozenIcecapName = "Frozen Icecaps";
+    private static final String landExpansionRoundsName = "Land Expansion Rounds";
+    private static final String forceIceMountainsName = "Ice Mountains in Mountain Chains";
+    private static final String forceMoutainMesasName = "Mesas in Mountain Chains";
+    private static final String mesaMesaBordersName = "Mesas for mesa borders";
 
     private final String subDirectoryName = "climateControl";
 
@@ -92,6 +96,12 @@ public class ClimateControlSettings extends Settings {
     public final Mutable<Boolean> mountainChains = climateZoneCategory
         .booleanSetting(mountainsChains, false, "Place mountains in chains");
 
+    public final Mutable<Boolean> forceIceMountains = climateZoneCategory
+        .booleanSetting(forceIceMountainsName, true, "Use Ice Mountains instead of Ice Plains in mountain chain areas");
+
+    public final Mutable<Boolean> MesaMountains = climateZoneCategory
+        .booleanSetting(this.forceMoutainMesasName, true, "Use Mesas as mountains in mountain chain areas");
+
     public final Mutable<Integer> bandedClimateWidth = climateZoneCategory.intSetting(
         bandedClimateWidthName,
         -1,
@@ -190,6 +200,11 @@ public class ClimateControlSettings extends Settings {
     public final Mutable<Integer> rescueSearchLimit = climateControlCategory
         .intSetting(rescueLimitName, -1, "Maximum Number of Rescue attempts. Negative numbers mean no limit");
 
+    public final Mutable<Boolean> mesaMesaBorders = climateControlCategory.booleanSetting(
+        mesaMesaBordersName,
+        false,
+        "Use red sand mesa for mesa borders. False uses desert like vanilla");
+
     public boolean cachingOn() {
         return true;
     }// {return cacheSize.value()> 0;}
@@ -225,22 +240,27 @@ public int cacheSize() {
             + "SeparateLandmasses = false makes a continental world");
 
     public final Mutable<Integer> largeContinentFrequency = oceanControlCategory
-        .intSetting(largeContinentFrequencyName, 0, "frequency of large continent seeds, about 8000x16000");
+        .intSetting(largeContinentFrequencyName, 40, "frequency of large continent seeds, about 8000x16000");
     public final Mutable<Integer> mediumContinentFrequency = oceanControlCategory
-        .intSetting(mediumContinentFrequencyName, 60, "frequency of medium continent seeds, about 4000x8000");
+        .intSetting(mediumContinentFrequencyName, 100, "frequency of medium continent seeds, about 4000x8000");
     public final Mutable<Integer> smallContinentFrequency = oceanControlCategory
-        .intSetting(smallContinentFrequencyName, 120, "frequency of small continent seeds, about 2000x4000");
+        .intSetting(smallContinentFrequencyName, 60, "frequency of small continent seeds, about 2000x4000");
     public final Mutable<Integer> largeIslandFrequency = oceanControlCategory
-        .intSetting(largeIslandFrequencyName, 60, "frequency of large island seeds, about 500x1000");
+        .intSetting(largeIslandFrequencyName, 30, "frequency of large island seeds, about 500x1000");
     public final Mutable<Integer> mediumIslandFrequency = oceanControlCategory.intSetting(
         mediumIslandFrequencyName,
-        30,
+        15,
         "frequency of medium island seeds, about 250x500, but they tend to break up into archipelagos");
     public final Mutable<Boolean> separateLandmasses = oceanControlCategory.booleanSetting(
         separateLandmassesName,
         true,
         "True mostly stops landmasses merging." + "With default settings you will get an oceanic world if true and "
             + "a continental world if false");
+    public final Mutable<Integer> landExpansionRounds = oceanControlCategory.intSetting(
+        landExpansionRoundsName,
+        1,
+        "Rounds of continent and large island expansion in oceanic worlds (with separateLandmasses off). "
+            + "More makes continents larger and oceans narrower. Default is 1.");
 
     private OceanBiomeSettings oceanBiomeSettings = new OceanBiomeSettings();
 
@@ -298,7 +318,19 @@ public boolean doHalf() {
         return halfSize.value() && !quarterSize.value();
     }
 
+    private boolean vanillaMountainsForced;
+
     public ArrayList<BiomeSettings> biomeSettings() {
+        // force in ice mountains as a biome for mountains chains
+        // this is hacky but the best quick solution
+        if (!vanillaMountainsForced) {
+            vanillaMountainsForced = true;
+            if (this.mountainChains.value()) {
+                if (this.forceIceMountains.value()) {
+                    vanillaBiomeSettings.forceIceMountains();
+                }
+            }
+        }
         ArrayList<BiomeSettings> result = new ArrayList<BiomeSettings>();
         result.add(oceanBiomeSettings);
         if (this.vanillaBiomesOn.value()) result.add(vanillaBiomeSettings);
@@ -381,7 +413,7 @@ public void readFrom(Configuration source) {
         }
         partitioners = new ArrayList<DistributionPartitioner>();
         if (mountainChains.value()) {
-            this.partitioners.add(new MountainFormer());
+            this.partitioners.add(new MountainFormer(this.MesaMountains.value()));
         }
     }
 

src/main/java/climateControl/biomeSettings/EBPackage.java

@@ -1,3 +1,4 @@
+
 package climateControl.biomeSettings;
 
 import climateControl.api.BiomePackage;

src/main/java/climateControl/biomeSettings/VanillaBiomeSettings.java

@@ -39,6 +39,7 @@ public class VanillaBiomeSettings extends BiomeSettings { // biome incidences. N
     public static final String extremeHillsName = "Extreme Hills";
     public static final String forestName = "Forest";
     public static final String icePlainsName = "Ice Plains";
+    public static final String iceMountainsName = "Ice Mountains";
     public static final String jungleName = "Jungle";
     public static final String megaTaigaName = "Mega Taiga";
     public static final String mesaPlateauName = "Mesa Plateau";
@@ -66,7 +67,7 @@ public class VanillaBiomeSettings extends BiomeSettings { // biome incidences. N
     Element savanna = new Element(savannaName, 35, 20, true, Climate.HOT.name);
     Element swampland = new Element(swamplandName, 6, 10, Climate.WARM.name);
     Element taiga = new Element(taigaName, 5, 10, Climate.COOL.name);
-    ID iceMountains = new ID("Ice Mountains", 13);
+    Element iceMountains = new Element(iceMountainsName, 13, 0, Climate.SNOWY.name);
     ID mushroomIsland = new ID("Mushroom Island", 14);
     ID desertHills = new ID("Desert Hills", 17);
     ID forestHills = new ID("Forest Hills", 18);
@@ -159,4 +160,11 @@ public void stripIDsFrom(Configuration config) {
         // no action
     }
 
+    public void forceIceMountains() {
+        if (iceMountains.biomeIncidences()
+            .value() < 10) {
+            iceMountains.biomeIncidences()
+                .set(10);
+        }
+    }
 }

src/main/java/climateControl/customGenLayer/GenLayerAddBiome.java

@@ -2,7 +2,6 @@
 package climateControl.customGenLayer;
 
 import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 import climateControl.genLayerPack.GenLayerPack;
 
@@ -28,7 +27,7 @@ public int[] getInts(int par1, int par2, int par3, int par4) {
         int k1 = par3 + 2;
         int l1 = par4 + 2;
         int[] aint = this.parent.getInts(i1, j1, k1, l1);
-        int[] aint1 = IntCache.getIntCache(par3 * par4);
+        int[] aint1 = new int[(par3 * par4)];
         taste(aint, k1 * l1);
         poison(aint1, par3 * par4);
 

src/main/java/climateControl/customGenLayer/GenLayerAddLand.java

@@ -2,8 +2,7 @@
 package climateControl.customGenLayer;
 
 import net.minecraft.world.gen.layer.GenLayer;
-
-import climateControl.utils.IntPad;
+import net.minecraft.world.gen.layer.IntCache;
 
 /**
  * This is GenLayerAddIsland except that it doesn't automatically extend frozen
@@ -15,13 +14,10 @@
 public class GenLayerAddLand extends GenLayerNeighborTesting {
 
     private final boolean separate;
-    private final GenLayer realParent;
-    private IntPad output = new IntPad();
 
     public GenLayerAddLand(long par1, GenLayer par3GenLayer, boolean separate) {
         super(par1);
         this.parent = par3GenLayer;
-        realParent = par3GenLayer;
         this.separate = separate;
     }
 
@@ -35,13 +31,14 @@ public int[] getInts(int par1, int par2, int par3, int par4) {
         int k1 = par3 + 2;
         int l1 = par4 + 2;
         int[] aint = this.parent.getInts(i1, j1, k1, l1);
-        int[] aint1 = output.pad(par3 * par4);
-        poison(aint1, par3 * par4);
-        try {
-            taste(aint, k1 * l1);
-        } catch (Exception e) {
-            throw new RuntimeException(realParent.toString());
+        taste(aint, k1 * l1);
+        int[] aint1 = IntCache.getIntCache(par3 * par4);
+        // intcache can be released inappropriately
+        while (aint1 == aint) {
+            aint1 = IntCache.getIntCache(par3 * par4);
         }
+        poison(aint1, par3 * par4);
+        taste(aint, k1 * l1);
 
         for (int i2 = 0; i2 < par4; i2++) {
             for (int j2 = 0; j2 < par3; j2++) {

src/main/java/climateControl/customGenLayer/GenLayerBandedClimate.java

@@ -3,7 +3,6 @@
 
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 import climateControl.api.ClimateControlSettings;
 import climateControl.api.IslandClimateMaker;
@@ -43,7 +42,7 @@ public GenLayerBandedClimate(long par1, GenLayer par3GenLayer, ClimateControlSet
      */
     public int[] getInts(int par1, int par2, int par3, int par4) {
         int[] aint = this.parent.getInts(par1, par2, par3, par4);
-        int[] aint1 = IntCache.getIntCache(par3 * par4);
+        int[] aint1 = new int[par3 * par4];
 
         for (int i1 = 0; i1 < par4; ++i1) {
             for (int j1 = 0; j1 < par3; ++j1) {

src/main/java/climateControl/customGenLayer/GenLayerBreakMergers.java

@@ -56,7 +56,7 @@ public int[] getInts(int par1, int par2, int par3, int par4) {
     }
 
     boolean tooDifferent(int compare, int result) {
-        if (!isOceanic(compare) && !isOceanic(result) && ((compare < result - 2) || (compare > result + 2)))
+        if (!isOceanic(compare) && !isOceanic(result) && ((compare < result - 3) || (compare > result + 3)))
             return true;
         return false;
     }