Merge branch '1.20.1-aria-for-painters' into unlocks-cleanup

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -45,7 +45,7 @@ dependencies {
 	modImplementation ("net.fabricmc:fabric-loader:${project.loader_version}")
 	modImplementation ("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
-	// mine
+	// ours
 	modImplementation ("maven.modrinth:exclusions-lib:${project.exclusionslib_version}")
 	modImplementation ("maven.modrinth:Revelationary:${project.revelationary_version}")
 	modImplementation include("maven.modrinth:AdditionalEntityAttributes:${project.additional_entity_attributes_version}")
@@ -64,7 +64,9 @@ dependencies {
 	// https://github.com/shedaniel/RoughlyEnoughItems
 	modCompileOnly("dev.emi:emi-fabric:${emi_version}") // https://github.com/emilyploszaj/emi
 	// https://github.com/klikli-dev/modonomicon
-	modImplementation("com.klikli_dev:modonomicon-${project.minecraft_version}-fabric:${project.modonomicon_version}") { exclude(group: "com.klikli_dev") }
+	modImplementation("com.klikli_dev:modonomicon-${project.minecraft_version}-fabric:${project.modonomicon_version}") { exclude(group: "com.klikli_dev") exclude(group: "mezz.jei") }
+	modCompileOnly("mezz.jei:jei-1.20.1-fabric:15.20.0.105")
+	// required by modonomicon, though in a very outdated version, so we include our up to date version here
 
 	switch (recipe_viewer.toLowerCase(Locale.ROOT)) {
 		case "rei": modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:$rei_version"); break

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 # Fabric Properties
 minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
-loader_version=0.16.4
+loader_version=0.16.9
 
 # Mod Properties
 mod_version=1.8.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java

@@ -159,7 +159,7 @@ protected void onCollision(HitResult hitResult) {
 	 */
 	@Override
 	protected float getDragInWater() {
-		return 0.1F;
+		return 0.85F;
 	}
 
 	@Override

src/main/java/de/dafuqs/spectrum/items/magic_items/PaintbrushItem.java

@@ -42,11 +42,17 @@ public PaintbrushItem(Settings settings) {
 		super(settings);
 	}
 
-	@Environment(EnvType.CLIENT)
 	@Override
 	public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
 		super.appendTooltip(stack, world, tooltip, context);
 
+		if (world != null && world.isClient) {
+			appendClientTooltips(stack, tooltip);
+		}
+	}
+
+	@Environment(EnvType.CLIENT)
+	private static void appendClientTooltips(ItemStack stack, List<Text> tooltip) {
 		boolean unlockedColoring = AdvancementHelper.hasAdvancementClient(SpectrumAdvancements.PAINTBRUSH_COLORING);
 		boolean unlockedSlinging = AdvancementHelper.hasAdvancementClient(SpectrumAdvancements.PAINTBRUSH_INK_SLINGING);
 		if (unlockedColoring || unlockedSlinging) {
@@ -85,16 +91,10 @@ public NamedScreenHandlerFactory createScreenHandlerFactory(ItemStack itemStack)
 	public Text getName(ItemStack stack) {
 		Text name = Text.translatable(this.getTranslationKey(stack));
 
-		boolean unlockedColoring = AdvancementHelper.hasAdvancementClient(SpectrumAdvancements.PAINTBRUSH_COLORING);
-		boolean unlockedSlinging = AdvancementHelper.hasAdvancementClient(SpectrumAdvancements.PAINTBRUSH_INK_SLINGING);
-		if (unlockedColoring || unlockedSlinging) {
-			Optional<InkColor> color = getColor(stack);
-			if (color.isPresent()) {
-				InkColor inkColor = color.get();
-				name = inkColor.getColoredName().append(" ").append(name);
-			}
-		} else {
-			return super.getName();
+		Optional<InkColor> color = getColor(stack);
+		if (color.isPresent()) {
+			InkColor inkColor = color.get();
+			name = inkColor.getColoredName().append(" ").append(name);
 		}
 
 		return name;

src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java

@@ -180,7 +180,6 @@ public Map<Enchantment, Integer> getDefaultEnchantments() {
 	public static final Item AZURITE_GLASS_AMPOULE = new GlassAmpouleItem(IS.of(Rarity.UNCOMMON));
 	public static final Item MALACHITE_GLASS_AMPOULE = new MalachiteGlassAmpouleItem(IS.of(Rarity.UNCOMMON));
 	public static final Item BLOODSTONE_GLASS_AMPOULE = new BloodstoneGlassAmpouleItem(IS.of(Rarity.UNCOMMON));
-	//public static final Item CRYSTALLIZED_DRAGON_FANG = new CrystallizedDragonFangItem(IS.of(Rarity.UNCOMMON));
 
 	// Special tools
 	public static final Item DREAMFLAYER = new DreamflayerItem(SpectrumToolMaterials.ToolMaterial.DREAMFLAYER, 3, -1.8F, IS.of(1, Rarity.UNCOMMON));

src/main/resources/data/spectrum/advancements/unlocks/enchantments/resonance_crafting.json

@@ -1,34 +1,28 @@
 {
-	"criteria": {
-		"built_complex_pedestal_structure": {
-			"trigger": "revelationary:advancement_gotten",
-			"conditions": {
-				"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
-			}
-		},
-		"built_enchanting_structure": {
-			"trigger": "revelationary:advancement_gotten",
-			"conditions": {
-				"advancement_identifier": "spectrum:midgame/build_enchanting_structure"
-			}
-		},
-		"broken_budding_block_with_resonance_tool": {
-			"trigger": "revelationary:advancement_gotten",
-			"conditions": {
-				"advancement_identifier": "spectrum:lategame/break_budding_block_with_resonance_tool"
-			}
-		},
-		"struck_up_hummingstone_hymn": {
-			"trigger": "revelationary:advancement_gotten",
-			"conditions": {
-				"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
-			}
-		},
+  "criteria": {
+    "built_complex_pedestal_structure": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
+      }
+    },
+    "built_enchanting_structure": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:midgame/build_enchanting_structure"
+      }
+    },
 		"collected_paltaeria_gem": {
-			"trigger": "revelationary:advancement_gotten",
-			"conditions": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
 				"advancement_identifier": "spectrum:hidden/collect_paltaeria_gem"
-			}
-		}
-	}
+      }
+    },
+    "struck_up_hummingstone_hymn": {
+      "trigger": "revelationary:advancement_gotten",
+      "conditions": {
+        "advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
+      }
+    }
+  }
 }