Symbolics round 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,6 +8,8 @@ assignees: ''
 ---
 
 **Note:** If the bug happens on Forge/Neoforge in combination with **Sinytra Connector**, please report all issues to Sinytra Connector instead
+**Note:** Currently supported versions: Minecraft 1.21.1 @ Fabric & Neoforge
+**Note:** Known Incompatibilities: Enchancement
 
 **Describe the bug**
 A clear and concise description of what the bug is.

build.gradle

@@ -2,7 +2,6 @@ plugins {
 	id 'maven-publish'
 	id 'idea'
 	id 'net.neoforged.moddev' version '2.0.140'
-	id 'org.openrewrite.rewrite' version "latest.release"
 }
 
 version = project.mod_version
@@ -11,7 +10,11 @@ group = project.maven_group
 repositories {
 	maven { url = "https://maven.is-immensely.gay/releases" } // Revelationary, Fractal, AEA, Arrowhead, ...
 	maven { url = "https://maven.shedaniel.me/" } // REI
-	maven { url = "https://maven.terraformersmc.com/" } // Modmenu, EMI
+	//maven { url = "https://maven.terraformersmc.com/" }
+	maven {
+		name = "Sleeping Town"
+		url = "https://repo.sleeping.town/"
+	} // EMI
 	maven { url = "https://maven.nucleoid.xyz/" } // Common Protection API
 	maven { url = "https://maven.blamejared.com" } // JEI, Botania
 	maven { url = "https://maven.ladysnake.org/releases" } // Cardinal Components API
@@ -31,10 +34,6 @@ repositories {
 	mavenCentral()
 }
 
-rewrite {
-	activeRecipe "org.openrewrite.java.jspecify.JSpecifyBestPractices"
-}
-
 base {
 	archivesName = mod_id
 }
@@ -67,6 +66,18 @@ neoForge {
 			programArgument '--uuid=5010ad09-0229-4d70-8a2c-bc254821dcb3'
 		}
 
+		// introduced in MC 1.21.9
+		// client_debug {
+		// 	client()
+		// 	programArgument '-DMC_DEBUG_ENABLED'
+		// 	programArgument '-DMC_DEBUG_PATHFINDING'
+		// 	programArgument '-DMC_DEBUG_SHAPES'
+		// 	programArgument '-DMC_DEBUG_STRUCTURES'
+		// 	programArgument '-DMC_DEBUG_STRUCTURE_EDIT_MODE'
+		// 	programArgument '-DMC_DEBUG_STRUCTURE_GOAL_SELECTOR'
+		// 	programArgument '-DMC_DEBUG_KEEP_JIGSAW_BLOCKS_DURING_STRUCTURE_GEN'
+		// }
+
 		server {
 			server()
 			programArgument '--nogui'
@@ -97,8 +108,6 @@ configurations {
 }
 
 dependencies {
-	rewrite "org.openrewrite.recipe:rewrite-migrate-java:3.34.1"
-
 	// TODO: remove additionalRuntimeClasspath for MC 1.21.9+
 	// see https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#external-dependencies-runs
 	// jgrapht (the graph lib we use) and its dependencies
@@ -140,7 +149,6 @@ dependencies {
 
 	// Mod Compat
 	// KNOWN INCOMPAT: Colorful Hearts completely overrides neos heart rendering, making hearts unable to be modified by divinity / deadly poison
-	// implementation("maven.modrinth:colorful-hearts:${project.colorful_hearts_version}") { transitive = false }
 	/*implementation*/ /*runtimeOnly*/ compileOnly("maven.modrinth:sodium:${project.sodium_version}") { transitive = false }
 	/*implementation*/ /*runtimeOnly*/ compileOnly("com.unascribed:ears-api:${project.ears_version}") { transitive = false }
 	/*implementation*/ /*runtimeOnly*/ compileOnly("maven.modrinth:create:${project.create_version}") { transitive = false }

disabled/compat/botania/BotaniaCompat.java

@@ -0,0 +1,72 @@
+package de.dafuqs.spectrum.compat.botania;
+
+import de.dafuqs.fractal.api.*;
+import de.dafuqs.spectrum.api.color.*;
+import de.dafuqs.spectrum.api.ink.color.*;
+import de.dafuqs.spectrum.api.interaction.*;
+import de.dafuqs.spectrum.api.item_group.*;
+import de.dafuqs.spectrum.compat.*;
+import de.dafuqs.spectrum.registries.*;
+import net.minecraft.world.entity.player.*;
+import net.minecraft.world.item.*;
+import net.minecraft.world.level.block.*;
+import vazkii.botania.common.item.*;
+
+import static de.dafuqs.spectrum.registries.SpectrumItems.*;
+
+@SuppressWarnings("unused")
+public class BotaniaCompat extends SpectrumIntegrationPacks.ModIntegrationPack {
+
+	public static Item LEAST_BLACK_LOTUS = SpectrumItems.register(simple(item("least_black_lotus", new LeastBlackLotusItem(new Item.Properties()), InkColors.BLACK)));
+	public static Item BLACKEST_LOTUS = SpectrumItems.register(simple(item("blackest_lotus", new BlackestLotusItem(new Item.Properties()), InkColors.BLACK)));
+
+	@Override
+	public void register() {
+		// registering it late, since Botania might not have been initialized yet
+		ServerLifecycleEvents.SERVER_STARTED.register(minecraftServer -> {
+			ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.overgrowthSeed, InkColors.LIME);
+			ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.blackLotus, InkColors.BLACK);
+			ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.blackerLotus, InkColors.BLACK);
+			ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.terrasteel, InkColors.LIME);
+
+			ItemProviderRegistry.register(BotaniaItems.blackHoleTalisman, new ItemProvider() {
+				@Override
+				public int getItemCount(Player player, ItemStack stack, Item requestedItem) {
+					if (requestedItem instanceof BlockItem blockItem) {
+						Block storedBlock = BlackHoleTalismanItem.getBlock(stack);
+						if (blockItem.getBlock() == storedBlock) {
+							return BlackHoleTalismanItem.getBlockCount(stack);
+						}
+					}
+					return 0;
+				}
+
+				@Override
+				public int provideItems(Player player, ItemStack stack, Item requestedItem, int amount) {
+					if (requestedItem instanceof BlockItem blockItem) {
+						Block storedBlock = BlackHoleTalismanItem.getBlock(stack);
+						if (blockItem.getBlock() == storedBlock) {
+							int storedAmount = BlackHoleTalismanItem.getBlockCount(stack);
+							int amountToRemove = Math.min(storedAmount, amount);
+							BlackHoleTalismanItem.setCount(stack, storedAmount - amountToRemove);
+							return amountToRemove;
+						}
+					}
+					return 0;
+				}
+			});
+		});
+
+		ItemSubGroupEvents.modifyEntriesEvent(ItemGroupIDs.SUBTAB_EQUIPMENT).register(entries -> {
+			entries.accept(LEAST_BLACK_LOTUS);
+			entries.accept(BLACKEST_LOTUS);
+		});
+	}
+
+
+	@Override
+	public void registerClient() {
+
+	}
+
+}

