1.12.2 jeid

CONTRIBUTING.md

@@ -0,0 +1,44 @@
+Contribution to OpenTerrainGenerator
+-----------------------
+
+Please talk to us on Discord @ https://discord.gg/UXzdVTH prior to contributing.
+
+## Signing
+
+Please sign [the Contributor License Agreement](https://cla-assistant.io/PG85/OpenTerrainGenerator).
+
+## Pull Requests
+
+For pull requests:
+- You MUST: own the code you submit OR it must be free/open/safe to use (like code in the public domain). Code gathered from within any open source OpenTerrainGenerator project is valid to include here as well.
+	- If your code is under any pre-existing license, you MUST note it in the pull request.
+	- It is preferred that you contribute code that you own the rights to (generally, original code that you have written) rather than code licensed from another project.
+- Any and all code you submit is subject to the mini-license below.
+- In general, you should confirm your PR is functional in any ways that it may vary.
+	- For example, if your code adds an NMS call, it should be tested for the version of the branch it is submitted to.
+- USUALLY, your pull request should fix an open issue or feature request made in a Discord thread.
+	- If there is no issue or thread for it, please open a thread.
+- Team OTG reserves the right to refuse Pull Requests for any reason, although reasonable efforts will be made to accommodate appropriate requests.
+
+## Code Style / Formatting
+
+Match the general format/style of existing code within the project. Additional details on conventions will be added to this document.
+
+## Mini-license pre-warning
+
+By contributing to the project, you give up all rights to your contribution\*.
+
+If you later decide you don't want us using your code - you may make a polite request and it will be treated as such, but that is the extent of your abilities.
+
+\* This does not include your rights to continue making use of any involved code yourself, which you of course may continue to do. You give up specifically your rights to the contribution *within this project*. Or to put it another way: your rights to the specific copy of the contribution that is now contained within this project, as specifically opposed to ideas and/or expressions thereof within the code or other work contributed, which you remain free to do with as you wish (excluding actions that conflict with our ownership of the copy given to us).
+
+### You agree by contributing:
+
+- That you have read and agree to this document.
+- To not attempt to "revoke rights to your code" or any similar action.
+- That you have the right to publicly contribute any assets/code given. No contributing someone else's code without their permission.
+- That the code submitted is either your own work, dedicated now to this project, OR it is under a license specified directly in the contribution.
+
+### Contribution guidelines adaptation
+
+These contribution guidelines have been adapted from the [Denizen Contribution Guidelines](https://github.com/DenizenScript/Denizen/blob/release/CONTRIBUTING.md) and are provided under the [MIT License](https://github.com/DenizenScript/Denizen/tree/release) used by both Denizen and OpenTerrainGenerator.

common/src/main/java/com/pg85/otg/network/ClientConfigProvider.java

@@ -89,14 +89,13 @@ public ClientConfigProvider(DataInputStream stream, LocalWorld world) throws IOE
 
             BiomeLoadInstruction instruction = new BiomeLoadInstruction(biomeName, defaultSettings);
             BiomeConfig config = new BiomeConfig(instruction, null, biomeReader, worldConfig);
-
-            LocalBiome biome = world.createBiomeFor(config, new BiomeIds(otgBiomeId, savedBiomeId), this, false);
+            LocalBiome biome = world.createBiomeFor(config, new BiomeIds(otgBiomeId, savedBiomeId, config.replaceToBiomeName != null && !config.replaceToBiomeName.isEmpty()), this, false);
             biomesByOTGId[otgBiomeId] = biome;
-            if(savedBiomeId == otgBiomeId || BiomeRegistryNames.getRegistryNameForDefaultBiome(biomeName) != null) // Non-virtual and default biomes only
+            if (!(config.replaceToBiomeName != null && config.replaceToBiomeName.trim().length() > 0) || BiomeRegistryNames.getRegistryNameForDefaultBiome(biomeName) != null) // Non-virtual and default biomes only
             {
-            	biomesBySavedId[savedBiomeId] = biome;
+                biomesBySavedId[savedBiomeId] = biome;
             }
-            
+
         	OTG.getEngine().setOTGBiomeId(world.getName(), otgBiomeId, config, true);
         }
     }

common/src/main/java/com/pg85/otg/network/ServerConfigProvider.java

@@ -1,15 +1,7 @@
 package com.pg85.otg.network;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 import com.pg85.otg.OTG;
