WIP: Port some 1.21.5 thingsmc1.21.5

4 files changed, 28 insertions, 26 deletions

diff --git a/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java b/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
index f2c6c53..2c40b08 100644
--- a/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
+++ b/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
@@ -3,10 +3,8 @@ package moe.nea.firmament.init;
 import me.shedaniel.mm.api.ClassTinkerers;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.render.block.BlockModels;
 import net.minecraft.client.render.block.BlockRenderManager;
 import net.minecraft.client.render.chunk.SectionBuilder;
-import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.util.math.BlockPos;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -28,8 +26,8 @@ public class SectionBuilderRiser extends RiserUtils {
     String BlockRenderManager;
     @IntermediaryName(BlockState.class)
     String BlockState;
-    @IntermediaryName(BakedModel.class)
-    String BakedModel;
+//    @IntermediaryName(BakedModel.class)
+//    String BakedModel;
     String CustomBlockTextures = "moe.nea.firmament.features.texturepack.CustomBlockTextures";
 
     Type getModelDesc = Type.getMethodType(
@@ -41,7 +39,8 @@ public class SectionBuilderRiser extends RiserUtils {
         Intermediary.<BlockRenderManager>className(),
         Intermediary.methodName(net.minecraft.client.render.block.BlockRenderManager::getModel),
         Type.getMethodDescriptor(
-            getTypeForClassName(Intermediary.<BakedModel>className()),
+			// TODO: fix this riser
+//            getTypeForClassName(Intermediary.<BakedModel>className()),
             getTypeForClassName(Intermediary.<BlockState>className())
         )
     );
@@ -105,8 +104,9 @@ public class SectionBuilderRiser extends RiserUtils {
                 Opcodes.INVOKESTATIC,
                 getTypeForClassName(CustomBlockTextures).getInternalName(),
                 "patchIndigo",
-                Type.getMethodDescriptor(getTypeForClassName(BakedModel),
-                                         getTypeForClassName(BakedModel),
+                Type.getMethodDescriptor(
+//					getTypeForClassName(BakedModel),
+//                                         getTypeForClassName(BakedModel),
                                          getTypeForClassName(BlockPos),
                                          getTypeForClassName(BlockState)),
                 false
diff --git a/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java b/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
index b20c223..f07604e 100644
--- a/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
@@ -20,7 +20,7 @@ public abstract class PlayerDropEventPatch extends PlayerEntity {
 
 	@Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true)
 	public void onDropSelectedItem(boolean entireStack, CallbackInfoReturnable<Boolean> cir) {
-		Slot fakeSlot = new Slot(getInventory(), getInventory().selectedSlot, 0, 0);
+		Slot fakeSlot = new Slot(getInventory(), getInventory().getSelectedSlot(), 0, 0);
 		if (IsSlotProtectedEvent.shouldBlockInteraction(fakeSlot, SlotActionType.THROW, IsSlotProtectedEvent.MoveOrigin.DROP_FROM_HOTBAR)) {
 			cir.setReturnValue(false);
 		}
diff --git a/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java b/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java
index 06ecbd4..a4ae931 100644
--- a/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java
+++ b/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java
@@ -43,11 +43,11 @@ public abstract class SlotUpdateListener extends ClientCommonNetworkHandler {
 	private void onMultiSlotUpdate(InventoryS2CPacket packet, CallbackInfo ci) {
 		var player = this.client.player;
 		assert player != null;
-		if (packet.getSyncId() == 0) {
-			PlayerInventoryUpdate.Companion.publish(new PlayerInventoryUpdate.Multi(packet.getContents()));
-		} else if (packet.getSyncId() == player.currentScreenHandler.syncId) {
+		if (packet.syncId() == 0) {
+			PlayerInventoryUpdate.Companion.publish(new PlayerInventoryUpdate.Multi(packet.contents()));
+		} else if (packet.syncId() == player.currentScreenHandler.syncId) {
 			ChestInventoryUpdateEvent.Companion.publish(
-				new ChestInventoryUpdateEvent.Multi(packet.getContents())
+				new ChestInventoryUpdateEvent.Multi(packet.contents())
 			);
 		}
 	}
diff --git a/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java b/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java
index 5c52d70..b8cba80 100644
--- a/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java
@@ -1,30 +1,32 @@
 
 package moe.nea.firmament.mixins;
 
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import moe.nea.firmament.events.SoundReceiveEvent;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.math.Vec3d;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public class SoundReceiveEventPatch {
-    @Inject(method = "onPlaySound", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;playSound(Lnet/minecraft/entity/player/PlayerEntity;DDDLnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/sound/SoundCategory;FFJ)V"), cancellable = true)
-    private void postEventWhenSoundIsPlayed(PlaySoundS2CPacket packet, CallbackInfo ci) {
+    @WrapWithCondition(method = "onPlaySound", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;playSound(Lnet/minecraft/entity/Entity;DDDLnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/sound/SoundCategory;FFJ)V"))
+    private boolean postEventWhenSoundIsPlayed(ClientWorld instance, @Nullable Entity source, double x, double y, double z, RegistryEntry<SoundEvent> sound, SoundCategory category, float volume, float pitch, long seed) {
         var event = new SoundReceiveEvent(
-            packet.getSound(),
-            packet.getCategory(),
-            new Vec3d(packet.getX(), packet.getY(), packet.getZ()),
-            packet.getPitch(),
-            packet.getVolume(),
-            packet.getSeed()
+            sound,
+            category,
+            new Vec3d(x,y,z),
+            pitch,
+            volume,
+            seed
         );
         SoundReceiveEvent.Companion.publish(event);
-        if (event.getCancelled()) {
-            ci.cancel();
-        }
+		return !event.getCancelled();
     }
 }