FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-25 22:39:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions2

1.15-pre3 - just mapping changes

Browse source
This commit is contained in:
modmuss50 2019-11-28 19:40:14 +00:00
parent 1e5e53014d
commit 06c939b35c
25 changed files with 47 additions and 47 deletions
build.gradle
fabric-biomes-v1
build.gradle
src/main/java/net/fabricmc/fabric
impl/biome
InternalBiomeData.javaInternalBiomeUtils.javaVariantTransformer.javaWeightedBiomePicker.java
mixin/biome
MixinAddEdgeBiomesLayer.javaMixinAddHillsLayer.javaMixinAddRiversLayer.javaMixinSetBaseBiomesLayer.java
fabric-dimensions-v1
build.gradle
src/main/java/net/fabricmc/fabric/api/dimension/v1
FabricDimensionType.java
fabric-renderer-indigo
build.gradle
src/main/java/net/fabricmc/fabric
impl/client/indigo/renderer/render
AbstractQuadRenderer.javaBlockRenderContext.javaChunkRenderInfo.javaItemRenderContext.java
mixin/client/indigo/renderer
MixinChunkRebuildTask.javaMixinChunkRenderData.java
fabric-resource-loader-v0
build.gradle
src/main
java/net/fabricmc/fabric/mixin/resource/loader
MixinFormat4ResourcePack.javaMixinMinecraftGame.java
resources
fabric-resource-loader-v0.mixins.json
fabric-textures-v0
build.gradle
src/main/java/net/fabricmc/fabric/impl/client/texture
FabricSprite.java

4
build.gradle
View file

@ -12,8 +12,8 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.4.16"
static def mcVersion = "1.15-pre2"
static def baseVersion = "0.4.17"
static def mcVersion = "1.15-pre3"
static def yarnVersion = "+build.1"
}

2
fabric-biomes-v1/build.gradle
View file

@ -1,2 +1,2 @@
archivesBaseName = "fabric-biomes-v1"
version = getSubprojectVersion(project, "0.1.3")
version = getSubprojectVersion(project, "0.1.4")

2
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeData.java
View file

@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableMap;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.Biomes;
import net.minecraft.world.biome.layer.BiomeLayers;
import net.minecraft.world.biome.layer.util.BiomeLayers;
import net.minecraft.world.biome.source.VanillaLayeredBiomeSource;
import net.fabricmc.fabric.api.biomes.v1.OverworldClimate;

2
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeUtils.java
View file

@ -23,7 +23,7 @@ import java.util.function.IntConsumer;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.layer.LayerRandomnessSource;
import net.minecraft.world.biome.layer.util.LayerRandomnessSource;
import net.fabricmc.fabric.api.biomes.v1.OverworldClimate;

2
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/VariantTransformer.java
View file

@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.layer.LayerRandomnessSource;
import net.minecraft.world.biome.layer.util.LayerRandomnessSource;
import net.fabricmc.fabric.api.biomes.v1.OverworldClimate;

2
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/WeightedBiomePicker.java
View file

