Skip to content

Commit 3d339b5

Browse files
gabizougabizou
committed
fix(recipes): handle Neo changed RecipeManager
1 parent 0469dc9 commit 3d339b5

6 files changed

Lines changed: 140 additions & 32 deletions

File tree

‎forge/src/mixins/resources/mixins.spongeforge.core.shared.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"mixins": [
77
"world.entity.LivingEntityMixin_Shared_Damage",
88
"world.entity.player.PlayerMixin_Shared_Damage",
9-
"world.entity.projectile.FishingHookMixin_Shared"
9+
"world.entity.projectile.FishingHookMixin_Shared",
10+
"world.item.crafting.RecipeManagerMixin_Shared"
1011
],
1112
"overwrites": {
1213
"conformVisibility": true

‎neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/item/crafting/RecipeManagerMixin_Neo.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
* This file is part of Sponge, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) SpongePowered <https://www.spongepowered.org>
5+
* Copyright (c) contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
25+
package org.spongepowered.neoforge.mixin.core.world.item.crafting;
26+
27+
import com.google.gson.JsonElement;
28+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
29+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
30+
import com.mojang.serialization.Codec;
31+
import com.mojang.serialization.DynamicOps;
32+
import net.minecraft.resources.FileToIdConverter;
33+
import net.minecraft.resources.Identifier;
34+
import net.minecraft.server.packs.resources.ResourceManager;
35+
import net.minecraft.world.item.crafting.Recipe;
36+
import net.minecraft.world.item.crafting.RecipeManager;
37+
import org.spongepowered.api.registry.Registry;
38+
import org.spongepowered.api.registry.RegistryHolder;
39+
import org.spongepowered.api.registry.RegistryTypes;
40+
import org.spongepowered.asm.mixin.Mixin;
41+
import org.spongepowered.asm.mixin.injection.At;
42+
import org.spongepowered.common.launch.Launch;
43+
import org.spongepowered.common.registry.RegistryHolderLogic;
44+
import org.spongepowered.common.registry.SpongeRegistryHolder;
45+
46+
import java.util.Map;
47+
import java.util.SortedMap;
48+
import java.util.TreeMap;
49+
import java.util.function.Consumer;
50+
import java.util.stream.Stream;
51+
52+
@Mixin(RecipeManager.class)
53+
public abstract class RecipeManagerMixin_Neo {
54+
55+
@SuppressWarnings("unchecked")
56+
@WrapOperation(method = "prepare(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/world/item/crafting/RecipeMap;",
57+
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/resources/SimpleJsonResourceReloadListener;scanDirectoryWithModifier(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;Ljava/util/function/Consumer;)V"))
58+
private void impl$onPrepare(final ResourceManager $$0, final FileToIdConverter $$1, final DynamicOps<JsonElement> $$2, final Codec<Recipe<?>> $$3,
59+
final Map<Identifier, Recipe<?>> $$4, final Consumer<Map<Identifier, JsonElement>> $$5, final Operation<Void> original) {
60+
SortedMap<Identifier, Recipe<?>> result = new TreeMap<>();
61+
original.call($$0, $$1, $$2, $$3, result, $$5);
62+
final RegistryHolderLogic registryHolder = ((SpongeRegistryHolder) $$0).registryHolder();
63+
final Registry<Recipe<?>> registry = (Registry<Recipe<?>>) (Object) registryHolder.registry(RegistryTypes.RECIPE);
64+
result.forEach((k, v) -> registry.register((org.spongepowered.api.ResourceKey) (Object) k, v));
65+
Launch.instance().lifecycle().processServerRegistries((RegistryHolder) $$0, Stream.of(registry));
66+
registry.streamEntries().forEach(e -> $$4.put((Identifier) (Object) e.key(), e.value()));
67+
}
68+
}

‎neoforge/src/mixins/resources/mixins.spongeneo.core.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"world.entity.projectile.FishingHookMixin_Neo",
3838
"world.entity.vehicle.boat.AbstractBoatMixin_Neo",
3939
"world.level.ServerExplosionMixin_NeoForge",
40+
"world.item.crafting.RecipeManagerMixin_Neo",
4041
"world.level.block.FireBlockMixin_Neo",
4142
"world.level.block.entity.AbstractFurnaceBlockEntityMixin_Neo"
4243
],

‎src/mixins/java/org/spongepowered/common/mixin/core/world/item/crafting/RecipeManagerMixin.java‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,18 @@
2424
*/
2525
package org.spongepowered.common.mixin.core.world.item.crafting;
2626

27-
import com.google.gson.JsonElement;
2827
import com.google.gson.JsonObject;
29-
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
30-
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
3128
import com.mojang.serialization.Codec;
3229
import com.mojang.serialization.DataResult;
3330
import com.mojang.serialization.DynamicOps;
3431
import net.minecraft.core.HolderLookup;
35-
import net.minecraft.resources.FileToIdConverter;
36-
import net.minecraft.resources.Identifier;
3732
import net.minecraft.resources.ResourceKey;
38-
import net.minecraft.server.packs.resources.ResourceManager;
3933
import net.minecraft.world.item.crafting.Recipe;
4034
import net.minecraft.world.item.crafting.RecipeManager;
41-
import org.spongepowered.api.registry.Registry;
42-
import org.spongepowered.api.registry.RegistryHolder;
43-
import org.spongepowered.api.registry.RegistryTypes;
4435
import org.spongepowered.asm.mixin.Mixin;
4536
import org.spongepowered.asm.mixin.injection.At;
4637
import org.spongepowered.asm.mixin.injection.Redirect;
4738
import org.spongepowered.common.SpongeCommon;
48-
import org.spongepowered.common.launch.Launch;
49-
import org.spongepowered.common.registry.RegistryHolderLogic;
50-
import org.spongepowered.common.registry.SpongeRegistryHolder;
51-
52-
import java.util.Map;
53-
import java.util.SortedMap;
54-
import java.util.TreeMap;
55-
import java.util.stream.Stream;
5639

