mirror of
https://github.com/FabricMC/fabric.git
synced 2025-07-28 15:09:35 -04:00
19w44a
Only yarn renames
This commit is contained in:
parent
dfdb52d6e5
commit
ce77399215
36 changed files with 84 additions and 84 deletions
build.gradle
fabric-blockrenderlayer-v1
fabric-content-registries-v0
build.gradle
src/main/java/net/fabricmc/fabric
fabric-loot-tables-v1
build.gradle
src/main/java/net/fabricmc/fabric
fabric-renderer-indigo
build.gradle
src/main/java/net/fabricmc/indigo/renderer
fabric-renderer-registries-v1
build.gradle
src/main/java/net/fabricmc/fabric
api/client/rendereregistry/v1
mixin/client/rendereregistry
fabric-resource-loader-v0
|
@ -12,9 +12,9 @@ plugins {
|
|||
def ENV = System.getenv()
|
||||
|
||||
class Globals {
|
||||
static def baseVersion = "0.4.8"
|
||||
static def mcVersion = "19w42a"
|
||||
static def yarnVersion = "+build.1"
|
||||
static def baseVersion = "0.4.9"
|
||||
static def mcVersion = "19w44a"
|
||||
static def yarnVersion = "+build.2"
|
||||
}
|
||||
|
||||
import org.apache.commons.codec.digest.DigestUtils
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
archivesBaseName = "fabric-blockrenderlayer-v1"
|
||||
version = getSubprojectVersion(project, "1.1.1")
|
||||
version = getSubprojectVersion(project, "1.1.2")
|
||||
|
||||
dependencies {
|
||||
compile project(path: ':fabric-api-base', configuration: 'dev')
|
||||
|
|
|
@ -24,22 +24,22 @@ 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.class_4696;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.client.render.RenderLayers;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
|
||||
|
||||
@Mixin(class_4696.class)
|
||||
@Mixin(RenderLayers.class)
|
||||
public class MixinBlockRenderLayer {
|
||||
@Shadow private static Map<Block, RenderLayer> field_21469;
|
||||
@Shadow private static Map<Item, RenderLayer> field_21470;
|
||||
@Shadow private static Map<Fluid, RenderLayer> field_21471;
|
||||
@Shadow private static Map<Block, RenderLayer> BLOCKS;
|
||||
@Shadow private static Map<Item, RenderLayer> ITEMS;
|
||||
@Shadow private static Map<Fluid, RenderLayer> FLUIDS;
|
||||
|
||||
@Inject(method = "<clinit>*", at = @At("RETURN"))
|
||||
private static void onInitialize(CallbackInfo info) {
|
||||
BlockRenderLayerMapImpl.initialize(field_21469::put, field_21470::put, field_21471::put);
|
||||
BlockRenderLayerMapImpl.initialize(BLOCKS::put, ITEMS::put, FLUIDS::put);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
archivesBaseName = "fabric-content-registries-v0"
|
||||
version = getSubprojectVersion(project, "0.1.1")
|
||||
version = getSubprojectVersion(project, "0.1.2")
|
||||
|
||||
dependencies {
|
||||
compile project(path: ':fabric-api-base', configuration: 'dev')
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
package net.fabricmc.fabric.api.registry;
|
||||
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
|
||||
import net.fabricmc.fabric.impl.registry.LootEntryTypeRegistryImpl;
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@ package net.fabricmc.fabric.impl.registry;
|
|||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import net.minecraft.world.loot.entry.LootEntries;
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.entry.LootEntries;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
|
||||
import net.fabricmc.fabric.api.registry.LootEntryTypeRegistry;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
archivesBaseName = "fabric-loot-tables-v1"
|
||||
version = getSubprojectVersion(project, "0.1.2")
|
||||
version = getSubprojectVersion(project, "0.1.3")
|
||||
|
||||
dependencies {
|
||||
compile project(path: ':fabric-api-base', configuration: 'dev')
|
||||
|
|
|
@ -18,14 +18,14 @@ package net.fabricmc.fabric.api.loot.v1;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.LootTableRange;
|
||||
import net.minecraft.world.loot.condition.LootCondition;
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.LootTableRange;
|
||||
import net.minecraft.loot.condition.LootCondition;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
/**
|
||||
* An interface implemented by all {@code net.minecraft.world.loot.LootPool} instances when
|
||||
* An interface implemented by all {@code net.minecraft.loot.LootPool} instances when
|
||||
* Fabric API is present. Contains accessors for various fields.
|
||||
*/
|
||||
public interface FabricLootPool {
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
package net.fabricmc.fabric.api.loot.v1;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.LootTableRange;
|
||||
import net.minecraft.world.loot.condition.LootCondition;
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.LootTableRange;
|
||||
import net.minecraft.loot.condition.LootCondition;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
import net.fabricmc.fabric.mixin.loot.LootPoolBuilderHooks;
|
||||
|
||||
|
|
|
@ -18,13 +18,13 @@ package net.fabricmc.fabric.api.loot.v1;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.LootTable;
|
||||
import net.minecraft.world.loot.context.LootContextType;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.LootTable;
|
||||
import net.minecraft.loot.context.LootContextType;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
/**
|
||||
* An interface implemented by all {@code net.minecraft.world.loot.LootSupplier} instances when
|
||||
* An interface implemented by all {@code net.minecraft.loot.LootSupplier} instances when
|
||||
* Fabric API is present. Contains accessors for various fields.
|
||||
*/
|
||||
public interface FabricLootSupplier {
|
||||
|
|
|
@ -18,10 +18,10 @@ package net.fabricmc.fabric.api.loot.v1;
|
|||
|
||||
import java.util.Collection;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.LootTable;
|
||||
import net.minecraft.world.loot.context.LootContextType;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.LootTable;
|
||||
import net.minecraft.loot.context.LootContextType;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
import net.fabricmc.fabric.mixin.loot.LootSupplierBuilderHooks;
|
||||
|
||||
|
|
|
@ -16,12 +16,12 @@
|
|||
|
||||
package net.fabricmc.fabric.api.loot.v1;
|
||||
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
|
||||
import net.fabricmc.fabric.impl.loot.LootEntryTypeRegistryImpl;
|
||||
|
||||
/**
|
||||
* Fabric's extensions to {@code net.minecraft.world.loot.entry.LootEntries} for registering
|
||||
* Fabric's extensions to {@code net.minecraft.loot.entry.LootEntries} for registering
|
||||
* custom loot entry types.
|
||||
*
|
||||
* @see #register
|
||||
|
|
|
@ -24,7 +24,7 @@ import com.google.gson.Gson;
|
|||
|
||||
import net.minecraft.util.JsonHelper;
|
||||
import net.minecraft.util.Lazy;
|
||||
import net.minecraft.world.loot.LootManager;
|
||||
import net.minecraft.loot.LootManager;
|
||||
|
||||
public final class LootJsonParser {
|
||||
/* Reading this from LootManager to access all serializers from vanilla. */
|
||||
|
|
|
@ -18,8 +18,8 @@ package net.fabricmc.fabric.api.loot.v1.event;
|
|||
|
||||
import net.minecraft.resource.ResourceManager;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.world.loot.LootManager;
|
||||
import net.minecraft.world.loot.LootTable;
|
||||
import net.minecraft.loot.LootManager;
|
||||
import net.minecraft.loot.LootTable;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
|
|
@ -18,8 +18,8 @@ package net.fabricmc.fabric.impl.loot;
|
|||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import net.minecraft.world.loot.entry.LootEntries;
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.entry.LootEntries;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
|
||||
public final class LootEntryTypeRegistryImpl implements net.fabricmc.fabric.api.loot.v1.LootEntryTypeRegistry {
|
||||
public static final LootEntryTypeRegistryImpl INSTANCE = new LootEntryTypeRegistryImpl();
|
||||
|
|
|
@ -21,10 +21,10 @@ import java.util.List;
|
|||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.condition.LootCondition;
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.condition.LootCondition;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
@Mixin(LootPool.Builder.class)
|
||||
public interface LootPoolBuilderHooks {
|
||||
|
|
|
@ -21,9 +21,9 @@ import java.util.List;
|
|||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.LootTable;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.LootTable;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
@Mixin(LootTable.Builder.class)
|
||||
public interface LootSupplierBuilderHooks {
|
||||
|
|
|
@ -30,8 +30,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||
import net.minecraft.resource.ResourceManager;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.profiler.Profiler;
|
||||
import net.minecraft.world.loot.LootManager;
|
||||
import net.minecraft.world.loot.LootTable;
|
||||
import net.minecraft.loot.LootManager;
|
||||
import net.minecraft.loot.LootTable;
|
||||
|
||||
import net.fabricmc.fabric.api.loot.v1.FabricLootSupplierBuilder;
|
||||
import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
|
||||
|
|
|
@ -24,11 +24,11 @@ import org.spongepowered.asm.mixin.Mixin;
|
|||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.LootTableRange;
|
||||
import net.minecraft.world.loot.condition.LootCondition;
|
||||
import net.minecraft.world.loot.entry.LootEntry;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.LootTableRange;
|
||||
import net.minecraft.loot.condition.LootCondition;
|
||||
import net.minecraft.loot.entry.LootEntry;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
import net.fabricmc.fabric.api.loot.v1.FabricLootPool;
|
||||
|
||||
|
|
|
@ -24,10 +24,10 @@ import org.spongepowered.asm.mixin.Mixin;
|
|||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
import net.minecraft.world.loot.LootPool;
|
||||
import net.minecraft.world.loot.LootTable;
|
||||
import net.minecraft.world.loot.context.LootContextType;
|
||||
import net.minecraft.world.loot.function.LootFunction;
|
||||
import net.minecraft.loot.LootPool;
|
||||
import net.minecraft.loot.LootTable;
|
||||
import net.minecraft.loot.context.LootContextType;
|
||||
import net.minecraft.loot.function.LootFunction;
|
||||
|
||||
import net.fabricmc.fabric.api.loot.v1.FabricLootSupplier;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
archivesBaseName = "fabric-renderer-indigo"
|
||||
version = getSubprojectVersion(project, "0.2.8")
|
||||
version = getSubprojectVersion(project, "0.2.9")
|
||||
|
||||
dependencies {
|
||||
compile project(path: ':fabric-api-base', configuration: 'dev')
|
||||
|
|
|
@ -31,9 +31,9 @@ import net.minecraft.client.color.block.BlockColors;
|
|||
import net.minecraft.client.render.VertexConsumer;
|
||||
import net.minecraft.client.render.block.BlockModelRenderer;
|
||||
import net.minecraft.client.render.model.BakedModel;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.util.math.MatrixStack;
|
||||
import net.minecraft.world.BlockRenderView;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
|
||||
|
|
|
@ -37,8 +37,8 @@ import net.minecraft.client.render.chunk.ChunkBatcher;
|
|||
import net.minecraft.client.render.chunk.ChunkBatcher.ChunkRenderer;
|
||||
import net.minecraft.client.render.chunk.ChunkRendererRegion;
|
||||
import net.minecraft.client.render.model.BakedModel;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MatrixStack;
|
||||
import net.minecraft.world.BlockRenderView;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
|
||||
|
@ -95,7 +95,7 @@ public class MixinChunkRebuildTask {
|
|||
* driven off of render type. (Not recommended or encouraged, but also not prevented.)
|
||||
*/
|
||||
@Redirect(method = "method_22785", require = 1, at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/render/block/BlockRenderManager;tesselateBlock(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLjava/util/Random;)Z"))
|
||||
target = "Lnet/minecraft/client/render/block/BlockRenderManager;tesselateBlock(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLjava/util/Random;)Z"))
|
||||
private boolean hookChunkBuildTesselate(BlockRenderManager renderManager, BlockState blockState, BlockPos blockPos, BlockRenderView blockView, MatrixStack matrix, VertexConsumer bufferBuilder, boolean checkSides, Random random) {
|
||||
if (blockState.getRenderType() == BlockRenderType.MODEL) {
|
||||
final BakedModel model = renderManager.getModel(blockState);
|
||||
|
|
|
@ -26,8 +26,8 @@ import net.minecraft.client.color.item.ItemColors;
|
|||
import net.minecraft.client.render.VertexConsumer;
|
||||
import net.minecraft.client.render.item.ItemRenderer;
|
||||
import net.minecraft.client.render.model.BakedModel;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.MatrixStack;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
|
||||
import net.fabricmc.indigo.renderer.render.ItemRenderContext;
|
||||
|
|
|
@ -27,7 +27,7 @@ import net.minecraft.client.render.VertexConsumer;
|
|||
import net.minecraft.client.util.math.Matrix4f;
|
||||
import net.minecraft.client.util.math.Vector3f;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Matrix3f;
|
||||
import net.minecraft.client.util.math.Matrix3f;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext.QuadTransform;
|
||||
import net.fabricmc.indigo.renderer.aocalc.AoCalculator;
|
||||
|
|
|
@ -19,7 +19,7 @@ package net.fabricmc.indigo.renderer.render;
|
|||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
|
||||
import net.minecraft.client.util.math.Matrix4f;
|
||||
import net.minecraft.util.math.Matrix3f;
|
||||
import net.minecraft.client.util.math.Matrix3f;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
|
||||
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
|
||||
|
|
|
@ -26,9 +26,9 @@ import net.minecraft.client.render.VertexConsumer;
|
|||
import net.minecraft.client.render.block.BlockModelRenderer;
|
||||
import net.minecraft.client.render.model.BakedModel;
|
||||
import net.minecraft.client.util.math.Matrix4f;
|
||||
import net.minecraft.client.util.math.Matrix3f;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Matrix3f;
|
||||
import net.minecraft.util.math.MatrixStack;
|
||||
import net.minecraft.world.BlockRenderView;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
|
||||
|
@ -80,7 +80,7 @@ public class BlockRenderContext extends AbstractRenderContext implements RenderC
|
|||
this.bufferBuilder = buffer;
|
||||
this.matrixStack = matrixStack;
|
||||
this.matrix = matrixStack.peek();
|
||||
this.normalMatrix = matrixStack.method_23478();
|
||||
this.normalMatrix = matrixStack.peekNormal();
|
||||
|
||||
this.seed = seed;
|
||||
this.overlay = overlay;
|
||||
|
|
|
@ -19,11 +19,11 @@ package net.fabricmc.indigo.renderer.render;
|
|||
import java.util.Random;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import net.minecraft.class_4696;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.color.block.BlockColors;
|
||||
import net.minecraft.client.render.RenderLayer;
|
||||
import net.minecraft.client.render.RenderLayers;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.world.BlockRenderView;
|
||||
|
@ -71,7 +71,7 @@ public class BlockRenderInfo {
|
|||
seed = -1L;
|
||||
defaultAo = modelAO && MinecraftClient.isAmbientOcclusionEnabled() && blockState.getLuminance() == 0;
|
||||
|
||||
defaultLayer = class_4696.method_23679(blockState);
|
||||
defaultLayer = RenderLayers.getBlockLayer(blockState);
|
||||
}
|
||||
|
||||
public void release() {
|
||||
|
|
|
@ -28,9 +28,9 @@ import net.minecraft.client.render.model.BakedModel;
|
|||
import net.minecraft.client.render.model.BakedQuad;
|
||||
import net.minecraft.client.util.math.Matrix4f;
|
||||
import net.minecraft.client.util.math.Vector3f;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.Direction;
|
||||
import net.minecraft.util.math.MatrixStack;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
|
||||
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
|
||||
|
@ -91,7 +91,7 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo
|
|||
this.bufferBuilder = buffer;
|
||||
this.matrixStack = matrixStack;
|
||||
this.matrix = matrixStack.peek();
|
||||
this.normalMatrix = matrixStack.method_23478();
|
||||
this.normalMatrix = matrixStack.peekNormal();
|
||||
this.overlay = overlay;
|
||||
|
||||
this.vanillaHandler = vanillaHandler;
|
||||
|
|
|
@ -29,8 +29,8 @@ import net.minecraft.util.crash.CrashException;
|
|||
import net.minecraft.util.crash.CrashReport;
|
||||
import net.minecraft.util.crash.CrashReportSection;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Matrix3f;
|
||||
import net.minecraft.util.math.MatrixStack;
|
||||
import net.minecraft.client.util.math.Matrix3f;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
|
||||
import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
|
||||
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
|
||||
|
@ -97,7 +97,7 @@ public class TerrainRenderContext extends AbstractRenderContext implements Rende
|
|||
/** Called from chunk renderer hook. */
|
||||
public boolean tesselateBlock(BlockState blockState, BlockPos blockPos, final BakedModel model, MatrixStack matrixStack) {
|
||||
this.matrix = matrixStack.peek();
|
||||
this.normalMatrix = matrixStack.method_23478();
|
||||
this.normalMatrix = matrixStack.peekNormal();
|
||||
|
||||
try {
|
||||
aoCalc.clear();
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
archivesBaseName = "fabric-renderer-registries-v1"
|
||||
version = getSubprojectVersion(project, "1.0.2")
|
||||
version = getSubprojectVersion(project, "1.0.3")
|
||||
|
||||
dependencies {
|
||||
compile project(path: ':fabric-api-base', configuration: 'dev')
|
||||
|
|
|
@ -32,6 +32,6 @@ public class BlockEntityRendererRegistry {
|
|||
private BlockEntityRendererRegistry() { }
|
||||
|
||||
public <E extends BlockEntity> void register(BlockEntityType<E> blockEntityType, BlockEntityRenderer<E> blockEntityRenderer) {
|
||||
((MixinBlockEntityRenderDispatcher) BlockEntityRenderDispatcher.INSTANCE).invoke_method_23078(blockEntityType, blockEntityRenderer);
|
||||
((MixinBlockEntityRenderDispatcher) BlockEntityRenderDispatcher.INSTANCE).invoke_register(blockEntityType, blockEntityRenderer);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ import net.minecraft.client.render.block.entity.BlockEntityRenderer;
|
|||
|
||||
@Mixin(BlockEntityRenderDispatcher.class)
|
||||
public interface MixinBlockEntityRenderDispatcher {
|
||||
@Invoker(value = "method_23078")
|
||||
@Invoker(value = "register")
|
||||
@SuppressWarnings("rawtypes")
|
||||
void invoke_method_23078(BlockEntityType blockEntityType, BlockEntityRenderer blockEntityRenderer);
|
||||
void invoke_register(BlockEntityType blockEntityType, BlockEntityRenderer blockEntityRenderer);
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ public class MixinEntityRenderDispatcher {
|
|||
@Shadow
|
||||
Map<EntityType<?>, EntityRenderer<?>> renderers;
|
||||
|
||||
@Inject(method = "method_23167", at = @At(value = "RETURN"), require = 1)
|
||||
@Inject(method = "registerRenderers", at = @At(value = "RETURN"), require = 1)
|
||||
public void on_method_23167(ItemRenderer itemRenderer, ReloadableResourceManager manager, CallbackInfo info) {
|
||||
final EntityRenderDispatcher me = (EntityRenderDispatcher) (Object) this;
|
||||
EntityRendererRegistry.INSTANCE.initialize(me, me.textureManager, manager, itemRenderer, renderers);
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
archivesBaseName = "fabric-resource-loader-v0"
|
||||
version = getSubprojectVersion(project, "0.1.5")
|
||||
version = getSubprojectVersion(project, "0.1.6")
|
||||
|
|
|
@ -35,7 +35,7 @@ import net.minecraft.server.ServerAdvancementLoader;
|
|||
import net.minecraft.server.function.CommandFunctionManager;
|
||||
import net.minecraft.tag.RegistryTagManager;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.world.loot.LootManager;
|
||||
import net.minecraft.loot.LootManager;
|
||||
|
||||
import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
|
||||
import net.fabricmc.fabric.api.resource.ResourceReloadListenerKeys;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue