More consistent names but reverse

.gitlab-ci.yml

@@ -41,28 +41,15 @@ build:
     - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
+    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./Merged/* . || true
   artifacts:
     name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
-      - Merged/*.jar
-      - quilt/build/libs/*.jar
-      - fabric/build/libs/*.jar
-      - forge/build/libs/*.jar
-      - neoforge/build/libs/*.jar
+      - ./*.jar
     exclude:
-      # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller
-      - fabric/build/libs/*-all.jar
-      - fabric/build/libs/*-dev.jar
-      - fabric/build/libs/*-sources.jar
-      - quilt/build/libs/*-all.jar
-      - quilt/build/libs/*-dev.jar
-      - quilt/build/libs/*-sources.jar
-      - forge/build/libs/*-all.jar
-      - forge/build/libs/*-dev.jar
-      - forge/build/libs/*-sources.jar
-      - neoforge/build/libs/*-all.jar
-      - neoforge/build/libs/*-dev.jar
-      - neoforge/build/libs/*-sources.jar
+      - ./*-all.jar
+      - ./*-dev.jar
+      - ./*-sources.jar
     expire_in: 14 days
     when: always
   extends: .build_java
@@ -77,15 +64,15 @@ api:
     # this also runs unit tests
     - ./gradlew api:build --gradle-user-home cache/;
     - ./gradlew api:addSourcesToCompiledJar --gradle-user-home cache/;
+    - cp ./coreSubProjects/api/build/libs/merged/* .
   artifacts:
-    name: "Api_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    name: "NightlyBuild_Api-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
-      - coreSubProjects/api/build/libs/merged/*.jar
-      # can be uncommented if we don't want a jar with the source code
-      # - coreSubProjects/api/build/libs/*.jar
+      - ./*.jar
     exclude:
-      - coreSubProjects/api/build/libs/merged/*-all.jar
-      - coreSubProjects/api/build/libs/merged/*-sources.jar
+      - ./*-all.jar
+      - ./*-dev.jar
+      - ./*-sources.jar
     expire_in: 1 day
     when: always
   extends: .build_java

build.gradle

@@ -70,7 +70,7 @@ forgix {
     String loaderHyphenSeparatedList = ((String)gradle.builds_for).replaceAll(",", "-");
     
     group = "com.seibel.distanthorizons"
-    mergedJarName = "DistantHorizons-${rootProject.versionStr}-${loaderHyphenSeparatedList}.jar"
+    mergedJarName = "DistantHorizons-${loaderHyphenSeparatedList}-${rootProject.versionStr}.jar"
 
     if (findProject(":forge"))
         forge {

common/src/main/java/com/seibel/distanthorizons/common/commands/ConfigCommand.java

@@ -9,7 +9,6 @@ import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import net.minecraft.commands.CommandSourceStack;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -41,7 +40,6 @@ public class ConfigCommand extends AbstractCommand
 	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
 	{
 		LiteralArgumentBuilder<CommandSourceStack> builder = literal("config");
-		HashSet<String> addedCommands = new HashSet<>();
 		
 		for (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
 		{
@@ -58,11 +56,6 @@ public class ConfigCommand extends AbstractCommand
 				continue;
 			}
 			
-			if (!addedCommands.add(configEntry.getChatCommandName()))
-			{
-				throw new IllegalStateException("Duplicate command name: " + configEntry.getChatCommandName());
-			}
-			
 			LiteralArgumentBuilder<CommandSourceStack> subcommand = literal(configEntry.getChatCommandName())
 					.executes(commandContext -> this.sendSuccessResponse(commandContext,
 							"\n" +

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -84,7 +84,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	public static HashSet<IBlockStateWrapper> rendererIgnoredCaveBlocks = null;
 	
 	/** keep track of broken blocks so we don't log every time */
-	private static final HashSet<ResourceLocation> BROKEN_RESOURCE_LOCATIONS = new HashSet<>();
+	private static final HashSet<ResourceLocation> BrokenResourceLocations = new HashSet<>();
 	
 	
 	
