FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-14 19:25:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

21w43a

Browse source
This commit is contained in:
modmuss50 2021-10-27 20:48:33 +01:00
parent 938d6de077
commit 0b944752fc
14 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.gradle
View file

@ -9,7 +9,7 @@ plugins {
id "eclipse"
id "idea"
id "maven-publish"
id "fabric-loom" version "0.10.31" apply false
id "fabric-loom" version "0.10.43" apply false
id "org.cadixdev.licenser" version "0.6.1"
id "org.ajoberstar.grgit" version "3.1.0"
id "com.matthewprenger.cursegradle" version "1.4.0"
@ -19,9 +19,9 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.41.1"
static def mcVersion = "21w42a"
static def yarnVersion = "+build.1"
static def baseVersion = "0.41.2"
static def mcVersion = "21w43a"
static def yarnVersion = "+build.2"
static def loaderVersion = "0.11.7"
static def preRelease = true
}

2
fabric-api-lookup-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-api-lookup-api-v1"
version = getSubprojectVersion(project, "1.3.0")
version = getSubprojectVersion(project, "1.3.1")
moduleDependencies(project, [
'fabric-api-base',

2
fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/compat/WrappedInventory.java
View file

@ -67,7 +67,7 @@ final class WrappedInventory implements ItemInsertable, ItemExtractable {
if (!simulate) {
if (stack.isEmpty()) {
inv.setStack(i, input.copy());
inv.getStack(i).setCooldown(inserted);
inv.getStack(i).setBobbingAnimationTime(inserted);
} else {
stack.increment(inserted);
}

2
fabric-biome-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-biome-api-v1"
version = getSubprojectVersion(project, "5.0.0")
version = getSubprojectVersion(project, "5.0.1")
loom {
accessWidenerPath = file("src/main/resources/fabric-biome-api-v1.accesswidener")

8
fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java
View file

@ -16,7 +16,6 @@
package net.fabricmc.fabric.test.biome;
import net.minecraft.class_6727;
import net.minecraft.sound.BiomeMoodSound;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries;
@ -25,9 +24,10 @@ import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.biome.BiomeKeys;
import net.minecraft.world.biome.DefaultBiomeCreator;
import net.minecraft.world.biome.OverworldBiomeCreator;
import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.biome.SpawnSettings;
import net.minecraft.world.biome.TheNetherBiomeCreator;
import net.minecraft.world.biome.source.util.MultiNoiseUtil;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.feature.ConfiguredFeature;
@ -66,12 +66,12 @@ public class FabricBiomeTest implements ModInitializer {
@Override
public void onInitialize() {
Registry.register(BuiltinRegistries.BIOME, TEST_CRIMSON_FOREST.getValue(), class_6727.method_39149());
Registry.register(BuiltinRegistries.BIOME, TEST_CRIMSON_FOREST.getValue(), TheNetherBiomeCreator.createCrimsonForest());
NetherBiomes.addNetherBiome(BiomeKeys.THE_END, MultiNoiseUtil.createNoiseValuePoint(0.0F, 0.5F, 0.0F, 0.0F, 0.0f, 0.1F));
NetherBiomes.addNetherBiome(TEST_CRIMSON_FOREST, MultiNoiseUtil.createNoiseValuePoint(0.0F, 0.5F, 0.0F, 0.0F, 0.0f, 0.275F));
Registry.register(BuiltinRegistries.BIOME, CUSTOM_PLAINS.getValue(), DefaultBiomeCreator.createPlains(false, false, false));
Registry.register(BuiltinRegistries.BIOME, CUSTOM_PLAINS.getValue(), OverworldBiomeCreator.createPlains(false, false, false));
Registry.register(BuiltinRegistries.BIOME, TEST_END_HIGHLANDS.getValue(), createEndHighlands());
Registry.register(BuiltinRegistries.BIOME, TEST_END_MIDLANDS.getValue(), createEndMidlands());

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

@ -1,5 +1,5 @@
archivesBaseName = "fabric-dimensions-v1"
version = getSubprojectVersion(project, "2.1.1")
version = getSubprojectVersion(project, "2.1.2")
dependencies {
testmodImplementation project(path: ':fabric-command-api-v1', configuration: 'dev')

3
fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java
View file

@ -23,6 +23,7 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.block.BlockState;
import net.minecraft.class_6748;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.HeightLimitView;
import net.minecraft.world.Heightmap;
@ -89,7 +90,7 @@ public class VoidChunkGenerator extends ChunkGenerator {
}
@Override
public CompletableFuture<Chunk> populateNoise(Executor executor, StructureAccessor accessor, Chunk chunk) {
public CompletableFuture<Chunk> populateNoise(Executor executor, class_6748 arg, StructureAccessor structureAccessor, Chunk chunk) {
return CompletableFuture.completedFuture(chunk);
}

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

@ -1,5 +1,5 @@
archivesBaseName = "fabric-renderer-indigo"
version = getSubprojectVersion(project, "0.4.8")
version = getSubprojectVersion(project, "0.4.9")
moduleDependencies(project, [
'fabric-api-base',

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

@ -98,8 +98,8 @@ public class BlockRenderContext extends AbstractRenderContext implements RenderC
public boolean render(BlockRenderView blockView, BakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, VertexConsumer buffer, Random random, long seed, int overlay) {
this.bufferBuilder = buffer;
this.matrix = matrixStack.peek().getModel();
this.normalMatrix = matrixStack.peek().getNormal();
this.matrix = matrixStack.peek().getPositionMatrix();
this.normalMatrix = matrixStack.peek().getNormalMatrix();
this.random = random;
this.seed = seed;

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

@ -111,8 +111,8 @@ public class ItemRenderContext extends AbstractRenderContext implements RenderCo
matrixStack.push();
((BakedModel) model).getTransformation().getTransformation(transformMode).apply(invert, matrixStack);
matrixStack.translate(-0.5D, -0.5D, -0.5D);
matrix = matrixStack.peek().getModel();
normalMatrix = matrixStack.peek().getNormal();
matrix = matrixStack.peek().getPositionMatrix();
normalMatrix = matrixStack.peek().getNormalMatrix();
model.emitItemQuads(itemStack, randomSupplier, this);

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

@ -96,8 +96,8 @@ 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().getModel();
this.normalMatrix = matrixStack.peek().getNormal();
this.matrix = matrixStack.peek().getPositionMatrix();
this.normalMatrix = matrixStack.peek().getNormalMatrix();
try {
aoCalc.clear();

2
fabric-transfer-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-transfer-api-v1"
version = getSubprojectVersion(project, "1.4.0")
version = getSubprojectVersion(project, "1.4.1")
moduleDependencies(project, [
'fabric-api-base',

2
fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ComposterWrapper.java
View file

@ -118,7 +118,7 @@ public class ComposterWrapper extends SnapshotParticipant<Float> {
location.setBlockState(newState);
if (newLevel == 7) {
location.world.getBlockTickScheduler().schedule(location.pos, state.getBlock(), 20);
location.world.method_39279(location.pos, state.getBlock(), 20);
}
}

2
fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/ingame/client/FluidVariantRenderTest.java
View file

@ -76,7 +76,7 @@ public class FluidVariantRenderTest implements ClientModInitializer {
float v0 = sprite.getMinV();
float u1 = sprite.getMaxU();
float v1 = sprite.getMaxV();
Matrix4f model = ms.peek().getModel();
Matrix4f model = ms.peek().getPositionMatrix();
bufferBuilder.vertex(model, x0, y1, z).color(r, g, b, 1).texture(u0, v1).next();
bufferBuilder.vertex(model, x1, y1, z).color(r, g, b, 1).texture(u1, v1).next();
bufferBuilder.vertex(model, x1, y0, z).color(r, g, b, 1).texture(u1, v0).next();