Merge branch '1.21.3' into 1.21.4

Author: thewinnt

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v3
         with:
           name: Artifacts

common/src/main/java/net/thewinnt/cutscenes/CutsceneType.java

@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.thewinnt.cutscenes.client.ClientCutsceneManager;
 import net.thewinnt.cutscenes.rotation.handler.CutsceneRotation;
 import net.thewinnt.cutscenes.rotation.handler.PlayerRotation;
 import net.thewinnt.cutscenes.time.CutsceneLength;
@@ -50,7 +49,6 @@ public class CutsceneType {
     public final List<CutsceneEffect<?>> effects;
 
     /** Constructs a cutscene type with all parameters specified. */
-    @SuppressWarnings("deprecation")
     public CutsceneType(PathLike path, Path rotationProvider, CutsceneLength length, Transition start, Transition end, boolean blockMovement, RotationHandler rotationHandler, ActionToggles toggles, boolean hideHand, boolean hideBlockOutline, List<CutsceneEffect<?>> effects) {
         if (path instanceof Path pth) {
             this.path = pth;

common/src/main/java/net/thewinnt/cutscenes/effect/CutsceneEffect.java

@@ -66,14 +66,15 @@ public static CutsceneEffect<?> fromNetwork(FriendlyByteBuf buf) {
         return serializer.factory().unchecked(start, end, serializer.fromNetwork(buf));
     }
 
-    public static CutsceneEffect<?> fromJSON(JsonObject json) {
+    @SuppressWarnings({"unchecked", "rawtypes"}) // java refuses to acknowledge that the ? is the same in serializer and its fromJSON
+    public static ServerEffectWrapper<?> fromJSON(JsonObject json) {
         ResourceLocation type = ResourceLocation.parse(GsonHelper.getAsString(json, "type"));
         CutsceneEffectSerializer<?> serializer = CutsceneAPI.CUTSCENE_EFFECT_SERIALIZERS.getValue(type);
         if (serializer == null) {
             throw new IllegalArgumentException("Unknown cutscene type effect: " + type);
         }
         double start = GsonHelper.getAsDouble(json, "start");
         double end = GsonHelper.getAsDouble(json, "end");
-        return serializer.factory().unchecked(start, end, serializer.fromJSON(json));
+        return new ServerEffectWrapper(start, end, serializer.fromJSON(json), serializer);
     }
 }

common/src/main/java/net/thewinnt/cutscenes/effect/ServerEffectWrapper.java

@@ -0,0 +1,24 @@
+package net.thewinnt.cutscenes.effect;
+
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.thewinnt.cutscenes.CutsceneType;
+
+public class ServerEffectWrapper<T> extends CutsceneEffect<T> {
+    private final CutsceneEffectSerializer<T> type;
+
+    public ServerEffectWrapper(double startTime, double endTime, T config, CutsceneEffectSerializer<T> type) {
+        super(startTime, endTime, config);
+        this.type = type;
+    }
+    
+    @Override public void onStart(ClientLevel level, CutsceneType cutscene) {}
+    
+    @Override public void onFrame(double time, ClientLevel level, CutsceneType cutscene) {}
+    
+    @Override public void onEnd(ClientLevel level, CutsceneType cutscene) {}
+    
+    @Override
+    public CutsceneEffectSerializer<T> getSerializer() {
+        return this.type;
+    }
+}

common/src/main/java/net/thewinnt/cutscenes/effect/serializer/AppearingTextSerializer.java

@@ -50,7 +50,9 @@ public AppearingTextConfiguration fromJSON(JsonObject json) {
         ResourceLocation soundbite = tryGetSoundEffect(json.get("soundbite"));
         DelayProvider delayProvider = DelayProvider.fromJSON(json.get("delays"), UndertaleDelayProvider.INSTANCE);
         FloatProvider pitch = FloatProvider.CODEC.parse(JsonOps.INSTANCE, json.get("pitch")).result().orElse(BACKUP_FLOAT);
-        if (pitch == BACKUP_FLOAT) CutsceneAPI.LOGGER.warn("Error loading float provider, using fallback");
+        if (json.has("pitch") && pitch == BACKUP_FLOAT) {
+            CutsceneAPI.LOGGER.warn("Error loading float provider, using fallback");
+        }
         return new AppearingTextConfiguration(text, rx, ry, lineWidth, dropShadow, soundbite, delayProvider, pitch);
     }
 

common/src/main/java/net/thewinnt/cutscenes/effect/type/PlaySoundEffect.java

@@ -4,7 +4,6 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance;
-import net.minecraft.util.RandomSource;
 import net.minecraft.world.phys.Vec3;
 import net.thewinnt.cutscenes.CutsceneType;
 import net.thewinnt.cutscenes.effect.CutsceneEffect;

common/src/main/java/net/thewinnt/cutscenes/entity/CutsceneCameraEntity.java

@@ -16,7 +16,6 @@
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.ServerLinks;
 import net.minecraft.tags.FluidTags;
@@ -29,7 +28,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.PushReaction;
 import net.minecraft.world.phys.Vec3;
-import net.thewinnt.cutscenes.CutsceneAPI;
 import net.thewinnt.cutscenes.CutsceneInstance;
 import net.thewinnt.cutscenes.transition.Transition;
 
@@ -184,4 +182,9 @@ public double getEyeY() {
     public boolean hasEffect(Holder<MobEffect> pEffect) {
         return minecraft.player.hasEffect(pEffect);
     }
+
+    @Override
+    public boolean shouldRender(double x, double y, double z) {
+        return false;
+    }
 }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 1.6.3
+mod_version = 1.6.6
 maven_group = net.thewinnt.cutscenes
 archives_name = cutscene-api
 enabled_platforms = fabric,neoforge