ChomeNS/SongPlayer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18 from allinkdev/ver/1.19.4

Browse source 
1.19.4
This commit is contained in:
Harry Zhou 2023-05-12 21:44:00 -05:00 committed by GitHub
commit 42b745e0be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gradle.properties
View file

@ -4,9 +4,9 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.19.3 minecraft_version=1.19.4
yarn_mappings=1.19.3+build.5 yarn_mappings=1.19.4+build.2
loader_version=0.14.12 loader_version=0.14.19
# Mod Properties # Mod Properties
mod_version = 2.0.3 mod_version = 2.0.3
@ -15,4 +15,4 @@ org.gradle.parallel=true
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.71.0+1.19.3 fabric_version=0.80.0+1.19.4

5
src/main/java/com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin.java
View file

@ -3,8 +3,8 @@ package com.github.hhhzzzsss.songplayer.mixin;
import com.github.hhhzzzsss.songplayer.CommandProcessor; import com.github.hhhzzzsss.songplayer.CommandProcessor;
import com.github.hhhzzzsss.songplayer.playing.SongHandler; import com.github.hhhzzzsss.songplayer.playing.SongHandler;
import com.github.hhhzzzsss.songplayer.playing.Stage; import com.github.hhhzzzsss.songplayer.playing.Stage;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
import net.minecraft.text.Text;
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.injection.At; import org.spongepowered.asm.mixin.injection.At;
@ -15,7 +15,6 @@ import com.github.hhhzzzsss.songplayer.SongPlayer;
import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.ClientConnection; import net.minecraft.network.ClientConnection;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
@ -28,7 +27,7 @@ public class ClientPlayNetworkHandlerMixin {
connection = null; connection = null;
} }
@Inject(at = @At("HEAD"), method = "sendPacket(Lnet/minecraft/network/Packet;)V", cancellable = true) @Inject(at = @At("HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;)V", cancellable = true)
private void onSendPacket(Packet<?> packet, CallbackInfo ci) { private void onSendPacket(Packet<?> packet, CallbackInfo ci) {
Stage stage = SongHandler.getInstance().stage; Stage stage = SongHandler.getInstance().stage;
if (stage != null && packet instanceof PlayerMoveC2SPacket) { if (stage != null && packet instanceof PlayerMoveC2SPacket) {

4
src/main/java/com/github/hhhzzzsss/songplayer/mixin/InGameHudMixin.java
View file

@ -21,8 +21,8 @@ public class InGameHudMixin {
@Shadow @Shadow
private int heldItemTooltipFade; private int heldItemTooltipFade;
@Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;F)V", @Inject(method = "render",
at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableBlend()V", ordinal = 4)) at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableBlend()V", ordinal = 3))
private void onRender(MatrixStack matrixStack, float tickDelta, CallbackInfo ci) { private void onRender(MatrixStack matrixStack, float tickDelta, CallbackInfo ci) {
ProgressDisplay.getInstance().onRenderHUD(matrixStack, scaledWidth, scaledHeight, heldItemTooltipFade); ProgressDisplay.getInstance().onRenderHUD(matrixStack, scaledWidth, scaledHeight, heldItemTooltipFade);
} }

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

@ -28,7 +28,7 @@
"depends": { "depends": {
"fabricloader": ">=0.14.11", "fabricloader": ">=0.14.11",
"fabric": "*", "fabric": "*",
"minecraft": "~1.19.3", "minecraft": "~1.19.4",
"java": ">=17" "java": ">=17"
}, },
"suggests": { "suggests": {