@ -22,7 +22,7 @@ import java.util.List;
import com.google.common.base.Preconditions;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.layer.LayerRandomnessSource;
import net.minecraft.world.biome.layer.util.LayerRandomnessSource;
/**
* Picks biomes with arbitrary double weights using a binary search.

2
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddEdgeBiomesLayer.java
View file

@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.layer.AddEdgeBiomesLayer;
import net.minecraft.world.biome.layer.LayerRandomnessSource;
import net.minecraft.world.biome.layer.util.LayerRandomnessSource;
import net.fabricmc.fabric.api.biomes.v1.OverworldBiomes;
import net.fabricmc.fabric.impl.biome.InternalBiomeData;

6
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddHillsLayer.java
View file

@ -24,9 +24,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.layer.AddHillsLayer;
import net.minecraft.world.biome.layer.BiomeLayers;
import net.minecraft.world.biome.layer.LayerRandomnessSource;
import net.minecraft.world.biome.layer.LayerSampler;
import net.minecraft.world.biome.layer.util.BiomeLayers;
import net.minecraft.world.biome.layer.util.LayerRandomnessSource;
import net.minecraft.world.biome.layer.util.LayerSampler;
import net.fabricmc.fabric.api.biomes.v1.OverworldBiomes;
import net.fabricmc.fabric.impl.biome.InternalBiomeData;

4
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddRiversLayer.java
View file

@ -28,8 +28,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.layer.AddRiversLayer;
import net.minecraft.world.biome.layer.LayerRandomnessSource;
import net.minecraft.world.biome.layer.LayerSampler;
import net.minecraft.world.biome.layer.util.LayerRandomnessSource;
import net.minecraft.world.biome.layer.util.LayerSampler;
import net.fabricmc.fabric.api.biomes.v1.OverworldBiomes;
import net.fabricmc.fabric.impl.biome.InternalBiomeData;

2
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinSetBaseBiomesLayer.java
View file

@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.layer.LayerRandomnessSource;
import net.minecraft.world.biome.layer.util.LayerRandomnessSource;
import net.minecraft.world.biome.layer.SetBaseBiomesLayer;
import net.fabricmc.fabric.api.biomes.v1.OverworldClimate;

2
fabric-dimensions-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-dimensions-v1"
version = getSubprojectVersion(project, "0.2.2")
version = getSubprojectVersion(project, "0.2.3")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

4
fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/api/dimension/v1/FabricDimensionType.java
View file

@ -26,8 +26,8 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.math.Direction;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeAccessType;
import net.minecraft.world.biome.VoronoiBiomeAccessType;
import net.minecraft.world.biome.source.BiomeAccessType;
import net.minecraft.world.biome.source.VoronoiBiomeAccessType;
import net.minecraft.world.dimension.Dimension;
import net.minecraft.world.dimension.DimensionType;

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

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

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

@ -89,7 +89,7 @@ public abstract class AbstractQuadRenderer {
} else {
final Vector3f faceNormal = quad.faceNormal();
normalVec.set(faceNormal.getX(), faceNormal.getY(), faceNormal.getZ());
normalVec.multiply(normalMatrix);
normalVec.transform(normalMatrix);
}
for (int i = 0; i < 4; i++) {
@ -102,7 +102,7 @@ public abstract class AbstractQuadRenderer {
if (useNormals) {
normalVec.set(quad.normalX(i), quad.normalY(i), quad.normalZ(i));
normalVec.multiply(normalMatrix);
normalVec.transform(normalMatrix);
}
buff.normal(normalVec.getX(), normalVec.getY(), normalVec.getZ());
@ -173,6 +173,6 @@ public abstract class AbstractQuadRenderer {
}
// Unfortunately cannot use brightness cache here unless we implement one specifically for flat lighting. See #329
return WorldRenderer.method_23793(blockInfo.blockView, blockState, mpos);
return WorldRenderer.getLightmapCoordinates(blockInfo.blockView, blockState, mpos);
}
}

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

@ -63,7 +63,7 @@ public class BlockRenderContext extends AbstractRenderContext implements RenderC
return 15 << 20 | 15 << 4;
}
return WorldRenderer.method_23793(blockInfo.blockView, blockInfo.blockView.getBlockState(pos), pos);
return WorldRenderer.getLightmapCoordinates(blockInfo.blockView, blockInfo.blockView.getBlockState(pos), pos);
}
private float aoLevel(BlockPos pos) {

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

@ -127,7 +127,7 @@ public class ChunkRenderInfo {
int result = brightnessCache.get(key);
if (result == Integer.MAX_VALUE) {
result = WorldRenderer.method_23793(blockView, blockView.getBlockState(pos), pos);
result = WorldRenderer.getLightmapCoordinates(blockView, blockView.getBlockState(pos), pos);
brightnessCache.put(key, result);
}

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

@ -22,11 +22,11 @@ import java.util.Random;
import java.util.function.Consumer;
import java.util.function.Supplier;
import net.minecraft.class_4722;
import net.minecraft.block.BlockState;
import net.minecraft.client.color.item.ItemColors;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.RenderLayers;
import net.minecraft.client.render.TexturedRenderLayers;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.item.ItemRenderer;
@ -132,7 +132,7 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo
* support sprite layers, so this can't be helped in this implementation.
*/
private VertexConsumer selectVertexConsumer(RenderLayer layerIn) {
final RenderLayer layer = transformType == ModelTransformation.Type.GUI && Objects.equals(layerIn, class_4722.method_24075()) ? class_4722.method_24076() : layerIn;
final RenderLayer layer = transformType == ModelTransformation.Type.GUI && Objects.equals(layerIn, TexturedRenderLayers.getEntityTranslucent()) ? TexturedRenderLayers.getEntityTranslucentCull() : layerIn;
return ItemRenderer.getArmorVertexConsumer(vertexConsumerProvider, layer, true, itemStack.hasEnchantmentGlint());
}
@ -211,10 +211,10 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo
if (blendMode == quadBlendMode) {
return quadVertexConsumer;
} else if (blendMode == BlendMode.TRANSLUCENT) {
quadVertexConsumer = selectVertexConsumer(class_4722.method_24075());
quadVertexConsumer = selectVertexConsumer(TexturedRenderLayers.getEntityTranslucent());
quadBlendMode = BlendMode.TRANSLUCENT;
} else {
quadVertexConsumer = selectVertexConsumer(class_4722.method_24074());
quadVertexConsumer = selectVertexConsumer(TexturedRenderLayers.getEntityCutout());
quadBlendMode = BlendMode.CUTOUT;
}

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

@ -69,7 +69,7 @@ public class MixinChunkRebuildTask {
@Shadow
protected BuiltChunk field_20839;
@Inject(at = @At("HEAD"), method = "method_22785")
@Inject(at = @At("HEAD"), method = "render")
private void hookChunkBuild(float float_1, float float_2, float float_3, ChunkBuilder.ChunkData renderData, BlockBufferBuilderStorage builder, CallbackInfoReturnable<Set<BlockEntity>> ci) {
ChunkRendererRegion region = this.region;
@ -96,7 +96,7 @@ public class MixinChunkRebuildTask {
* Normally this does nothing but will allow mods to create rendering hooks that are
* driven off of render type. (Not recommended or encouraged, but also not prevented.)
*/
@Redirect(method = "method_22785", require = 1, at = @At(value = "INVOKE",
@Redirect(method = "render", require = 1, at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/render/block/BlockRenderManager;renderBlock(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) {
@ -113,7 +113,7 @@ public class MixinChunkRebuildTask {
/**
* Release all references. Probably not necessary but would be $#%! to debug if it is.
*/
@Inject(at = @At("RETURN"), method = "method_22785")
@Inject(at = @At("RETURN"), method = "render")
private void hookRebuildChunkReturn(CallbackInfoReturnable<Set<BlockEntity>> ci) {
TerrainRenderContext.POOL.get().release();
}

8
fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/mixin/client/indigo/renderer/MixinChunkRenderData.java
View file

@ -29,20 +29,20 @@ import net.fabricmc.fabric.impl.client.indigo.renderer.accessor.AccessChunkRende
@Mixin(ChunkData.class)
public class MixinChunkRenderData implements AccessChunkRendererData {
@Shadow
private Set<RenderLayer> initialized;
private Set<RenderLayer> initializedLayers;
@Shadow
private Set<RenderLayer> nonEmpty;
private Set<RenderLayer> nonEmptyLayers;
@Shadow
private boolean empty;
@Override
public boolean fabric_markInitialized(RenderLayer renderLayer) {
return initialized.add(renderLayer);
return initializedLayers.add(renderLayer);
}
@Override
public void fabric_markPopulated(RenderLayer renderLayer) {
empty = false;
nonEmpty.add(renderLayer);
nonEmptyLayers.add(renderLayer);
}
}

2
fabric-resource-loader-v0/build.gradle
View file

@ -1,2 +1,2 @@
archivesBaseName = "fabric-resource-loader-v0"
version = getSubprojectVersion(project, "0.1.9")
version = getSubprojectVersion(project, "0.1.10")

8
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinClass_4729.java → fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinFormat4ResourcePack.java
View file

@ -19,11 +19,11 @@ package net.fabricmc.fabric.mixin.resource.loader;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import net.minecraft.class_4729;
import net.minecraft.client.resource.Format4ResourcePack;
import net.minecraft.resource.ResourcePack;
@Mixin(class_4729.class)
public interface MixinClass_4729 {
@Mixin(Format4ResourcePack.class)
public interface MixinFormat4ResourcePack {
@Accessor
ResourcePack getField_21766();
ResourcePack getParent();
}

8
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinMinecraftGame.java
View file

@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import net.minecraft.class_4729;
import net.minecraft.client.resource.Format4ResourcePack;
import net.minecraft.resource.DefaultResourcePack;
import net.minecraft.client.MinecraftClient;
import net.minecraft.resource.ReloadableResourceManager;
@ -57,9 +57,9 @@ public class MixinMinecraftGame {
boolean isDefaultResources = pack instanceof DefaultResourcePack;
if (!isDefaultResources && pack instanceof class_4729) {
MixinClass_4729 fixer = (MixinClass_4729) pack;
isDefaultResources = fixer.getField_21766() instanceof DefaultResourcePack;
if (!isDefaultResources && pack instanceof Format4ResourcePack) {
MixinFormat4ResourcePack fixer = (MixinFormat4ResourcePack) pack;
isDefaultResources = fixer.getParent() instanceof DefaultResourcePack;
}
if (isDefaultResources) {

2
fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.mixins.json
View file

@ -9,7 +9,7 @@
"MixinDefaultResourcePack"
],
"client": [
"MixinClass_4729",
"MixinFormat4ResourcePack",
"MixinKeyedResourceReloadListener$Client",
"MixinMinecraftGame"
],

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

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

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

@ -21,7 +21,7 @@ import net.minecraft.client.texture.Sprite;
import net.minecraft.client.texture.SpriteAtlasTexture;
public class FabricSprite extends Sprite {
public FabricSprite(SpriteAtlasTexture spriteAtlasTexture, Sprite.class_4727 class_4727, int mipmap, int u, int v, int x, int y, NativeImage nativeImage) {
super(spriteAtlasTexture, class_4727, mipmap, u, v, x, y, nativeImage);
public FabricSprite(SpriteAtlasTexture spriteAtlasTexture, Sprite.Info info, int mipmap, int u, int v, int x, int y, NativeImage nativeImage) {
super(spriteAtlasTexture, info, mipmap, u, v, x, y, nativeImage);
}
}