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

1.19.3-pre3

Browse source
This commit is contained in:
modmuss50 2022-11-29 15:59:16 +00:00
parent 66f5b48542
commit 689f5e71bc
5 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModificationContext.java
View file

@ -23,11 +23,12 @@ import org.jetbrains.annotations.NotNull;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.sound.BiomeAdditionsSound;
import net.minecraft.sound.BiomeMoodSound;
import net.minecraft.sound.MusicSound;
import net.minecraft.sound.SoundEvent;
import net.minecraft.registry.RegistryKey;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.biome.BiomeParticleConfig;
@ -186,15 +187,15 @@ public interface BiomeModificationContext {
/**
* @see BiomeEffects#getLoopSound()
* @see BiomeEffects.Builder#loopSound(SoundEvent)
* @see BiomeEffects.Builder#loopSound(RegistryEntry)
*/
void setAmbientSound(Optional<SoundEvent> sound);
void setAmbientSound(Optional<RegistryEntry<SoundEvent>> sound);
/**
* @see BiomeEffects#getLoopSound()
* @see BiomeEffects.Builder#loopSound(SoundEvent)
* @see BiomeEffects.Builder#loopSound(RegistryEntry)
*/
default void setAmbientSound(@NotNull SoundEvent sound) {
default void setAmbientSound(@NotNull RegistryEntry<SoundEvent> sound) {
setAmbientSound(Optional.of(sound));
}

2
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java
View file

@ -170,7 +170,7 @@ public class BiomeModificationContextImpl implements BiomeModificationContext {
}
@Override
public void setAmbientSound(Optional<SoundEvent> sound) {
public void setAmbientSound(Optional<RegistryEntry<SoundEvent>> sound) {
effects.loopSound = Objects.requireNonNull(sound);
}

7
fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftClientMixin.java
View file

@ -72,7 +72,7 @@ public abstract class MinecraftClientMixin {
BlockEntity be = client.world.getBlockEntity(((BlockHitResult) client.crosshairTarget).getBlockPos());
if (be != null) {
stack = addBlockEntityNbt(stack, be);
addBlockEntityNbt(stack, be);
}
}
@ -100,10 +100,7 @@ public abstract class MinecraftClientMixin {
}
@Shadow
public abstract void doItemPick();
@Shadow
public abstract ItemStack addBlockEntityNbt(ItemStack itemStack_1, BlockEntity blockEntity_1);
protected abstract void addBlockEntityNbt(ItemStack itemStack_1, BlockEntity blockEntity_1);
@ModifyVariable(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;getSlotWithStack(Lnet/minecraft/item/ItemStack;)I", shift = At.Shift.BEFORE), method = "doItemPick", ordinal = 0)
public ItemStack modifyItemPick(ItemStack stack) {

15
fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/mixin/screenhandler/ServerPlayerEntityMixin.java
View file

@ -18,6 +18,7 @@ package net.fabricmc.fabric.mixin.screenhandler;
import java.util.OptionalInt;
import com.mojang.authlib.GameProfile;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
@ -27,29 +28,33 @@ 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.registry.Registries;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.Packet;
import net.minecraft.registry.Registries;
import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
import net.fabricmc.fabric.impl.screenhandler.Networking;
@Mixin(ServerPlayerEntity.class)
public abstract class ServerPlayerEntityMixin {
public abstract class ServerPlayerEntityMixin extends PlayerEntity {
@Shadow
private int screenHandlerSyncId;
@Shadow
public abstract void closeHandledScreen();
private ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile) {
super(world, pos, yaw, gameProfile);
}
@Shadow
public abstract void closeScreenHandler();
public abstract void closeHandledScreen();
@Unique
private final ThreadLocal<ScreenHandler> fabric_openedScreenHandler = new ThreadLocal<>();

10
gradle.properties
View file

@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
version=0.67.3
minecraft_version=1.19.3-pre2
yarn_version=+build.6
minecraft_version=1.19.3-pre3
yarn_version=+build.1
loader_version=0.14.10
prerelease=true
@ -11,7 +11,7 @@ prerelease=true
# Do not manually update, use the bumpversions task:
fabric-api-base-version=0.4.18
fabric-api-lookup-api-v1-version=1.6.17
fabric-biome-api-v1-version=11.0.6
fabric-biome-api-v1-version=12.0.0
fabric-block-api-v1-version=1.0.3
fabric-blockrenderlayer-v1-version=1.1.27
fabric-command-api-v1-version=1.2.18
@ -23,7 +23,7 @@ fabric-crash-report-info-v1-version=0.2.12
fabric-data-generation-api-v1-version=11.0.0
fabric-dimensions-v1-version=2.1.38
fabric-entity-events-v1-version=1.5.4
fabric-events-interaction-v0-version=0.4.35
fabric-events-interaction-v0-version=0.4.36
fabric-events-lifecycle-v0-version=0.2.37
fabric-game-rule-api-v1-version=1.0.28
fabric-gametest-api-v1-version=1.1.12
@ -51,7 +51,7 @@ fabric-rendering-v0-version=1.1.30
fabric-rendering-v1-version=1.11.6
fabric-resource-conditions-api-v1-version=2.2.0
fabric-resource-loader-v0-version=0.10.2
fabric-screen-api-v1-version=1.0.36
fabric-screen-api-v1-version=1.0.37
fabric-screen-handler-api-v1-version=1.3.9
fabric-sound-api-v1-version=1.0.6
fabric-transfer-api-v1-version=2.1.10