@@ -34,7 +26,6 @@
 import com.pg85.otg.util.minecraft.defaults.DefaultBiome;
 import com.pg85.otg.worldsave.BiomeIdData;
 import com.pg85.otg.worldsave.WorldSaveData;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * Holds the WorldConfig and all BiomeConfigs.
@@ -53,7 +44,7 @@
 public final class ServerConfigProvider implements ConfigProvider
 {
     private static final int MAX_INHERITANCE_DEPTH = 15;
-    private LocalWorld world;
+	private LocalWorld world;
     private File settingsDir;
     private WorldConfig worldConfig;
 
@@ -468,8 +459,7 @@ private String indexSettings(Map<String, Integer> worldBiomes, boolean isNewWorl
 	        	loadedBiomeIdData.add(
         			new BiomeIdData(
     					world.getName() + "_" + worldBiome.getKey(), 
-    					worldBiome.getValue(), 
-    					worldBiome.getValue() > 255 || (
+    					worldBiome.getValue(), (
 							biomeConfig.replaceToBiomeName != null && 
 							biomeConfig.replaceToBiomeName.trim().length() > 0
 						) ? -1 : worldBiome.getValue()
@@ -552,15 +542,15 @@ else if((world.getName() + "_" + OTG.getEngine().getOTGBiomeIds(world.getName())
         	            		throw new RuntimeException("Error: OTG Biome id " + biomeIdData.otgBiomeId + " for biome " + biomeConfig.getName() + " was taken by " + OTG.getBiomeByOTGId(biomeIdData.otgBiomeId).getName());       	            		
         	            	}
 
-            	        	if(biomeIdData.otgBiomeId > -1 && biomeIdData.otgBiomeId < 256)
+            	        	if(biomeIdData.otgBiomeId > -1 && !(biomeConfig.replaceToBiomeName != null && biomeConfig.replaceToBiomeName.trim().length() > 0))
             	        	{
-            	            	if(biomeConfig.replaceToBiomeName != null && biomeConfig.replaceToBiomeName.trim().length() > 0)
+                                if(biomeConfig.replaceToBiomeName != null &&biomeConfig.replaceToBiomeName.trim().length() > 0)
             	            	{
             	            		throw new RuntimeException("Error: Biome \"" + biomeConfig.getName() + "\" has an id between 0-255 but uses replaceToBiomeName. Virtual biomes must have id's above 255, please check your WorldConfig's custom biomes setting.");
             	            	}            	        		
             	        		nonVirtualBiomesExisting.add(biomeConfig);
             	        	}
-            	        	else if(biomeIdData.otgBiomeId > 255)
+            	        	else if(biomeConfig.replaceToBiomeName != null && biomeConfig.replaceToBiomeName.trim().length() > 0)
             	        	{
             	        		virtualBiomesExisting.add(biomeConfig);
             	        	}  
@@ -573,16 +563,16 @@ else if(biomeIdData.otgBiomeId > 255)
 
         // Set OTG biome id's for biomes, make sure there is enough space to register all biomes.
         for (BiomeConfig biomeConfig : usedBiomes)
-        {            	
+        {
             // Statistics of the loaded biomes
             this.biomesCount++;
             loadedBiomeNames.append(biomeConfig.getName());
             loadedBiomeNames.append(", ");
 
             BiomeConfig[] otgIds2 = OTG.getEngine().getOTGBiomeIds(world.getName());
-            
+
             int otgBiomeId = -1;
-            
+
             // Exclude already registered biomes from loadedBiomeIdData / default biomes
             boolean bFound = false;
             for(int i = 0; i < otgIds2.length; i++)
@@ -591,7 +581,7 @@ else if(biomeIdData.otgBiomeId > 255)
             	if(biomeConfig == biomeConfig2)
             	{
             		bFound = true;
-            		break;            		
+            		break;
             	}
         		// Forge dimensions: If a world is being reloaded after being unloaded replace the existing biomeConfig
             	else if(
@@ -609,33 +599,28 @@ else if(
             {
             	continue; // biome is from loadedBiomeIdData, already registered.
             }
-
-            if(otgBiomeId == -1)
-            {          
-            	// Find the next available id
-	            for(int i = (!biomeConfig.replaceToBiomeName.isEmpty() ? 256 : 0); i < otgIds2.length; i++) // Virtual (replacetobiomename) biomes can only have id's above 255
-	            {
-	            	if((biomeConfig.replaceToBiomeName.isEmpty() && i > 255) || (biomeConfig.replaceToBiomeName.isEmpty() && i >= OTG.getEngine().getOTGBiomeIds(world.getName()).length))
-	            	{
-	            		OTG.log(LogMarker.FATAL, "Biome could not be registered, no free biome id's!");
-	            		throw new RuntimeException("Biome could not be registered, no free biome id's!");
-	            	}
-	            	if(OTG.getEngine().isOTGBiomeIdAvailable(world.getName(), i))
-	            	{
-	            		otgBiomeId = i;
-	            		OTG.getEngine().setOTGBiomeId(world.getName(), i, biomeConfig, false);
-	            		break;
-	            	}
-	            }
-	        	if(otgBiomeId > -1 && otgBiomeId < 256)
-	        	{
-	        		nonVirtualBiomes.add(biomeConfig);
-	        	}
-	        	else if(otgBiomeId > 255)
-	        	{
-	        		virtualBiomes.add(biomeConfig);
-	        	}
-            }        	
+
+            if(otgBiomeId == -1) {
+				// Find the next available id
+
+				for (int i = 0; i < otgIds2.length; i++) // Virtual (replacetobiomename) biomes can only have id's above 255
+				{
+					if ((biomeConfig.replaceToBiomeName.isEmpty() && (i > (otgIds2.length - 1 ))) || (biomeConfig.replaceToBiomeName.isEmpty() && i >= OTG.getEngine().getOTGBiomeIds(world.getName()).length)) {
+						OTG.log(LogMarker.FATAL, "Biome could not be registered, no free biome id's!");
+						throw new RuntimeException("Biome could not be registered, no free biome id's!");
+					}
+					if (OTG.getEngine().isOTGBiomeIdAvailable(world.getName(), i)) {
+						otgBiomeId = i;
+						OTG.getEngine().setOTGBiomeId(world.getName(), i, biomeConfig, false);
+						break;
+					}
+				}
+				if (otgBiomeId > -1 && !(biomeConfig.replaceToBiomeName != null && biomeConfig.replaceToBiomeName.trim().length() > 0)) {
+					nonVirtualBiomes.add(biomeConfig);
+				} else if (biomeConfig.replaceToBiomeName != null && biomeConfig.replaceToBiomeName.trim().length() > 0) {
+					virtualBiomes.add(biomeConfig);
+				}
+			}
         }
 
         // When loading an existing world load the existing biomes first, new biomes after so they don't claim reserved biome id's.
@@ -725,41 +710,33 @@ private void createAndRegisterBiome(ArrayList<BiomeIdData> loadedBiomeIdData, Bi
         }
 
         // Create biome
-        LocalBiome biome = world.createBiomeFor(biomeConfig, new BiomeIds(otgBiomeId, savedBiomeId), this, isReload);
-
+        LocalBiome biome = world.createBiomeFor(biomeConfig, new BiomeIds(otgBiomeId, savedBiomeId, biomeConfig.replaceToBiomeName != null && !biomeConfig.replaceToBiomeName.isEmpty()), this, isReload);
         this.biomesByOTGId[biome.getIds().getOTGBiomeId()] = biome;
-
         // Indexing ReplacedBlocks
-        if (!this.worldConfig.biomeConfigsHaveReplacement)
-        {
+        if (!this.worldConfig.biomeConfigsHaveReplacement) {
             this.worldConfig.biomeConfigsHaveReplacement = biomeConfig.replacedBlocks.hasReplaceSettings();
         }
         biomeConfig.replacedBlocks.parseForWorld(this.world);
 
         // Indexing MaxSmoothRadius
-        if (this.worldConfig.maxSmoothRadius < biomeConfig.smoothRadius)
-        {
+        if (this.worldConfig.maxSmoothRadius < biomeConfig.smoothRadius) {
             this.worldConfig.maxSmoothRadius = biomeConfig.smoothRadius;
         }
 
-		if (this.worldConfig.maxSmoothRadius < biomeConfig.CHCSmoothRadius)
-		{
-			this.worldConfig.maxSmoothRadius = biomeConfig.CHCSmoothRadius;
-		}
+        if (this.worldConfig.maxSmoothRadius < biomeConfig.CHCSmoothRadius) {
+            this.worldConfig.maxSmoothRadius = biomeConfig.CHCSmoothRadius;
+        }
 
         // Indexing BiomeColor
-        if (this.worldConfig.biomeMode == OTG.getBiomeModeManager().FROM_IMAGE)
-        {
-            if (this.worldConfig.biomeColorMap == null)
-            {
+        if (this.worldConfig.biomeMode == OTG.getBiomeModeManager().FROM_IMAGE) {
+            if (this.worldConfig.biomeColorMap == null) {
                 this.worldConfig.biomeColorMap = new HashMap<Integer, Integer>();
             }
 
             int color = biomeConfig.biomeColor;
             this.worldConfig.biomeColorMap.put(color, biome.getIds().getOTGBiomeId());
         }
     }
-
 	/** Recursive method to get saved ID from ReplaceToBiomeName, allows chain replacing to virtual biomes.
 	 *
 	 * @param biomeConfig The biomeconfig we want to find the saved ID for
@@ -801,8 +778,9 @@ private int findSavedBiomeId(BiomeConfig biomeConfig, BiomeConfig[] configArray,
 			}
 			// Once we get here, the config doesn't exist
 			// Try one last time, if that doesn't work, we throw an error
-			int id = getRequestedSavedId(biomeConfig.replaceToBiomeName);
-			if (0 <= id && id <= 255) {
+
+            int id = getRequestedSavedId(biomeConfig.replaceToBiomeName);
+            if (id > -1 && (biomeConfig.replaceToBiomeName == null || biomeConfig.replaceToBiomeName.trim().length() == 0)) {
 				// It has a valid ID, let's just return that
 				return id;
 			}
@@ -821,8 +799,8 @@ public List<LocalBiome> getBiomeArrayLegacy()
 	{        
         // For backwards compatibility, sort the biomes by saved id and return default biomes as if they were custom biomes 
         List<LocalBiome> nonDefaultbiomes = new ArrayList<LocalBiome>();
-        LocalBiome[] defaultBiomes = new LocalBiome[256];
-        for(LocalBiome biome : this.biomesByOTGId)
+		LocalBiome[] defaultBiomes = new LocalBiome[256];
+		for(LocalBiome biome : this.biomesByOTGId)
         {
         	if(biome != null)
         	{

common/src/main/java/com/pg85/otg/util/BiomeIds.java

@@ -1,5 +1,9 @@
 package com.pg85.otg.util;
 
+import com.pg85.otg.configuration.biome.BiomeConfig;
+
+import java.util.Random;
+
 /**
  * Immutable class to hold the biome ids of a biome.
  * <p>
@@ -12,6 +16,7 @@ public class BiomeIds
 {
     private int otgBiomeId;
     private int savedId;
+    private boolean isVirtual;
 
     /**
      * Creates a new virtual biome id.
@@ -20,10 +25,11 @@ public class BiomeIds
      * @param savedId The id used in the world save files (the .mca files in
      *            the region directory).
      */
-    public BiomeIds(int otgBiomeId, int savedId)
+    public BiomeIds(int otgBiomeId, int savedId, boolean isVirtual)
     {
         this.otgBiomeId = otgBiomeId;
         this.savedId = savedId;
+        this.isVirtual = isVirtual;
     }
 
     /**
@@ -35,7 +41,7 @@ public BiomeIds(int otgBiomeId, int savedId)
      */
     public boolean isVirtual()
     {
-    	return otgBiomeId > 255;
+    	return this.isVirtual;
     }
 
     /**

platforms/bukkit/src/main/java/com/pg85/otg/bukkit/biomes/BukkitBiome.java

@@ -23,7 +23,7 @@ private BukkitBiome(BiomeConfig biomeConfig, BiomeBase biome)
     {
         this.biomeBase = biome;
         int savedBiomeId =  BiomeBase.a(biomeBase);
-        this.biomeIds = new BiomeIds(WorldHelper.getOTGBiomeId(biomeBase), savedBiomeId);
+        this.biomeIds = new BiomeIds(WorldHelper.getOTGBiomeId(biomeBase), savedBiomeId,biomeConfig.replaceToBiomeName != null && !biomeConfig.replaceToBiomeName.isEmpty());
         this.biomeConfig = biomeConfig;
         this.isCustom = biome instanceof OTGBiomeBase;
     }

platforms/forge/src/main/java/com/pg85/otg/forge/ForgeEngine.java

@@ -35,6 +35,8 @@
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Loader;
 
+import static com.pg85.otg.forge.biomes.ForgeBiomeRegistryManager.JEID;
+
 public class ForgeEngine extends OTGEngine
 {
 	private ForgeBiomeRegistryManager biomeRegistryManager;
@@ -199,7 +201,10 @@ public boolean isModLoaded(String mod)
 	@Override
 	public boolean areEnoughBiomeIdsAvailableForPresets(ArrayList<String> presetNames)
 	{
-		if(presetNames == null)
+        if(JEID) {
+            return true;
+        }
+        if(presetNames == null)
 		{
 			return true;
 		}