Revert KubeJS compatibility changes

Fixes enchantment upgrade recipes disappearing upon reload (#460)

Tested and working with KubeJS - I guess they stopped doing whatever horrible thing they were doing to break this in the first place

Author: unilock

gradle.properties

@@ -8,7 +8,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.8.6
+mod_version=1.8.7
 maven_group=de.dafuqs
 archives_base_name=spectrum
 

src/main/java/de/dafuqs/spectrum/mixin/RecipeManagerMixin.java

@@ -0,0 +1,24 @@
+package de.dafuqs.spectrum.mixin;
+
+import com.google.common.collect.*;
+import com.llamalad7.mixinextras.sugar.*;
+import de.dafuqs.spectrum.recipe.enchantment_upgrade.*;
+import de.dafuqs.spectrum.registries.*;
+import net.minecraft.recipe.*;
+import net.minecraft.util.*;
+import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.*;
+
+import java.util.*;
+
+@Mixin(RecipeManager.class)
+public class RecipeManagerMixin {
+	@Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/ImmutableMap;builder()Lcom/google/common/collect/ImmutableMap$Builder;", remap = false))
+	public void injectEnchantmentUpgradeRecipes(CallbackInfo info, @Local(ordinal = 1) Map<RecipeType<?>, ImmutableMap.Builder<Identifier, Recipe<?>>> recipes, @Local(ordinal = 0) ImmutableMap.Builder<Identifier, Recipe<?>> recipesById) {
+		ImmutableMap<Identifier, Recipe<?>> collectedRecipes = EnchantmentUpgradeRecipeSerializer.enchantmentUpgradeRecipesToInject.stream().collect(ImmutableMap.toImmutableMap(EnchantmentUpgradeRecipe::getId, enchantmentUpgradeRecipe -> enchantmentUpgradeRecipe));
+		
+		recipes.computeIfAbsent(SpectrumRecipeTypes.ENCHANTMENT_UPGRADE, (recipeType) -> ImmutableMap.builder()).putAll(collectedRecipes);
+		recipesById.putAll(collectedRecipes);
+	}
+}

src/main/java/de/dafuqs/spectrum/mixin/accessors/RecipeManagerAccessor.java

@@ -21,6 +21,7 @@
 import de.dafuqs.spectrum.registries.client.*;
 import dev.emi.trinkets.api.*;
 import net.fabricmc.fabric.api.entity.event.v1.*;
+import net.fabricmc.fabric.api.event.*;
 import net.fabricmc.fabric.api.event.lifecycle.v1.*;
 import net.fabricmc.fabric.api.event.player.*;
 import net.fabricmc.fabric.api.item.v1.*;
@@ -168,7 +169,6 @@ public static void register() {
 
 			SpectrumCommon.logInfo("Injecting dynamic recipes into recipe manager...");
 			FirestarterIdolBlock.addBlockSmeltingRecipes(server);
-			injectEnchantmentUpgradeRecipes(server);
 		});
 
 		EntitySleepEvents.STOP_SLEEPING.register((entity, sleepingPos) -> {
@@ -380,7 +380,6 @@ public void reload(ResourceManager manager) {
 				SpectrumCommon.CACHED_ITEM_TAG_MAP.clear();
 
 				if (SpectrumCommon.minecraftServer != null) {
-					injectEnchantmentUpgradeRecipes(SpectrumCommon.minecraftServer);
 					FirestarterIdolBlock.addBlockSmeltingRecipes(SpectrumCommon.minecraftServer);
 				}
 			}
@@ -392,27 +391,6 @@ public Identifier getFabricId() {
 		});
 	}
 
-	// It could have been so much easier and performant, but KubeJS overrides the ENTIRE recipe manager
-	// and cancels all sorts of functions at HEAD unconditionally, so Spectrum cannot mixin into it
-	public static void injectEnchantmentUpgradeRecipes(MinecraftServer minecraftServer) {
-		if (!EnchantmentUpgradeRecipeSerializer.enchantmentUpgradeRecipesToInject.isEmpty()) {
-			ImmutableMap<Identifier, Recipe<?>> collectedRecipes = EnchantmentUpgradeRecipeSerializer.enchantmentUpgradeRecipesToInject.stream().collect(ImmutableMap.toImmutableMap(EnchantmentUpgradeRecipe::getId, enchantmentUpgradeRecipe -> enchantmentUpgradeRecipe));
-			Map<RecipeType<?>, Map<Identifier, Recipe<?>>> recipes = ((RecipeManagerAccessor) minecraftServer.getRecipeManager()).getRecipes();
-			
-			ArrayList<Recipe<?>> newList = new ArrayList<>();
-			for (Map<Identifier, Recipe<?>> r : recipes.values()) {
-				newList.addAll(r.values());
-			}
-			for (Recipe<?> recipe : collectedRecipes.values()) {
-				if (!newList.contains(recipe)) {
-					newList.add(recipe);
-				}
-			}
-			
-			minecraftServer.getRecipeManager().setRecipes(newList);
-		}
-	}
-	
 	public static int getFluidLuminance(Fluid fluid) {
 		return fluidLuminance.getOrDefault(fluid, 0);
 	}

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

@@ -69,6 +69,7 @@
     "ProjectileEntityMixin",
     "RandomChanceLootConditionMixin",
     "RandomChanceWithLootingLootConditionMixin",
+    "RecipeManagerMixin",
     "ServerPlayerEntityMixin",
     "ServerPlayerGameModeFabricMixin",
     "ServerPlayerInteractionManagerMixin",
@@ -90,13 +91,12 @@
     "accessors.FluidBlockAccessor",
     "accessors.FoxEntityAccessor",
     "accessors.GoatHornItemAccessor",
-		"accessors.LivingEntityAccessor",
+    "accessors.LivingEntityAccessor",
     "accessors.MapStateAccessor",
     "accessors.MobEntityAccessor",
     "accessors.MooshroomEntityAccessor",
     "accessors.PersistentProjectileEntityAccessor",
     "accessors.ProjectileAttackGoalAccessor",
-    "accessors.RecipeManagerAccessor",
     "accessors.ShapedRecipeAccessor",
     "accessors.SlimeEntityAccessor",
     "accessors.StatusEffectInstanceAccessor",