FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-30 19:38:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More test fixes

Browse source
This commit is contained in:
modmuss50 2024-08-18 17:14:53 +01:00
parent b01b9d36a7
commit c7e4f44cb4
5 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/FurnaceGameTest.java
View file

@ -70,7 +70,8 @@ public class FurnaceGameTest implements FabricGameTest {
context.complete();
}
@GameTest(templateName = EMPTY_STRUCTURE)
// TODO 1.21.2 - test broken as the weird pick does not have a fuel value, so doesnt burn.
// @GameTest(templateName = EMPTY_STRUCTURE)
public void fabricRemainderTest(TestContext context) {
context.setBlockState(POS, Blocks.FURNACE);
FurnaceBlockEntity blockEntity = context.getBlockEntity(POS);

28
fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/DataPackContentsMixin.java
View file

@ -20,9 +20,7 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@ -40,28 +38,20 @@ import net.fabricmc.fabric.impl.resource.conditions.ResourceConditionsImpl;
@Mixin(DataPackContents.class)
public class DataPackContentsMixin {
@Shadow
@Final
private List<Registry.PendingTagLoad<?>> pendingTagLoads;
@Inject(
method = "applyPendingTagLoads",
at = @At("HEAD")
)
private void hookRefresh(CallbackInfo ci) {
ResourceConditionsImpl.LOADED_TAGS.remove();
}
@Inject(
method = "reload",
at = @At("HEAD")
)
private static void hookReload(ResourceManager manager, CombinedDynamicRegistries<ServerDynamicRegistryType> combinedDynamicRegistries, List<Registry.PendingTagLoad<?>> list, FeatureSet enabledFeatures, CommandManager.RegistrationEnvironment environment, int functionPermissionLevel, Executor prepareExecutor, Executor applyExecutor, CallbackInfoReturnable<CompletableFuture<DataPackContents>> cir) {
private static void hookReload(ResourceManager manager, CombinedDynamicRegistries<ServerDynamicRegistryType> combinedDynamicRegistries, List<Registry.PendingTagLoad<?>> pendingTagLoads, FeatureSet enabledFeatures, CommandManager.RegistrationEnvironment environment, int functionPermissionLevel, Executor prepareExecutor, Executor applyExecutor, CallbackInfoReturnable<CompletableFuture<DataPackContents>> cir) {
ResourceConditionsImpl.currentFeatures = enabledFeatures;
}
@Inject(method = "applyPendingTagLoads", at = @At("HEAD"))
private void captureTags(CallbackInfo ci) {
ResourceConditionsImpl.setTags(pendingTagLoads);
}
@Inject(
method = "applyPendingTagLoads",
at = @At("TAIL")
)
private void removeLoadedTags(CallbackInfo ci) {
ResourceConditionsImpl.LOADED_TAGS.remove();
}
}

4
fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/recipe/item_tags_populated.json
View file

@ -1,9 +1,7 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "fabric-resource-conditions-api-v1-testmod:test_condition"
}
"#fabric-resource-conditions-api-v1-testmod:test_condition"
],
"result": {
"id": "minecraft:diamond"

4
fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/recipe/tags_populated.json
View file

@ -1,9 +1,7 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:dirt"
}
"minecraft:dirt"
],
"result": {
"id": "minecraft:diamond"

4
fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/recipe/tags_populated_default.json
View file

@ -1,9 +1,7 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:diamond"
}
"minecraft:diamond"
],
"result": {
"id": "minecraft:dirt"