FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-25 00:58:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make custom ingredient types and load conditions appear early in generated JSONs (#3020)

Browse source
This commit is contained in:
Technici4n 2023-04-23 14:02:58 +02:00 committed by GitHub
parent f4f4ac6445
commit 6cebf059ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/DataProviderMixin.java Normal file
View file

@ -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"
}
}

1
fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json
View file

@ -4,6 +4,7 @@
"compatibilityLevel": "JAVA_16",
"mixins": [
"loot.BlockLootTableGeneratorMixin",
"DataProviderMixin",
"TagProviderMixin",
"ModelProviderMixin",
"TagBuilderMixin"