@@ -596,9 +596,9 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				if (block == null)
 				{
 					// shouldn't normally happen, but here to make the compiler happy
-					if (!BROKEN_RESOURCE_LOCATIONS.contains(resourceLocation))
+					if (!BrokenResourceLocations.contains(resourceLocation))
 					{
-						BROKEN_RESOURCE_LOCATIONS.add(resourceLocation);
+						BrokenResourceLocations.add(resourceLocation);
 						LOGGER.warn("Unable to find BlockState with the resourceLocation [" + resourceLocation + "] and properties: [" + blockStatePropertiesString + "]. Air will be used instead, some data may be lost.");
 					}
 					
@@ -628,9 +628,9 @@ public class BlockStateWrapper implements IBlockStateWrapper
 					if (blockStatePropertiesString != null)
 					{
 						// we should have found a blockstate, but didn't
-						if (!BROKEN_RESOURCE_LOCATIONS.contains(resourceLocation))
+						if (!BrokenResourceLocations.contains(resourceLocation))
 						{
-							BROKEN_RESOURCE_LOCATIONS.add(resourceLocation);
+							BrokenResourceLocations.add(resourceLocation);
 							LOGGER.warn("Unable to find BlockState for Block [" + resourceLocation + "] with properties: [" + blockStatePropertiesString + "]. Using the default block state.");
 						}
 					}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java

@@ -424,8 +424,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 						
 						ChunkAccess centerChunk = regionChunks.stream()
 								.filter((chunk) -> chunk.getPos().x == centerX && chunk.getPos().z == centerZ)
-								.findFirst()
-								.orElseGet(() -> regionChunks.getFirst());
+								.findFirst().get();
 						
 						genEvent.refreshTimeout();
 						DhLitWorldGenRegion region = new DhLitWorldGenRegion(

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java

@@ -29,7 +29,6 @@ import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
 
 import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
 
 
 import it.unimi.dsi.fastutil.shorts.ShortList;
@@ -104,8 +103,6 @@ public class ChunkLoader
 	
 	private static boolean lightingSectionErrorLogged = false;
 	
-	private static final ConcurrentHashMap<String, Object> LOGGED_ERROR_MESSAGE_MAP = new ConcurrentHashMap<>();
-	
 	
 	
 	//============//
@@ -288,18 +285,17 @@ public class ChunkLoader
 				#endif
 				
 				blockStateContainer = tagSection.contains("block_states", 10)
-						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states"))
-							.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
 						#if MC_VER < MC_1_20_6 
-						.getOrThrow(false, (message) -> logWarningOnce(message))
+						.getOrThrow(false, LOGGER::error)
 						#else
-						.getOrThrow((message) -> logErrorAndReturnException(message)) 
+						.getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null)) 
 						#endif
 						: new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
 
 				#if MC_VER < MC_1_18_2
 				biomeContainer = tagSection.contains("biomes", 10)
-						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
+						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error)
 						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
 				#else
 				
@@ -307,12 +303,11 @@ public class ChunkLoader
 				if (tagSection.contains("biomes", 10))
 				{
 					biomeContainer =
-						biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes"))
-								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+						biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
 						#if MC_VER < MC_1_20_6 
-						.getOrThrow(false, (message) -> logWarningOnce(message));
+						.getOrThrow(false, LOGGER::error);
 						#else
-						.getOrThrow((message) -> logErrorAndReturnException(message));
+						.getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null));
 						#endif
 				}
 				else
@@ -392,9 +387,9 @@ public class ChunkLoader
 			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
 			
 			#if MC_VER < MC_1_21_3
-			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logWarningOnce(message)).orElse(null);
+			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial(LOGGER::error).orElse(null);
 			#else
-			blendingData = BlendingData.unpack(BlendingData.Packed.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logWarningOnce(message)).orElse(null));
+			blendingData = BlendingData.unpack(BlendingData.Packed.CODEC.parse(blendingDataTag).resultOrPartial(LOGGER::error).orElse(null));
 			#endif
 		}
 		return blendingData;
@@ -520,61 +515,15 @@ public class ChunkLoader
 		}
 	}
 	
-	
-	
-	//=========//
-	// logging //
-	//=========//
-	
 	private static void logBlockDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
 	{
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
-		{
-			LOGGER.warn("Unable to deserialize blocks for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
-			
-			return newMessage;
-		});
+		LOGGER.warn("Unable to deserialize blocks for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+message+"]. This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
 	}
 	private static void logBiomeDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
 	{
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) -> 
-		{
-			LOGGER.warn("Unable to deserialize biomes for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
-			
-			return newMessage;
-		});
+		LOGGER.warn("Unable to deserialize biomes for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+message+"]. This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
 	}
 	
-	private static void logWarningOnce(String message) { logWarningOnce(message, null); }
-	private static void logWarningOnce(String message, Exception e)
-	{
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
-		{
-			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.",
-					e);
-			
-			return newMessage;
-		});
-	}
-	
-	private static RuntimeException logErrorAndReturnException(String message)
-	{
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
-		{
-			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
-			
-			return newMessage;
-		});
-		
-		// Currently we want to ignore these errors, if returning null is a problem, we can change this later
-		return null; //new RuntimeException(message);
-	}
-	
-	
 	
 	
 	//================//