disabled/datagen/java/de/dafuqs/spectrum/data/BlockDatagen.java

@@ -2,7 +2,7 @@
 
 import de.dafuqs.spectrum.*;
 import de.dafuqs.spectrum.api.color.*;
-import de.dafuqs.spectrum.api.energy.color.*;
+import de.dafuqs.spectrum.api.ink.color.*;
 import de.dafuqs.spectrum.blocks.*;
 import de.dafuqs.spectrum.blocks.amphora.*;
 import de.dafuqs.spectrum.blocks.block_flooder.*;
@@ -24,7 +24,7 @@
 import de.dafuqs.spectrum.blocks.enchanter.*;
 import de.dafuqs.spectrum.blocks.end_portal.*;
 import de.dafuqs.spectrum.blocks.ender.*;
-import de.dafuqs.spectrum.blocks.energy.*;
+import de.dafuqs.spectrum.blocks.ink.*;
 import de.dafuqs.spectrum.blocks.farming.*;
 import de.dafuqs.spectrum.blocks.fluid.*;
 import de.dafuqs.spectrum.blocks.fusion_shrine.*;

disabled/datagen/java/de/dafuqs/spectrum/data/SpectrumItems.java

@@ -3,7 +3,7 @@
 import de.dafuqs.revelationary.api.revelations.*;
 import de.dafuqs.spectrum.*;
 import de.dafuqs.spectrum.api.color.*;
