Merge 1.19.4 into 1.20
This commit is contained in:
commit
60d06c92f6
|
|
@ -2,13 +2,17 @@ package org.embeddedt.modernfix.dynamicresources;
|
||||||
|
|
||||||
import com.google.common.base.Splitter;
|
import com.google.common.base.Splitter;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
import com.mojang.datafixers.util.Pair;
|
||||||
|
import net.minecraft.client.resources.model.*;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.level.block.Block;
|
import net.minecraft.world.level.block.Block;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraft.world.level.block.state.StateDefinition;
|
import net.minecraft.world.level.block.state.StateDefinition;
|
||||||
import net.minecraft.world.level.block.state.properties.Property;
|
import net.minecraft.world.level.block.state.properties.Property;
|
||||||
|
import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.function.BiFunction;
|
||||||
|
|
||||||
public class ModelBakeryHelpers {
|
public class ModelBakeryHelpers {
|
||||||
/**
|
/**
|
||||||
|
|
@ -78,4 +82,13 @@ public class ModelBakeryHelpers {
|
||||||
}
|
}
|
||||||
return ImmutableList.copyOf(finalList);
|
return ImmutableList.copyOf(finalList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static ModernFixClientIntegration bakedModelWrapper(BiFunction<ResourceLocation, Pair<UnbakedModel, BakedModel>, BakedModel> consumer) {
|
||||||
|
return new ModernFixClientIntegration() {
|
||||||
|
@Override
|
||||||
|
public BakedModel onBakedModelLoad(ResourceLocation location, UnbakedModel baseModel, BakedModel originalModel, ModelState state, ModelBakery bakery) {
|
||||||
|
return consumer.apply(location, Pair.of(baseModel, originalModel));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user