mirror of
https://github.com/FabricMC/fabric.git
synced 2025-04-15 00:14:28 -04:00
1.21.5-pre1
This commit is contained in:
modmuss50
parent
16a33fb608
commit
f3eb6d3bab
7 changed files with 55 additions and 54 deletions
fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input
fabric-data-generation-api-v1/src/main/resources
fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric
api/client/model/loading/v1/wrapper
mixin/client/model/loading
fabric-transitive-access-wideners-v1
gradle.properties|
|
@ -19,25 +19,26 @@ package net.fabricmc.fabric.mixin.client.gametest.input;
|
|||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import com.mojang.blaze3d.textures.GpuTexture;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gl.FramebufferManager;
|
||||
import net.minecraft.client.gl.GlResourceManager;
|
||||
import net.minecraft.client.texture.DrawableTexture;
|
||||
|
||||
import net.fabricmc.fabric.impl.client.gametest.util.WindowHooks;
|
||||
|
||||
@Mixin(GlResourceManager.class)
|
||||
public class GlResourceManagerMixin {
|
||||
@WrapOperation(method = "method_68357", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_glBlitFrameBuffer(IIIIIIIIII)V"))
|
||||
private void blitFrameBuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter, Operation<Void> original, @Local(argsOnly = true) DrawableTexture drawableTexture) {
|
||||
if (drawableTexture == MinecraftClient.getInstance().getFramebuffer().getColorAttachment()) {
|
||||
@WrapOperation(method = "presentTexture", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gl/FramebufferManager;method_68812(IIIIIIIIIIII)V"))
|
||||
private void blitFrameBuffer(FramebufferManager manager, int readFramebuffer, int drawFramebuffer, int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter, Operation<Void> original, @Local(argsOnly = true) GpuTexture gpuTexture) {
|
||||
if (gpuTexture == MinecraftClient.getInstance().getFramebuffer().method_30277()) {
|
||||
WindowHooks window = ((WindowHooks) (Object) MinecraftClient.getInstance().getWindow());
|
||||
dstX1 = window.fabric_getRealFramebufferWidth();
|
||||
dstY1 = window.fabric_getRealFramebufferHeight();
|
||||
}
|
||||
|
||||
original.call(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
|
||||
original.call(manager, readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,9 +143,9 @@ transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createSha
|
|||
transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder;
|
||||
transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModelVariant (Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/json/ModelVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModel (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModel ([Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModel (Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWeightedVariant (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWeightedVariant ([Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWeightedVariant (Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createMultipartConditionBuilder ()Lnet/minecraft/client/render/model/json/MultipartModelConditionBuilder;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator or ([Lnet/minecraft/client/render/model/json/MultipartModelConditionBuilder;)Lnet/minecraft/client/render/model/json/MultipartModelCondition;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStoneState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
|
|
@ -162,34 +162,34 @@ transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;Ljava/lang/String;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTwoLayerItemModel (Lnet/minecraft/block/Block;Ljava/lang/String;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator modelWithYRotation (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator modelWithMirroring (Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createBooleanModelMap (Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator modelWithYRotation (Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator modelWithMirroring (Lnet/minecraft/client/render/model/json/ModelVariant;Lnet/minecraft/client/render/model/json/ModelVariant;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createBooleanModelMap (Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMirrorable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRotatable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBrushableBlock (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createButtonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCustomFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWallBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceGateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Z)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStairsBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createOrientableTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSingletonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/VariantsBlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createButtonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCustomFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWallBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceGateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Z)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStairsBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createOrientableTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSingletonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/VariantsBlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedVariantMap ()Lnet/minecraft/client/data/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createUvLockedColumnBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;Lnet/minecraft/client/data/TexturedModel$Factory;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCreakingHeart (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCreakingHeartModel (Lnet/minecraft/client/data/TexturedModel$Factory;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSubModel (Lnet/minecraft/block/Block;Ljava/lang/String;Lnet/minecraft/client/data/Model;Ljava/util/function/Function;)Lnet/minecraft/util/Identifier;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createPressurePlateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSlabBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createPressurePlateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSlabBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGrassTinted (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCubeAllModelTexturePool (Lnet/minecraft/block/Block;)Lnet/minecraft/client/data/BlockStateModelGenerator$BlockTexturePool;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoor (Lnet/minecraft/block/Block;)V
|
||||
|
|
@ -213,24 +213,24 @@ transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoubleBlock (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoubleBlockAndItem (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGrassTintedDoubleBlockAndItem (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoubleBlock (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoubleBlock (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTurnableRail (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerStraightRail (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadParticleModel (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadParticleModel (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltin (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWoolAndCarpet (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerLeafLitter (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerFlowerbed (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSegmentedBlock (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/IntProperty;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSegmentedBlock (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Ljava/util/function/Function;Lnet/minecraft/client/render/model/json/WeightedVariant;Ljava/util/function/Function;Lnet/minecraft/client/render/model/json/WeightedVariant;Ljava/util/function/Function;Lnet/minecraft/client/render/model/json/WeightedVariant;Ljava/util/function/Function;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRandomHorizontalRotations (Lnet/minecraft/client/data/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSouthDefaultHorizontalFacing (Lnet/minecraft/client/data/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGlassAndPane (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCommandBlock (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAnvil (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getBambooBlockStateVariants (I)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createValueFencedModelMap (Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getBambooBlockStateVariants (I)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createValueFencedModelMap (Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBeehive (Lnet/minecraft/block/Block;Ljava/util/function/Function;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCrop (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/Property;[I)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCooker (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;)V
|
||||
|
|
@ -242,21 +242,21 @@ transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotatable (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDispenserLikeOrientable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCopperBulb (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)Lnet/minecraft/client/data/BlockModelDefinitionCreator;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWaxedCopperBulb (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAmethyst (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNetherrackBottomCustomTop (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRod (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireFloorModels (Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireSideModels (Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireUpModels (Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireFloorModels (Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireSideModels (Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireUpModels (Lnet/minecraft/block/Block;)Lnet/minecraft/client/render/model/json/WeightedVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerLantern (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTopSoil (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTopSoil (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/render/model/json/WeightedVariant;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWeightedPressurePlate (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerParented (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotation (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPiston (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedUnbakedModel;Lnet/minecraft/client/data/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPiston (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/model/json/WeightedVariant;Lnet/minecraft/client/data/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTorch (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getTurtleEggModel (ILjava/lang/String;Lnet/minecraft/client/data/TextureMap;)Lnet/minecraft/client/render/model/json/ModelVariant;
|
||||
transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getTurtleEggModel (II)Lnet/minecraft/client/render/model/json/ModelVariant;
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ public abstract class WrapperUnbakedGroupedBlockStateModel implements BlockState
|
|||
}
|
||||
|
||||
@Override
|
||||
public BlockStateModel getModel(BlockState state, Baker baker) {
|
||||
return wrapped.getModel(state, baker);
|
||||
public BlockStateModel bake(BlockState state, Baker baker) {
|
||||
return wrapped.bake(state, baker);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ abstract class ModelBakerMixin {
|
|||
fabric_eventDispatcher = ModelLoadingEventDispatcher.CURRENT.get();
|
||||
}
|
||||
|
||||
@ModifyArg(method = "bake", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/model/FutureModel;newTask(Ljava/util/Map;Ljava/util/function/BiFunction;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", ordinal = 0), index = 1)
|
||||
@ModifyArg(method = "bake", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/thread/AsyncHelper;mapValues(Ljava/util/Map;Ljava/util/function/BiFunction;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", ordinal = 0), index = 1)
|
||||
private BiFunction<BlockState, BlockStateModel.UnbakedGrouped, BlockStateModel> hookBlockModelBake(BiFunction<BlockState, BlockStateModel.UnbakedGrouped, BlockStateModel> bifunction) {
|
||||
if (fabric_eventDispatcher == null) {
|
||||
return bifunction;
|
||||
|
|
@ -76,7 +76,7 @@ abstract class ModelBakerMixin {
|
|||
};
|
||||
}
|
||||
|
||||
@WrapOperation(method = "method_68018", at = @At(value = "INVOKE", target = "net/minecraft/client/render/model/BlockStateModel$UnbakedGrouped.getModel(Lnet/minecraft/block/BlockState;Lnet/minecraft/client/render/model/Baker;)Lnet/minecraft/client/render/model/BlockStateModel;"))
|
||||
@WrapOperation(method = "method_68018", at = @At(value = "INVOKE", target = "net/minecraft/client/render/model/BlockStateModel$UnbakedGrouped.bake(Lnet/minecraft/block/BlockState;Lnet/minecraft/client/render/model/Baker;)Lnet/minecraft/client/render/model/BlockStateModel;"))
|
||||
private static BlockStateModel wrapBlockModelBake(BlockStateModel.UnbakedGrouped unbakedModel, BlockState state, Baker baker, Operation<BlockStateModel> operation) {
|
||||
ModelLoadingEventDispatcher eventDispatcher = ModelLoadingEventDispatcher.CURRENT.get();
|
||||
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ transitive-accessible class net/minecraft/client/model/ModelPart$Vertex
|
|||
transitive-accessible class net/minecraft/client/model/ModelPart$Quad
|
||||
|
||||
# Creating custom render layers
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILnet/minecraft/client/gl/ShaderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;IZZLnet/minecraft/client/gl/ShaderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer method_24048 (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer method_24049 (Ljava/lang/String;IZZLcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhase
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$OutlineMode
|
||||
|
|
@ -300,7 +300,7 @@ transitive-accessible field net/minecraft/client/render/RenderPhase NO_TEXTURE L
|
|||
transitive-accessible field net/minecraft/client/render/RenderPhase DEFAULT_TEXTURING Lnet/minecraft/client/render/RenderPhase$Texturing;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase GLINT_TEXTURING Lnet/minecraft/client/render/RenderPhase$Texturing;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase ENTITY_GLINT_TEXTURING Lnet/minecraft/client/render/RenderPhase$Texturing;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase field_58053 Lnet/minecraft/client/render/RenderPhase$Texturing;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase ARMOR_ENTITY_GLINT_TEXTURING Lnet/minecraft/client/render/RenderPhase$Texturing;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase ENABLE_LIGHTMAP Lnet/minecraft/client/render/RenderPhase$Lightmap;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase DISABLE_LIGHTMAP Lnet/minecraft/client/render/RenderPhase$Lightmap;
|
||||
transitive-accessible field net/minecraft/client/render/RenderPhase ENABLE_OVERLAY_COLOR Lnet/minecraft/client/render/RenderPhase$Overlay;
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ transitive-accessible class net/minecraft/client/model/ModelPart$Vertex
|
|||
transitive-accessible class net/minecraft/client/model/ModelPart$Quad
|
||||
|
||||
# Creating custom render layers
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILnet/minecraft/client/gl/ShaderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;IZZLnet/minecraft/client/gl/ShaderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer method_24048 (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible method net/minecraft/client/render/RenderLayer method_24049 (Ljava/lang/String;IZZLcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhase
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
|
||||
transitive-accessible class net/minecraft/client/render/RenderLayer$OutlineMode
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
org.gradle.jvmargs=-Xmx2560M
|
||||
org.gradle.parallel=true
|
||||
|
||||
version=0.118.5
|
||||
minecraft_version=25w10a
|
||||
version=0.118.6
|
||||
minecraft_version=1.21.5-pre1
|
||||
yarn_version=+build.1
|
||||
loader_version=0.16.10
|
||||
installer_version=1.0.1
|
||||
|
|
@ -17,14 +17,14 @@ fabric-biome-api-v1-version=16.0.7
|
|||
fabric-block-api-v1-version=1.0.37
|
||||
fabric-block-view-api-v2-version=1.0.25
|
||||
fabric-blockrenderlayer-v1-version=2.0.16
|
||||
fabric-client-gametest-api-v1-version=4.1.8
|
||||
fabric-client-gametest-api-v1-version=4.1.9
|
||||
fabric-command-api-v1-version=1.2.70
|
||||
fabric-command-api-v2-version=2.2.49
|
||||
fabric-commands-v0-version=0.2.87
|
||||
fabric-content-registries-v0-version=10.0.11
|
||||
fabric-crash-report-info-v1-version=0.3.12
|
||||
fabric-data-attachment-api-v1-version=1.6.2
|
||||
fabric-data-generation-api-v1-version=22.2.22
|
||||
fabric-data-generation-api-v1-version=22.2.23
|
||||
fabric-dimensions-v1-version=4.0.16
|
||||
fabric-entity-events-v1-version=2.0.25
|
||||
fabric-events-interaction-v0-version=4.0.12
|
||||
|
|
@ -38,7 +38,7 @@ fabric-lifecycle-events-v1-version=2.5.13
|
|||
fabric-loot-api-v2-version=3.0.47
|
||||
fabric-loot-api-v3-version=1.0.35
|
||||
fabric-message-api-v1-version=6.0.33
|
||||
fabric-model-loading-api-v1-version=5.0.0
|
||||
fabric-model-loading-api-v1-version=5.0.1
|
||||
fabric-networking-api-v1-version=4.3.19
|
||||
fabric-object-builder-api-v1-version=20.0.8
|
||||
fabric-particles-v1-version=4.0.22
|
||||
|
|
@ -48,7 +48,7 @@ fabric-renderer-api-v1-version=5.0.6
|
|||
fabric-renderer-indigo-version=2.0.6
|
||||
fabric-rendering-data-attachment-v1-version=0.3.63
|
||||
fabric-rendering-fluids-v1-version=3.1.27
|
||||
fabric-rendering-v1-version=11.1.8
|
||||
fabric-rendering-v1-version=11.1.9
|
||||
fabric-resource-conditions-api-v1-version=5.0.21
|
||||
fabric-resource-loader-v0-version=3.1.6
|
||||
fabric-screen-api-v1-version=2.0.46
|
||||
|
|
@ -56,7 +56,7 @@ fabric-screen-handler-api-v1-version=1.3.126
|
|||
fabric-sound-api-v1-version=1.0.38
|
||||
fabric-tag-api-v1-version=1.0.16
|
||||
fabric-transfer-api-v1-version=5.4.22
|
||||
fabric-transitive-access-wideners-v1-version=6.3.14
|
||||
fabric-transitive-access-wideners-v1-version=6.3.15
|
||||
fabric-convention-tags-v1-version=2.1.25
|
||||
fabric-convention-tags-v2-version=2.13.2
|
||||
fabric-client-tags-api-v1-version=1.1.37
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue