mirror of
https://github.com/FabricMC/fabric.git
synced 2025-05-16 16:20:39 -04:00
1.19.3-pre3
This commit is contained in:
parent
66f5b48542
commit
689f5e71bc
5 changed files with 24 additions and 21 deletions
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric
fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client
fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/mixin/screenhandler
gradle.properties
|
@ -23,11 +23,12 @@ import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import net.minecraft.entity.EntityType;
|
import net.minecraft.entity.EntityType;
|
||||||
import net.minecraft.entity.SpawnGroup;
|
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.BiomeAdditionsSound;
|
||||||
import net.minecraft.sound.BiomeMoodSound;
|
import net.minecraft.sound.BiomeMoodSound;
|
||||||
import net.minecraft.sound.MusicSound;
|
import net.minecraft.sound.MusicSound;
|
||||||
import net.minecraft.sound.SoundEvent;
|
import net.minecraft.sound.SoundEvent;
|
||||||
import net.minecraft.registry.RegistryKey;
|
|
||||||
import net.minecraft.world.biome.Biome;
|
import net.minecraft.world.biome.Biome;
|
||||||
import net.minecraft.world.biome.BiomeEffects;
|
import net.minecraft.world.biome.BiomeEffects;
|
||||||
import net.minecraft.world.biome.BiomeParticleConfig;
|
import net.minecraft.world.biome.BiomeParticleConfig;
|
||||||
|
@ -186,15 +187,15 @@ public interface BiomeModificationContext {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see BiomeEffects#getLoopSound()
|
* @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#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));
|
setAmbientSound(Optional.of(sound));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ public class BiomeModificationContextImpl implements BiomeModificationContext {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setAmbientSound(Optional<SoundEvent> sound) {
|
public void setAmbientSound(Optional<RegistryEntry<SoundEvent>> sound) {
|
||||||
effects.loopSound = Objects.requireNonNull(sound);
|
effects.loopSound = Objects.requireNonNull(sound);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ public abstract class MinecraftClientMixin {
|
||||||
BlockEntity be = client.world.getBlockEntity(((BlockHitResult) client.crosshairTarget).getBlockPos());
|
BlockEntity be = client.world.getBlockEntity(((BlockHitResult) client.crosshairTarget).getBlockPos());
|
||||||
|
|
||||||
if (be != null) {
|
if (be != null) {
|
||||||
stack = addBlockEntityNbt(stack, be);
|
addBlockEntityNbt(stack, be);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,10 +100,7 @@ public abstract class MinecraftClientMixin {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
public abstract void doItemPick();
|
protected abstract void addBlockEntityNbt(ItemStack itemStack_1, BlockEntity blockEntity_1);
|
||||||
|
|
||||||
@Shadow
|
|
||||||
public abstract ItemStack 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)
|
@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) {
|
public ItemStack modifyItemPick(ItemStack stack) {
|
||||||
|
|
|
@ -18,6 +18,7 @@ package net.fabricmc.fabric.mixin.screenhandler;
|
||||||
|
|
||||||
import java.util.OptionalInt;
|
import java.util.OptionalInt;
|
||||||
|
|
||||||
|
import com.mojang.authlib.GameProfile;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
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.CallbackInfoReturnable;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
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.network.Packet;
|
||||||
|
import net.minecraft.registry.Registries;
|
||||||
import net.minecraft.screen.NamedScreenHandlerFactory;
|
import net.minecraft.screen.NamedScreenHandlerFactory;
|
||||||
import net.minecraft.screen.ScreenHandler;
|
import net.minecraft.screen.ScreenHandler;
|
||||||
import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
|
import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
|
||||||
import net.minecraft.server.network.ServerPlayNetworkHandler;
|
import net.minecraft.server.network.ServerPlayNetworkHandler;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.util.Identifier;
|
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.ExtendedScreenHandlerFactory;
|
||||||
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
|
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
|
||||||
import net.fabricmc.fabric.impl.screenhandler.Networking;
|
import net.fabricmc.fabric.impl.screenhandler.Networking;
|
||||||
|
|
||||||
@Mixin(ServerPlayerEntity.class)
|
@Mixin(ServerPlayerEntity.class)
|
||||||
public abstract class ServerPlayerEntityMixin {
|
public abstract class ServerPlayerEntityMixin extends PlayerEntity {
|
||||||
@Shadow
|
@Shadow
|
||||||
private int screenHandlerSyncId;
|
private int screenHandlerSyncId;
|
||||||
|
|
||||||
@Shadow
|
private ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile) {
|
||||||
public abstract void closeHandledScreen();
|
super(world, pos, yaw, gameProfile);
|
||||||
|
}
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
public abstract void closeScreenHandler();
|
public abstract void closeHandledScreen();
|
||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private final ThreadLocal<ScreenHandler> fabric_openedScreenHandler = new ThreadLocal<>();
|
private final ThreadLocal<ScreenHandler> fabric_openedScreenHandler = new ThreadLocal<>();
|
||||||
|
|
|
@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
version=0.67.3
|
version=0.67.3
|
||||||
minecraft_version=1.19.3-pre2
|
minecraft_version=1.19.3-pre3
|
||||||
yarn_version=+build.6
|
yarn_version=+build.1
|
||||||
loader_version=0.14.10
|
loader_version=0.14.10
|
||||||
|
|
||||||
prerelease=true
|
prerelease=true
|
||||||
|
@ -11,7 +11,7 @@ prerelease=true
|
||||||
# Do not manually update, use the bumpversions task:
|
# Do not manually update, use the bumpversions task:
|
||||||
fabric-api-base-version=0.4.18
|
fabric-api-base-version=0.4.18
|
||||||
fabric-api-lookup-api-v1-version=1.6.17
|
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-block-api-v1-version=1.0.3
|
||||||
fabric-blockrenderlayer-v1-version=1.1.27
|
fabric-blockrenderlayer-v1-version=1.1.27
|
||||||
fabric-command-api-v1-version=1.2.18
|
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-data-generation-api-v1-version=11.0.0
|
||||||
fabric-dimensions-v1-version=2.1.38
|
fabric-dimensions-v1-version=2.1.38
|
||||||
fabric-entity-events-v1-version=1.5.4
|
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-events-lifecycle-v0-version=0.2.37
|
||||||
fabric-game-rule-api-v1-version=1.0.28
|
fabric-game-rule-api-v1-version=1.0.28
|
||||||
fabric-gametest-api-v1-version=1.1.12
|
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-rendering-v1-version=1.11.6
|
||||||
fabric-resource-conditions-api-v1-version=2.2.0
|
fabric-resource-conditions-api-v1-version=2.2.0
|
||||||
fabric-resource-loader-v0-version=0.10.2
|
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-screen-handler-api-v1-version=1.3.9
|
||||||
fabric-sound-api-v1-version=1.0.6
|
fabric-sound-api-v1-version=1.0.6
|
||||||
fabric-transfer-api-v1-version=2.1.10
|
fabric-transfer-api-v1-version=2.1.10
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue