FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-23 21:40:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions3

1.21.1-rc1

Browse source
This commit is contained in:
modmuss50 2024-08-07 16:54:26 +01:00
parent 7363c44ea9
commit 1daea21533
10 changed files with 29 additions and 29 deletions
fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment
CommonAttachmentTests.java
fabric-object-builder-api-v1/src
testmod/java/net/fabricmc/fabric/test/object/builder
TealSignTest.java
testmodClient/java/net/fabricmc/fabric/test/object/builder/client
TealSignClientTest.java
fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid
CustomFluid.javaNoOverlayFluid.javaOverlayFluid.javaUnregisteredFluid.java
fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access
SignBlockEntityTest.java
gradle.properties
src/main/resources
fabric.mod.json

5
fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/CommonAttachmentTests.java
View file

@ -38,6 +38,7 @@ import org.junit.jupiter.api.Test;
import net.minecraft.Bootstrap;
import net.minecraft.SharedConstants;
import net.minecraft.block.Blocks;
import net.minecraft.block.entity.BellBlockEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;
@ -216,14 +217,14 @@ public class CommonAttachmentTests {
@Test
void testBlockEntityPersistence() {
BlockEntity blockEntity = new BellBlockEntity(BlockPos.ORIGIN, mock());
BlockEntity blockEntity = new BellBlockEntity(BlockPos.ORIGIN, Blocks.BELL.getDefaultState());
assertFalse(blockEntity.hasAttached(PERSISTENT));
int expected = 1;
blockEntity.setAttached(PERSISTENT, expected);
NbtCompound fakeSave = blockEntity.createNbtWithId(mockDRM());
blockEntity = BlockEntity.createFromNbt(BlockPos.ORIGIN, mock(), fakeSave, mockDRM());
blockEntity = BlockEntity.createFromNbt(BlockPos.ORIGIN, Blocks.BELL.getDefaultState(), fakeSave, mockDRM());
assertNotNull(blockEntity);
assertTrue(blockEntity.hasAttached(PERSISTENT));
assertEquals(expected, blockEntity.getAttached(PERSISTENT));

30
fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java
View file

@ -20,7 +20,6 @@ import net.minecraft.block.AbstractBlock;
import net.minecraft.block.BlockSetType;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.HangingSignBlock;
import net.minecraft.block.SignBlock;
import net.minecraft.block.WallHangingSignBlock;
import net.minecraft.block.WallSignBlock;
@ -28,7 +27,6 @@ import net.minecraft.block.WoodType;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.block.entity.HangingSignBlockEntity;
import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.item.HangingSignItem;
import net.minecraft.item.Item;
import net.minecraft.item.SignItem;
import net.minecraft.registry.Registries;
@ -41,6 +39,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityT
import net.fabricmc.fabric.api.object.builder.v1.block.type.BlockSetTypeBuilder;
import net.fabricmc.fabric.api.object.builder.v1.block.type.WoodTypeBuilder;
// Hanging sign test disabled as its not easy to create a custom HangingSignBlockEntity type.
public class TealSignTest implements ModInitializer {
public static final Identifier TEAL_TYPE_ID = ObjectBuilderTestConstants.id("teal");
public static final BlockSetType TEAL_BLOCK_SET_TYPE = BlockSetTypeBuilder.copyOf(BlockSetType.OAK).build(TEAL_TYPE_ID);
@ -57,12 +56,12 @@ public class TealSignTest implements ModInitializer {
return new TealSign(pos, state);
}
};
public static final HangingSignBlock TEAL_HANGING_SIGN = new HangingSignBlock(TEAL_WOOD_TYPE, AbstractBlock.Settings.copy(Blocks.OAK_HANGING_SIGN)) {
@Override
public TealHangingSign createBlockEntity(BlockPos pos, BlockState state) {
return new TealHangingSign(pos, state);
}
};
//public static final HangingSignBlock TEAL_HANGING_SIGN = new HangingSignBlock(TEAL_WOOD_TYPE, AbstractBlock.Settings.copy(Blocks.OAK_HANGING_SIGN)) {
// @Override
// public TealHangingSign createBlockEntity(BlockPos pos, BlockState state) {
// return new TealHangingSign(pos, state);
// }
//};
public static final WallHangingSignBlock TEAL_WALL_HANGING_SIGN = new WallHangingSignBlock(TEAL_WOOD_TYPE, AbstractBlock.Settings.copy(Blocks.OAK_HANGING_SIGN)) {
@Override
public TealHangingSign createBlockEntity(BlockPos pos, BlockState state) {
@ -70,9 +69,9 @@ public class TealSignTest implements ModInitializer {
}
};
public static final SignItem TEAL_SIGN_ITEM = new SignItem(new Item.Settings(), TEAL_SIGN, TEAL_WALL_SIGN);
public static final HangingSignItem TEAL_HANGING_SIGN_ITEM = new HangingSignItem(TEAL_HANGING_SIGN, TEAL_WALL_HANGING_SIGN, new Item.Settings());
//public static final HangingSignItem TEAL_HANGING_SIGN_ITEM = new HangingSignItem(TEAL_HANGING_SIGN, TEAL_WALL_HANGING_SIGN, new Item.Settings());
public static final BlockEntityType<TealSign> TEST_SIGN_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(TealSign::new, TEAL_SIGN, TEAL_WALL_SIGN).build();
public static final BlockEntityType<TealHangingSign> TEST_HANGING_SIGN_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(TealHangingSign::new, TEAL_HANGING_SIGN, TEAL_WALL_HANGING_SIGN).build();
//public static final BlockEntityType<TealHangingSign> TEST_HANGING_SIGN_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(TealHangingSign::new, TEAL_HANGING_SIGN, TEAL_WALL_HANGING_SIGN).build();
@Override
public void onInitialize() {
@ -80,19 +79,19 @@ public class TealSignTest implements ModInitializer {
Registry.register(Registries.BLOCK, ObjectBuilderTestConstants.id("teal_sign"), TEAL_SIGN);
Registry.register(Registries.BLOCK, ObjectBuilderTestConstants.id("teal_wall_sign"), TEAL_WALL_SIGN);
Registry.register(Registries.BLOCK, ObjectBuilderTestConstants.id("teal_hanging_sign"), TEAL_HANGING_SIGN);
//Registry.register(Registries.BLOCK, ObjectBuilderTestConstants.id("teal_hanging_sign"), TEAL_HANGING_SIGN);
Registry.register(Registries.BLOCK, ObjectBuilderTestConstants.id("teal_wall_hanging_sign"), TEAL_WALL_HANGING_SIGN);
Registry.register(Registries.ITEM, ObjectBuilderTestConstants.id("teal_sign"), TEAL_SIGN_ITEM);
Registry.register(Registries.ITEM, ObjectBuilderTestConstants.id("teal_hanging_sign"), TEAL_HANGING_SIGN_ITEM);
//Registry.register(Registries.ITEM, ObjectBuilderTestConstants.id("teal_hanging_sign"), TEAL_HANGING_SIGN_ITEM);
Registry.register(Registries.BLOCK_ENTITY_TYPE, ObjectBuilderTestConstants.id("teal_sign"), TEST_SIGN_BLOCK_ENTITY);
Registry.register(Registries.BLOCK_ENTITY_TYPE, ObjectBuilderTestConstants.id("teal_hanging_sign"), TEST_HANGING_SIGN_BLOCK_ENTITY);
//Registry.register(Registries.BLOCK_ENTITY_TYPE, ObjectBuilderTestConstants.id("teal_hanging_sign"), TEST_HANGING_SIGN_BLOCK_ENTITY);
}
public static class TealSign extends SignBlockEntity {
public TealSign(BlockPos pos, BlockState state) {
super(pos, state);
super(TEST_SIGN_BLOCK_ENTITY, pos, state);
}
@Override
@ -108,7 +107,8 @@ public class TealSignTest implements ModInitializer {
@Override
public BlockEntityType<?> getType() {
return TEST_HANGING_SIGN_BLOCK_ENTITY;
//return TEST_HANGING_SIGN_BLOCK_ENTITY;
return null;
}
}
}

3
fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java
View file

@ -16,7 +16,6 @@
package net.fabricmc.fabric.test.object.builder.client;
import net.minecraft.client.render.block.entity.HangingSignBlockEntityRenderer;
import net.minecraft.client.render.block.entity.SignBlockEntityRenderer;
import net.fabricmc.api.ClientModInitializer;
@ -27,6 +26,6 @@ public class TealSignClientTest implements ClientModInitializer {
@Override
public void onInitializeClient() {
BlockEntityRendererFactoriesAccessor.callRegister(TealSignTest.TEST_SIGN_BLOCK_ENTITY, SignBlockEntityRenderer::new);
BlockEntityRendererFactoriesAccessor.callRegister(TealSignTest.TEST_HANGING_SIGN_BLOCK_ENTITY, HangingSignBlockEntityRenderer::new);
//BlockEntityRendererFactoriesAccessor.callRegister(TealSignTest.TEST_HANGING_SIGN_BLOCK_ENTITY, HangingSignBlockEntityRenderer::new);
}
}

2
fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomFluid.java
View file

@ -68,7 +68,7 @@ public abstract class CustomFluid extends FlowableFluid {
}
@Override
public int getFlowSpeed(WorldView world) {
public int getMaxFlowDistance(WorldView world) {
return 4;
}

2
fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/NoOverlayFluid.java
View file

@ -68,7 +68,7 @@ public abstract class NoOverlayFluid extends FlowableFluid {
}
@Override
public int getFlowSpeed(WorldView world) {
public int getMaxFlowDistance(WorldView world) {
return 4;
}

2
fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/OverlayFluid.java
View file

@ -68,7 +68,7 @@ public abstract class OverlayFluid extends FlowableFluid {
}
@Override
public int getFlowSpeed(WorldView world) {
public int getMaxFlowDistance(WorldView world) {
return 4;
}

2
fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/UnregisteredFluid.java
View file

@ -68,7 +68,7 @@ public abstract class UnregisteredFluid extends FlowableFluid {
}
@Override
public int getFlowSpeed(WorldView world) {
public int getMaxFlowDistance(WorldView world) {
return 4;
}

2
fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/SignBlockEntityTest.java
View file

@ -62,7 +62,7 @@ public final class SignBlockEntityTest implements ModInitializer {
public static class TestSign extends SignBlockEntity {
public TestSign(BlockPos pos, BlockState state) {
super(pos, state);
super(TEST_SIGN_BLOCK_ENTITY, pos, state);
}
@Override

8
gradle.properties
View file

@ -3,13 +3,13 @@ org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true
version=0.101.2
minecraft_version=1.21
yarn_version=+build.2
minecraft_version=1.21.1-rc1
yarn_version=+build.1
loader_version=0.15.11
installer_version=1.0.1
prerelease=false
curseforge_minecraft_version=1.21
prerelease=true
curseforge_minecraft_version=1.21-Snapshot
# Do not manually update, use the bumpversions task:
fabric-api-base-version=0.4.42

2
src/main/resources/fabric.mod.json
View file

@ -21,7 +21,7 @@
"depends": {
"fabricloader": ">=0.15.11",
"java": ">=21",
"minecraft": ">=1.21- <1.21.1-"
"minecraft": ">=1.21.1- <1.21.2-"
},
"description": "Core API module providing key hooks and intercompatibility features."
}