Skip to content

Commit 526b80e

Browse files
committed
密码的忘记应用摄像头的水平角和垂直角变更了
1 parent fe20ca4 commit 526b80e

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

src/main/java/cn/coostack/cooparticlesapi/mixin/CooParticleCameraMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ public abstract class CooParticleCameraMixin {
2929

3030
@Inject(method = "update", at = @At("TAIL"))
3131
private void onUpdate(CallbackInfo ci) {
32-
// float newYaw = yaw + CameraUtil.INSTANCE.getCurrentYawOffset();
33-
// float newPitch = pitch + CameraUtil.INSTANCE.getCurrentPitchOffset();
34-
// setRotation(newYaw, newPitch);
32+
float newYaw = yaw + ClientCameraUtil.INSTANCE.getCurrentYawOffset();
33+
float newPitch = pitch + ClientCameraUtil.INSTANCE.getCurrentPitchOffset();
3534
double x = pos.getX() + ClientCameraUtil.INSTANCE.getCurrentXOffset();
3635
double y = pos.getY() + ClientCameraUtil.INSTANCE.getCurrentYOffset();
3736
double z = pos.getZ() + ClientCameraUtil.INSTANCE.getCurrentZOffset();
37+
setRotation(newYaw, newPitch);
3838
setPos(x, y, z);
3939
}
4040
}

src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/SimpleParticleEmitters.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ class SimpleParticleEmitters(
263263
this.maxAge = data.maxAge
264264
this.textureSheet = data.getTextureSheet()
265265
this.particleAlpha = data.alpha
266+
266267
}
267268
control.addPreTickAction {
268269
if (minecraftTick) return@addPreTickAction

src/main/kotlin/cn/coostack/cooparticlesapi/particles/control/group/ControlableParticleGroup.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import kotlin.collections.iterator
3535
* 在客户端cancel只会在客户端不可见并且会被服务器状态刷新
3636
* 所以删除粒子只能在服务器上
3737
*/
38-
@Environment(EnvType.CLIENT)
3938
abstract class ControlableParticleGroup(val uuid: UUID) : Controlable<ControlableParticleGroup> {
4039
// 实际存在于客户端的粒子
4140
val particles = ConcurrentHashMap<UUID, Controlable<*>>()

src/main/kotlin/cn/coostack/cooparticlesapi/particles/control/group/SequencedParticleGroup.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ abstract class SequencedParticleGroup(uuid: UUID) : ControlableParticleGroup(uui
3434
return other === this
3535
}
3636

37+
override fun hashCode(): Int {
38+
return order
39+
}
40+
3741
}
3842

3943
val displayedStatus: LongArray by lazy {

0 commit comments

Comments
 (0)