-import de.dafuqs.spectrum.api.energy.color.*;
+import de.dafuqs.spectrum.api.ink.color.*;
 import de.dafuqs.spectrum.api.item.*;
 import de.dafuqs.spectrum.blocks.conditional.*;
 import de.dafuqs.spectrum.blocks.gravity.*;
@@ -17,7 +17,7 @@
 import de.dafuqs.spectrum.items.bundles.*;
 import de.dafuqs.spectrum.items.conditional.*;
 import de.dafuqs.spectrum.items.conditional.CloakedItem;
-import de.dafuqs.spectrum.items.energy.*;
+import de.dafuqs.spectrum.items.ink.*;
 import de.dafuqs.spectrum.items.food.*;
 import de.dafuqs.spectrum.items.food.beverages.*;
 import de.dafuqs.spectrum.items.item_frame.*;
@@ -232,7 +232,6 @@ public Map<ResourceKey<Enchantment>, Integer> getDefaultEnchantments() {
 
 	// Fluid Buckets
 	public static final DeferredItem<Item> LIQUID_CRYSTAL_BUCKET = register(simple(item("liquid_crystal_bucket", () -> new BucketItem(SpectrumFluids.LIQUID_CRYSTAL.get(), IS.of(1).craftRemainder(BUCKET)), InkColors.LIGHT_GRAY)));
-	public static final DeferredItem<Item> SLUDGE_BUCKET = register(simple(item("sludge_bucket", () -> new BucketItem(SpectrumFluids.SLUDGE.get(), IS.of(1).craftRemainder(BUCKET)), InkColors.BROWN)));
 	public static final DeferredItem<Item> MIDNIGHT_SOLUTION_BUCKET = register(simple(item("midnight_solution_bucket", () -> new BucketItem(SpectrumFluids.MIDNIGHT_SOLUTION.get(), IS.of(1).craftRemainder(BUCKET)), InkColors.GRAY)));
 	public static final DeferredItem<Item> DRAGONROT_BUCKET = register(simple(item("dragonrot_bucket", () -> new BucketItem(SpectrumFluids.DRAGONROT.get(), IS.of(1).craftRemainder(BUCKET)), InkColors.LIGHT_GRAY)));
 

disabled/datagen/java/de/dafuqs/spectrum/data/SpectrumRecipeProvider.java

@@ -2,7 +2,7 @@
 
 import com.mojang.datafixers.util.*;
 import de.dafuqs.spectrum.*;
-import de.dafuqs.spectrum.api.energy.color.*;
+import de.dafuqs.spectrum.api.ink.color.*;
 import de.dafuqs.spectrum.recipe.*;
 import de.dafuqs.spectrum.recipe.crystallarieum.*;
 import de.dafuqs.spectrum.recipe.enchanter.*;

gradle.properties

@@ -9,44 +9,44 @@ org.gradle.caching=true
 minecraft_version=1.21.1
 parchment_minecraft_version=1.21.1
 parchment_mappings_version=2024.11.17
-neoforge_version=21.1.222
-neoforge_version_range=[21.1.186,)
+neoforge_version=21.1.249
+neoforge_version_range=[21.1.249,)
 
 # Mod Properties
 mod_id=spectrum
-mod_version=1.11.8-1.21.1-neo
+mod_version=1.12.9-1.21.1-neo
 maven_group=de.dafuqs
 archives_base_name=Spectrum
 
 # Dependencies
 modmenu_version=11.0.3
 rei_version=16.0.799
-emi_version=1.1.22+1.21.1
+emi_version=1.1.24+1.21.1
 architectury_version=13.0.8
 # https://cloudsmith.io/~klikli-dev/repos/mods/groups/
-modonomicon_version=1.117.4
+modonomicon_version=1.120.4
 modonomicon_version_range=[1.117.4,)
-# https://maven.terraformersmc.com/releases/dev/emi/trinkets/
-trinkets_version=3.10.0
 # https://maven.is-immensely.gay/#/releases/de/dafuqs/additionalentityattributes
 additional_entity_attributes_version=2.0.2+1.21.1-neoforge
 # https://maven.is-immensely.gay/#/releases/de/dafuqs/revelationary/revelationary
-revelationary_version=1.5.0+1.21.1
-revelationary_version_range=[1.5.0+1.21.1,)
+revelationary_version=1.5.2+1.21.1
+revelationary_version_range=[1.5.2+1.21.1,)
+# https://modrinth.com/mod/curios/
+curios_version=9.5.1+1.21.1
+curios_version_range=[9.5.1+1.21.1,)
 # https://maven.is-immensely.gay/#/releases/de/dafuqs/fractal
 fractal_version=1.8.2+1.21.1-neoforge
 # https://maven.is-immensely.gay/#/releases/de/dafuqs/arrowhead
 arrowhead_version=2.1.0+1.21.1-neoforge
-# https://github.com/Terrails/colorful-heartsf
-colorful_hearts_version=us0gze50
 # https://modrinth.com/mod/sodium
 sodium_version=mc1.21.1-0.6.13-neoforge
 # https://modrinth.com/mod/ears
 ears_version=1.4.7
 # https://modrinth.com/mod/travelersbackpack/
 travelers_backpack_version=1.21.1-10.1.31
 # https://modrinth.com/mod/botania/
-botania_version=454-SNAPSHOT
+# https://maven.blamejared.com/vazkii/botania/botania-neoforge-1.21.1/
+botania_version=455-20260812.060955-47
 # https://modrinth.com/mod/create-fabric
 create_version=mc1.21.1-6.0.9
 # https://modrinth.com/mod/malum
@@ -61,9 +61,7 @@ vanityslots_version=xWfEA0yC
 
 # What recipe viewer to use ('emi', 'rei', or 'disabled')
 recipe_viewer=emi
+
 # Datagen runtime mod versions
 gobber_version=5736976
-ae2_version=eDnBiYjR
-# https://modrinth.com/mod/curios/
-curios_version=9.5.1+1.21.1
-curios_version_range=[9.5.1+1.21.1,)
+ae2_version=eDnBiYjR

gradle/wrapper/gradle-wrapper.properties

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

raw/Generate-CrystallaeriumGrowables.ps1

@@ -463,7 +463,7 @@ foreach($entry in $entries.GetEnumerator()) {
     New-Item -Path ".\crystallarieum\$name`.json" -ItemType File -Force -Value @"
 {
   "type": "spectrum:crystallarieum_growing",
-  "fluid_medium": {
+  "fluid": {
     "fluid": "$Fluid"
   },
   "ingredient": {
@@ -472,13 +472,13 @@ foreach($entry in $entries.GetEnumerator()) {
   "ink_color": "$InkColor",
   "ink_cost_tier": xxx,
   "seconds_per_growth_stage": 60,
-  "additional_recipe_manager_results": [
+  "additional_recipe_viewer_results": [
     {
       "count": 1,
       "id": "spectrum:pure_$name"
     }
   ],
-  "catalysts": [
+  "additives": [
     {
       "consume_chance_per_second": x.x,
       "growth_acceleration_mod": x.x,