mirror of
https://github.com/FabricMC/fabric.git
synced 2025-02-17 20:21:28 -05:00
Make custom ingredient types and load conditions appear early in generated JSONs (#3020)
This commit is contained in:
parent
f4f4ac6445
commit
6cebf059ec
2 changed files with 41 additions and 0 deletions
|
@ -0,0 +1,40 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.fabricmc.fabric.mixin.datagen;
|
||||||
|
|
||||||
|
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
import net.minecraft.data.DataProvider;
|
||||||
|
|
||||||
|
import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditions;
|
||||||
|
import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientImpl;
|
||||||
|
|
||||||
|
@Mixin(DataProvider.class)
|
||||||
|
public interface DataProviderMixin {
|
||||||
|
/**
|
||||||
|
* Adjust the default sort order of some keys provided by Fabric API.
|
||||||
|
*/
|
||||||
|
@Inject(method = "method_43808", at = @At("RETURN"))
|
||||||
|
private static void addFabricKeySortOrders(Object2IntOpenHashMap<String> map, CallbackInfo ci) {
|
||||||
|
map.put(ResourceConditions.CONDITIONS_KEY, -100); // always at the beginning
|
||||||
|
map.put(CustomIngredientImpl.TYPE_KEY, 0); // mimic vanilla "type"
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,6 +4,7 @@
|
||||||
"compatibilityLevel": "JAVA_16",
|
"compatibilityLevel": "JAVA_16",
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"loot.BlockLootTableGeneratorMixin",
|
"loot.BlockLootTableGeneratorMixin",
|
||||||
|
"DataProviderMixin",
|
||||||
"TagProviderMixin",
|
"TagProviderMixin",
|
||||||
"ModelProviderMixin",
|
"ModelProviderMixin",
|
||||||
"TagBuilderMixin"
|
"TagBuilderMixin"
|
||||||
|
|
Loading…
Reference in a new issue