5740
@Mixin(RecipeManager.class)
5841
public abstract class RecipeManagerMixin {
@@ -77,17 +60,4 @@ public abstract class RecipeManagerMixin {
7760
return parsed;
7861
}
7962

80-
@SuppressWarnings("unchecked")
81-
@WrapOperation(method = "prepare(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/world/item/crafting/RecipeMap;",
82-
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/resources/SimpleJsonResourceReloadListener;scanDirectory(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V"))
83-
private void impl$onPrepare(final ResourceManager $$0, final FileToIdConverter $$1, final DynamicOps<JsonElement> $$2, final Codec<Recipe<?>> $$3,
84-
final Map<Identifier, Recipe<?>> $$4, final Operation<Void> original) {
85-
SortedMap<Identifier, Recipe<?>> result = new TreeMap<>();
86-
original.call($$0, $$1, $$2, $$3, result);
87-
final RegistryHolderLogic registryHolder = ((SpongeRegistryHolder) $$0).registryHolder();
88-
final Registry<Recipe<?>> registry = (Registry<Recipe<?>>) (Object) registryHolder.registry(RegistryTypes.RECIPE);
89-
result.forEach((k, v) -> registry.register((org.spongepowered.api.ResourceKey) (Object) k, v));
90-
Launch.instance().lifecycle().processServerRegistries((RegistryHolder) $$0, Stream.of(registry));
91-
registry.streamEntries().forEach(e -> $$4.put((Identifier) (Object) e.key(), e.value()));
92-
}
9363
}

‎src/mixins/java/org/spongepowered/common/mixin/core/world/item/crafting/RecipeManagerMixin_Shared.java‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
* This file is part of Sponge, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) SpongePowered <https://www.spongepowered.org>
5+
* Copyright (c) contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
25+
package org.spongepowered.common.mixin.core.world.item.crafting;
26+
27+
import com.google.gson.JsonElement;
28+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
29+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
30+
import com.mojang.serialization.Codec;
31+
import com.mojang.serialization.DynamicOps;
32+
import net.minecraft.resources.FileToIdConverter;
33+
import net.minecraft.resources.Identifier;
34+
import net.minecraft.server.packs.resources.ResourceManager;
35+
import net.minecraft.world.item.crafting.Recipe;
36+
import net.minecraft.world.item.crafting.RecipeManager;
37+
import org.spongepowered.api.registry.Registry;
38+
import org.spongepowered.api.registry.RegistryHolder;
39+
import org.spongepowered.api.registry.RegistryTypes;
40+
import org.spongepowered.asm.mixin.Mixin;
41+
import org.spongepowered.asm.mixin.injection.At;
42+
import org.spongepowered.common.launch.Launch;
43+
import org.spongepowered.common.registry.RegistryHolderLogic;
44+
import org.spongepowered.common.registry.SpongeRegistryHolder;
45+
46+
import java.util.Map;
47+
import java.util.SortedMap;
48+
import java.util.TreeMap;
49+
import java.util.stream.Stream;
50+
51+
@Mixin(RecipeManager.class)
52+
public abstract class RecipeManagerMixin_Shared {
53+
54+
@SuppressWarnings("unchecked")
55+
@WrapOperation(method = "prepare(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/world/item/crafting/RecipeMap;",
56+
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/resources/SimpleJsonResourceReloadListener;scanDirectory(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V"))
57+
private void impl$onPrepare(final ResourceManager $$0, final FileToIdConverter $$1, final DynamicOps<JsonElement> $$2, final Codec<Recipe<?>> $$3,
58+
final Map<Identifier, Recipe<?>> $$4, final Operation<Void> original) {
59+
SortedMap<Identifier, Recipe<?>> result = new TreeMap<>();
60+
original.call($$0, $$1, $$2, $$3, result);
61+
final RegistryHolderLogic registryHolder = ((SpongeRegistryHolder) $$0).registryHolder();
62+
final Registry<Recipe<?>> registry = (Registry<Recipe<?>>) (Object) registryHolder.registry(RegistryTypes.RECIPE);
63+
result.forEach((k, v) -> registry.register((org.spongepowered.api.ResourceKey) (Object) k, v));
64+
Launch.instance().lifecycle().processServerRegistries((RegistryHolder) $$0, Stream.of(registry));
65+
registry.streamEntries().forEach(e -> $$4.put((Identifier) (Object) e.key(), e.value()));
66+
}
67+
}

‎vanilla/src/mixins/resources/mixins.spongevanilla.core.shared.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"mixins": [
77
"world.entity.LivingEntityMixin_Shared_Damage",
88
"world.entity.player.PlayerMixin_Shared_Damage",
9-
"world.entity.projectile.FishingHookMixin_Shared"
9+
"world.entity.projectile.FishingHookMixin_Shared",
10+
"world.item.crafting.RecipeManagerMixin_Shared"
1011
],
1112
"overwrites": {
1213
"conformVisibility": true

0 commit comments

Comments
 (0)