infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

1.15-pre7 - mapping changes

Browse source
This commit is contained in:
modmuss50 2019-12-09 21:40:36 +00:00
parent da060503f2
commit 821cdba74e
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -12,8 +12,8 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.4.20"
static def mcVersion = "1.15-pre5"
static def baseVersion = "0.4.21"
static def mcVersion = "1.15-pre7"
static def yarnVersion = "+build.1"
}

2
fabric-renderer-indigo/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-renderer-indigo"
version = getSubprojectVersion(project, "0.2.18")
version = getSubprojectVersion(project, "0.2.19")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

2
fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ItemRenderContext.java
View file

@ -110,7 +110,7 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo
modelVertexConsumer = selectVertexConsumer(RenderLayers.getItemLayer(itemStack));
matrixStack.push();
((BakedModel) model).getTransformation().getTransformation(transformType).method_23075(invert, matrixStack);
((BakedModel) model).getTransformation().getTransformation(transformType).apply(invert, matrixStack);
matrixStack.translate(-0.5D, -0.5D, -0.5D);
matrix = matrixStack.peek().getModel();
normalMatrix = matrixStack.peek().getNormal();

6
fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/mixin/client/indigo/renderer/MixinItemRenderer.java
View file

@ -38,16 +38,16 @@ import net.fabricmc.fabric.impl.client.indigo.renderer.render.ItemRenderContext.
@Mixin(ItemRenderer.class)
public abstract class MixinItemRenderer {
@Shadow
protected abstract void method_23182(BakedModel model, ItemStack stack, int light, int overlay, MatrixStack matrixStack, VertexConsumer buffer);
protected abstract void renderBakedItemModel(BakedModel model, ItemStack stack, int light, int overlay, MatrixStack matrixStack, VertexConsumer buffer);
@Shadow
protected ItemColors colorMap;
private final VanillaQuadHandler vanillaHandler = this::method_23182;
private final VanillaQuadHandler vanillaHandler = this::renderBakedItemModel;
private final ThreadLocal<ItemRenderContext> CONTEXTS = ThreadLocal.withInitial(() -> new ItemRenderContext(colorMap));
@Inject(at = @At("HEAD"), method = "method_23179", cancellable = true)
@Inject(at = @At("HEAD"), method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformation$Type;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/render/model/BakedModel;)V", cancellable = true)
public void hook_method_23179(ItemStack stack, ModelTransformation.Type transformType, boolean invert, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light, int overlay, BakedModel model, CallbackInfo ci) {
final FabricBakedModel fabricModel = (FabricBakedModel) model;

2
fabric-textures-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-textures-v0"
version = getSubprojectVersion(project, "1.0.3")
version = getSubprojectVersion(project, "1.0.4")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

4
fabric-textures-v0/src/main/java/net/fabricmc/fabric/mixin/client/texture/MixinSpriteAtlasTexture.java
View file

@ -46,7 +46,7 @@ import net.fabricmc.fabric.impl.client.texture.SpriteRegistryCallbackHolder;
@Mixin(SpriteAtlasTexture.class)
public abstract class MixinSpriteAtlasTexture {
@Shadow
public abstract Identifier method_24106();
public abstract Identifier getId();
private Map<Identifier, Sprite> fabric_injectedSprites;
@ -65,7 +65,7 @@ public abstract class MixinSpriteAtlasTexture {
fabric_injectedSprites = new HashMap<>();
ClientSpriteRegistryCallback.Registry registry = new ClientSpriteRegistryCallback.Registry(fabric_injectedSprites, set::add);
SpriteRegistryCallbackHolder.eventLocal(method_24106()).invoker().registerSprites((SpriteAtlasTexture) (Object) this, registry);
SpriteRegistryCallbackHolder.eventLocal(getId()).invoker().registerSprites((SpriteAtlasTexture) (Object) this, registry);
SpriteRegistryCallbackHolder.EVENT_GLOBAL.invoker().registerSprites((SpriteAtlasTexture) (Object) this, registry);
// TODO: Unoptimized.