upgraded to 1.18 pre 5

Neubulae · Nov 30, 2021 · 6136b76 · 6136b76
1 parent f595dc0
commit 6136b76
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -23,6 +23,7 @@ repositories {
 	}
 	maven { url 'https://jitpack.io' } // owo lib // 1.18: https://maven.wispforest.io/
 }
+
 dependencies {
 	// fabric
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -38,7 +39,7 @@ dependencies {
 	modApi("com.terraformersmc:modmenu:${project.modmenu_version}")
 
 	modImplementation "vazkii.patchouli:Patchouli:${project.patchouli_version}"	// https://maven.blamejared.com/vazkii/patchouli/Patchouli/
-	modImplementation "net.darkhax.enchdesc:EnchantmentDescriptionsFabric-${project.enchantment_descriptions_mc_version}:${project.enchantment_descriptions_mod_version}"
+	//modImplementation "net.darkhax.enchdesc:EnchantmentDescriptionsFabric-${project.enchantment_descriptions_mc_version}:${project.enchantment_descriptions_mod_version}"
 	modImplementation "com.github.glisco03:owo-lib:${project.owo_version}"
 
 	modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
@@ -65,7 +66,7 @@ processResources {
 // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
 tasks.withType(JavaCompile) {
 	options.encoding = "UTF-8"
-	it.options.release = 16
+	it.options.release = 17 // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
 }
 
 java {

diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,8 @@
 org.gradle.jvmargs = -Xmx2G
 
 # Fabric Properties
-minecraft_version=1.18-pre1
-yarn_mappings=1.18-pre1+build.14
+minecraft_version=1.18-pre5
+yarn_mappings=1.18-pre5+build.2
 loader_version=0.12.5
 
 # Mod Properties
@@ -12,7 +12,8 @@ maven_group = de.dafuqs.spectrum
 archives_base_name = spectrum
 
 # Dependencies
-fabric_version=0.42.2+1.18
+# last updated 19.11.2021
+fabric_version=0.42.8+1.18
 cloth_config_version=5.0.0
 modmenu_version=2.0.2
 rei_version=6.1.329

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -182,4 +182,4 @@ APP_ARGS=`save "$@"`
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -86,4 +86,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega
diff --git a/src/main/java/de/dafuqs/spectrum/worldgen/SpectrumConfiguredFeatures.java b/src/main/java/de/dafuqs/spectrum/worldgen/SpectrumConfiguredFeatures.java
@@ -122,10 +122,10 @@ private static void registerOres() {
 				CountPlacementModifier.of(6) // number of veins per chunk
 		));
 
-		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, sparklestoneOreIdentifier));
-		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, azuriteOreIdentifier));
-		BiomeModifications.addFeature(BiomeSelectors.foundInTheNether(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, scarletOreIdentifier));
-		BiomeModifications.addFeature(BiomeSelectors.foundInTheEnd(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, paleturOreIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, sparklestoneOreIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, azuriteOreIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.foundInTheNether(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, scarletOreIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.foundInTheEnd(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, paleturOreIdentifier));
 	}
 
 	private static void registerColoredTree(DyeColor dyeColor) {
@@ -201,7 +201,7 @@ private static void registerColoredTrees() {
 		}});
 
 		registerConfiguredFeature(randomColoredTreesFeatureIdentifier, RANDOM_COLORED_TREES_FEATURE);
-		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, randomColoredTreesFeatureIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.PLACED_FEATURE_KEY, randomColoredTreesFeatureIdentifier));
 	}
 
 	private static void registerGeodes() {
@@ -312,8 +312,8 @@ private static void registerGeodes() {
 			BiomePlacementModifier.of()
 		));
 
-		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_STRUCTURES, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, citrineGeodeFeatureIdentifier));
-		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_STRUCTURES, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, topazGeodeFeatureIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_STRUCTURES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, citrineGeodeFeatureIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_STRUCTURES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, topazGeodeFeatureIdentifier));
 	}
 
 	private static void registerPlants() {
@@ -340,7 +340,7 @@ private static void registerPlants() {
 				deepOceans.add(biomeKey);
 			}
 		}
-		BiomeModifications.addFeature(BiomeSelectors.includeByKey(deepOceans), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, mermaidsBrushIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.includeByKey(deepOceans), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.PLACED_FEATURE_KEY, mermaidsBrushIdentifier));
 
 
 		// QUITOXIC REEDS
@@ -372,7 +372,7 @@ private static void registerPlants() {
 				swamps.add(biomeKey);
 			}
 		}
-		BiomeModifications.addFeature(BiomeSelectors.includeByKey(swamps), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, quitoxicReedsIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.includeByKey(swamps), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.PLACED_FEATURE_KEY, quitoxicReedsIdentifier));
 
 		// CLOVERS
 		Identifier cloversIdentifier = new Identifier(SpectrumCommon.MOD_ID, "clovers");
@@ -387,7 +387,7 @@ private static void registerPlants() {
 				)
 		);
 
-		BiomeModifications.addFeature(BiomeSelectors.categories(Biome.Category.PLAINS), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, cloversIdentifier));
+		BiomeModifications.addFeature(BiomeSelectors.categories(Biome.Category.PLAINS), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(Registry.PLACED_FEATURE_KEY, cloversIdentifier));
 	}
 
 	public static final class Rules {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -36,7 +36,8 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": ">=0.42.1",
-    "minecraft": ">=1.17.1",
+    "minecraft": "1.18.x",
+    "java": ">=17",
     "cloth-config2": ">=5.0.37",
     "owo": ">=0.3.0"
   },

diff --git a/src/main/resources/spectrum.mixins.json b/src/main/resources/spectrum.mixins.json
@@ -1,14 +1,13 @@
 {
   "required": true,
   "package": "de.dafuqs.spectrum.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
     "AccessorItem",
     "AccessorShapedRecipe",
     "AnvilBlockMixin",
     "ArmorWithHitEffectProcessor",
     "BlockMixin",
-    "BlockPlacerTypeAccessor",
     "CropBlockMixin",
     "CrossbowItemMixin",
     "EnderEyeItemMixin",
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,4 +86,4 @@ exit /b 1 @@
     :mainEnd
     if "%OS%"=="Windows_NT" endlocal
-    :omega
+    :omega