Skip to content

Commit

Permalink
23w41a
Browse files Browse the repository at this point in the history
  • Loading branch information
@modmuss50
modmuss50 committed Oct 11, 2023
1 parent 72c64fc commit 13986bf
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public ChuteBlock(Settings settings) {
}

@Override
protected MapCodec<? extends BlockWithEntity> method_53969() {
protected MapCodec<? extends BlockWithEntity> getCodec() {
throw new UnsupportedOperationException("not implemented yet");
}

Expand Down
2 changes: 1 addition & 1 deletion ...ic-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public CobbleGenBlock(Settings settings) {
}

@Override
protected MapCodec<? extends BlockWithEntity> method_53969() {
protected MapCodec<? extends BlockWithEntity> getCodec() {
throw new UnsupportedOperationException("not implemented yet");
}

Expand Down
4 changes: 2 additions & 2 deletions ...mand-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/EntitySelectorGameTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public void testEntitySelector(TestContext context) {

context.expectEntitiesAround(EntityType.CREEPER, BlockPos.ORIGIN, 3, 2.0);
MinecraftServer server = context.getWorld().getServer();
int result = server.getCommandManager().executeWithPrefix(server.getCommandSource(), command);
context.assertTrue(result == 2, "Expected 2 entities killed, got " + result);
server.getCommandManager().executeWithPrefix(server.getCommandSource(), command);
//context.assertTrue(result == 2, "Expected 2 entities killed, got " + result);
context.expectEntitiesAround(EntityType.CREEPER, BlockPos.ORIGIN, 1, 2.0);
context.complete();
}
Expand Down
4 changes: 2 additions & 2 deletions fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/entity/FakePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import net.minecraft.entity.passive.AbstractHorseEntity;
import net.minecraft.inventory.Inventory;
import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
import net.minecraft.scoreboard.AbstractTeam;
import net.minecraft.scoreboard.Team;
import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
Expand Down Expand Up @@ -126,7 +126,7 @@ public boolean isInvulnerableTo(DamageSource damageSource) {

@Nullable
@Override
public AbstractTeam getScoreboardTeam() {
public Team getScoreboardTeam() {
// Scoreboard team is checked using the gameprofile name by default, which we don't want.
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion .../java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientPlayNetworkHandlerMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) {
}

// Called when the client disconnects from a server or enters reconfiguration.
@Inject(method = "method_54134", at = @At("HEAD"))
@Inject(method = "clearWorld", at = @At("HEAD"))
private void onClearWorld(CallbackInfo ci) {
// If a world already exists, we need to unload all (block)entities in the world.
if (this.world != null) {
Expand Down
2 changes: 1 addition & 1 deletion .../src/testmod/java/net/fabricmc/fabric/test/object/builder/BlockEntityTypeBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
}

Text posText = Text.translatable("chat.coordinates", pos.getX(), pos.getY(), pos.getZ());
Text message = Text.method_54159("text.fabric-object-builder-api-v1-testmod.block_entity_type_success", posText, BLOCK_ENTITY_TYPE_ID);
Text message = Text.stringifiedTranslatable("text.fabric-object-builder-api-v1-testmod.block_entity_type_success", posText, BLOCK_ENTITY_TYPE_ID);

player.sendMessage(message, false);
}
Expand Down
2 changes: 1 addition & 1 deletion ...pi-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/ObjectBuilderGameTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class ObjectBuilderGameTest {
@GameTest(templateName = FabricGameTest.EMPTY_STRUCTURE)
public void testBlockUse(TestContext context) {
List<Block> blocks = List.of(BlockEntityTypeBuilderTest.INITIAL_BETRAYAL_BLOCK, BlockEntityTypeBuilderTest.ADDED_BETRAYAL_BLOCK, BlockEntityTypeBuilderTest.FIRST_MULTI_BETRAYAL_BLOCK, BlockEntityTypeBuilderTest.SECOND_MULTI_BETRAYAL_BLOCK);
BlockPos.Mutable pos = BlockPos.ORIGIN.mutableCopy();
BlockPos.Mutable pos = BlockPos.ORIGIN.up().mutableCopy();

for (Block block : blocks) {
context.setBlockState(pos, block);
Expand Down
2 changes: 1 addition & 1 deletion ...andler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/block/BoxBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public BoxBlock(Settings settings) {
}

@Override
protected MapCodec<? extends BlockWithEntity> method_53969() {
protected MapCodec<? extends BlockWithEntity> getCodec() {
throw new UnsupportedOperationException("not implemented yet");
}

Expand Down
2 changes: 1 addition & 1 deletion ...-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ transitive-accessible method net/minecraft/block/RailBlock <init> (Lnet/minecraf
transitive-accessible method net/minecraft/block/RedstoneTorchBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/RepeaterBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/RootsBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/SaplingBlock <init> (Lnet/minecraft/class_8813;Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/SaplingBlock <init> (Lnet/minecraft/block/SaplingGenerator;Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/ScaffoldingBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/SeaPickleBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/SeagrassBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
Expand Down
32 changes: 16 additions & 16 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true

version=0.90.0
minecraft_version=23w40a
yarn_version=+build.2
version=0.90.1
minecraft_version=23w41a
yarn_version=+build.1
loader_version=0.14.23
installer_version=0.11.1

Expand All @@ -13,36 +13,36 @@ curseforge_minecraft_version=1.20.3-Snapshot

# Do not manually update, use the bumpversions task:
fabric-api-base-version=0.4.33
fabric-api-lookup-api-v1-version=1.6.42
fabric-api-lookup-api-v1-version=1.6.43
fabric-biome-api-v1-version=13.0.13
fabric-block-api-v1-version=1.0.12
fabric-block-view-api-v2-version=1.0.1
fabric-blockrenderlayer-v1-version=1.1.43
fabric-command-api-v1-version=1.2.36
fabric-command-api-v2-version=2.2.15
fabric-commands-v0-version=0.2.53
fabric-command-api-v1-version=1.2.37
fabric-command-api-v2-version=2.2.16
fabric-commands-v0-version=0.2.54
fabric-containers-v0-version=0.1.73
fabric-content-registries-v0-version=5.0.4
fabric-content-registries-v0-version=5.0.5
fabric-crash-report-info-v1-version=0.2.20
fabric-data-generation-api-v1-version=13.1.4
fabric-dimensions-v1-version=2.1.56
fabric-entity-events-v1-version=1.5.25
fabric-events-interaction-v0-version=0.6.11
fabric-events-lifecycle-v0-version=0.2.68
fabric-events-interaction-v0-version=0.6.12
fabric-events-lifecycle-v0-version=0.2.69
fabric-game-rule-api-v1-version=1.0.40
fabric-gametest-api-v1-version=1.2.15
fabric-item-api-v1-version=2.1.32
fabric-item-group-api-v1-version=4.0.14
fabric-key-binding-api-v1-version=1.0.38
fabric-keybindings-v0-version=0.2.36
fabric-lifecycle-events-v1-version=2.2.26
fabric-lifecycle-events-v1-version=2.2.27
fabric-loot-api-v2-version=2.1.0
fabric-message-api-v1-version=6.0.2
fabric-mining-level-api-v1-version=2.1.54
fabric-mining-level-api-v1-version=2.1.55
fabric-model-loading-api-v1-version=1.0.5
fabric-models-v0-version=0.4.4
fabric-networking-api-v1-version=3.0.9
fabric-object-builder-api-v1-version=13.0.0
fabric-object-builder-api-v1-version=13.0.1
fabric-particles-v1-version=1.1.4
fabric-recipe-api-v1-version=2.0.6
fabric-registry-sync-v0-version=4.0.5
Expand All @@ -56,9 +56,9 @@ fabric-rendering-v1-version=3.0.10
fabric-resource-conditions-api-v1-version=2.3.10
fabric-resource-loader-v0-version=0.11.11
fabric-screen-api-v1-version=2.0.11
fabric-screen-handler-api-v1-version=1.3.40
fabric-screen-handler-api-v1-version=1.3.41
fabric-sound-api-v1-version=1.0.14
fabric-transfer-api-v1-version=4.0.0
fabric-transitive-access-wideners-v1-version=5.0.4
fabric-transfer-api-v1-version=4.0.1
fabric-transitive-access-wideners-v1-version=5.0.5
fabric-convention-tags-v1-version=1.5.7
fabric-client-tags-api-v1-version=1.1.4

0 comments on commit 13986bf

Please sign in to comment.