mirror of
https://github.com/TeamMidnightDust/Celestria.git
synced 2025-12-16 15:55:09 +01:00
2.0.1-rc.1
1. support mc 1.21.6 2. add shooting star phare animation
This commit is contained in:
Jaffe2718
@@ -33,7 +33,7 @@ public class CelestriaClient {
|
||||
shootingStars.forEach(ShootingStar::tick);
|
||||
shootingStars.removeAll(shootingStars.stream().filter(star -> star.progress <= 0).toList());
|
||||
if (CelestriaClient.clientOnlyMode && CelestriaConfig.enableShootingStars && client.world != null) {
|
||||
float tickDelta = client.getRenderTickCounter().getTickDelta(true);
|
||||
float tickDelta = client.getRenderTickCounter().getDynamicDeltaTicks();
|
||||
if ((180 < client.world.getSkyAngle(tickDelta) * 360 && 270 > client.world.getSkyAngle(tickDelta) * 360) && random.nextInt(Celestria.getChance(client.world)) == 0) {
|
||||
shootingStars.add(new ShootingStar(CelestriaConfig.shootingStarPathLength, random.nextInt(3), random.nextBetween(100, 150), random.nextInt(360), random.nextBetween(10, 170), random.nextBetween(Math.min(CelestriaConfig.shootingStarMinSize, CelestriaConfig.shootingStarMaxSize), Math.max(CelestriaConfig.shootingStarMaxSize, CelestriaConfig.shootingStarMinSize))));
|
||||
}
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
package eu.midnightdust.celestria;
|
||||
|
||||
import eu.midnightdust.celestria.config.CelestriaConfig;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class ShootingStar {
|
||||
public int progress;
|
||||
public final int type, x, y, rotation, size;
|
||||
public int phaseScore;
|
||||
public ShootingStar(int progress, int type, int x, int y, int rotation, int size) {
|
||||
this.progress = progress;
|
||||
this.type = type;
|
||||
@@ -10,9 +16,25 @@ public class ShootingStar {
|
||||
this.y = y;
|
||||
this.rotation = rotation;
|
||||
this.size = size;
|
||||
this.phaseScore = 0;
|
||||
}
|
||||
|
||||
public void tick() {
|
||||
--progress;
|
||||
phaseScore++;
|
||||
phaseScore %= 100;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current phase of the shooting star (UV offset of the texture)
|
||||
* @see ShootingStar#phaseScore
|
||||
* @see CelestriaConfig#shootingStarPhaseCycle
|
||||
* @return [0, 25%) -> 0.0F, [25%, 50%) -> 0.25F, [50%, 75%) -> 0.5F, [75%, 100%) -> 0.75F
|
||||
*/
|
||||
public float getPhase() {
|
||||
if ((double) this.phaseScore / CelestriaConfig.shootingStarPhaseCycle < 0.25) return 0.0F;
|
||||
else if ((double) this.phaseScore / CelestriaConfig.shootingStarPhaseCycle < 0.5) return 0.25F;
|
||||
else if ((double) this.phaseScore / CelestriaConfig.shootingStarPhaseCycle < 0.75) return 0.5F;
|
||||
else return 0.75F;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ public class CelestriaConfig extends MidnightConfig {
|
||||
@Entry(category = STARS, isSlider = true, min = 0, max = 500) public static int shootingStarPathLength = 50;
|
||||
@Entry(category = STARS) public static int shootingStarChance = 20000;
|
||||
@Entry(category = STARS) public static int shootingStarLuckDuration = 1000;
|
||||
@Entry(category = STARS, min = 4) public static int shootingStarPhaseCycle = 60;
|
||||
@Entry(category = STARS) public static List<String> shootingStarMessages = Lists.newArrayList("celestria.shootingStar.1", "celestria.shootingStar.2", "celestria.shootingStar.3");
|
||||
@Entry(category = INSOMNIA) public static boolean enableInsomnia = true;
|
||||
@Entry(category = INSOMNIA) public static int insomniaChance = 30000;
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package eu.midnightdust.celestria.mixin;
|
||||
|
||||
import eu.midnightdust.celestria.render.ShootingStarRendering;
|
||||
import net.minecraft.client.render.SkyRendering;
|
||||
import net.minecraft.client.render.VertexConsumerProvider;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(SkyRendering.class)
|
||||
public abstract class MixinSkyRendering {
|
||||
@Unique private final ShootingStarRendering celestria$shootingStarRendering = new ShootingStarRendering();
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;draw()V"), method = "renderCelestialBodies")
|
||||
private void celestria$renderShootingStars(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers, float rot, int phase, float alpha, float starBrightness, CallbackInfo ci) {
|
||||
celestria$shootingStarRendering.renderShootingStars(matrices, vertexConsumers);
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package eu.midnightdust.celestria.mixin;
|
||||
|
||||
import eu.midnightdust.celestria.render.ShootingStarRenderer;
|
||||
import net.minecraft.client.render.Camera;
|
||||
import net.minecraft.client.render.WorldRenderer;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.joml.Matrix4f;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(WorldRenderer.class)
|
||||
public abstract class MixinWorldRenderer {
|
||||
@Unique private final ShootingStarRenderer celestria$shootingStarRenderer = new ShootingStarRenderer();
|
||||
@Shadow @Nullable private ClientWorld world;
|
||||
|
||||
@Inject(at = @At(value = "TAIL"), method = "renderSky(Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/client/render/Camera;ZLjava/lang/Runnable;)V")
|
||||
public void celestria$renderShootingStars(Matrix4f matrix4f, Matrix4f projectionMatrix, float tickDelta, Camera camera, boolean thickFog, Runnable fogCallback, CallbackInfo ci) {
|
||||
MatrixStack matrices = new MatrixStack();
|
||||
matrices.multiplyPositionMatrix(matrix4f);
|
||||
celestria$shootingStarRenderer.renderShootingStars(world, matrices);
|
||||
}
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
package eu.midnightdust.celestria.render;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import eu.midnightdust.celestria.CelestriaClient;
|
||||
import eu.midnightdust.celestria.ShootingStar;
|
||||
import eu.midnightdust.celestria.config.CelestriaConfig;
|
||||
import net.minecraft.client.render.BufferBuilder;
|
||||
import net.minecraft.client.render.BufferRenderer;
|
||||
import net.minecraft.client.render.GameRenderer;
|
||||
import net.minecraft.client.render.Tessellator;
|
||||
import net.minecraft.client.render.VertexFormat;
|
||||
import net.minecraft.client.render.VertexFormats;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import net.minecraft.util.math.RotationAxis;
|
||||
import org.joml.Matrix4f;
|
||||
|
||||
import static eu.midnightdust.celestria.Celestria.id;
|
||||
import static java.lang.Math.pow;
|
||||
|
||||
public class ShootingStarRenderer {
|
||||
public void renderShootingStars(ClientWorld world, MatrixStack matrices) {
|
||||
if (world != null && CelestriaConfig.enableShootingStars && !CelestriaClient.shootingStars.isEmpty()) {
|
||||
world.getProfiler().swap("shooting_stars");
|
||||
RenderSystem.defaultBlendFunc();
|
||||
RenderSystem.enableDepthTest();
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.setShader(GameRenderer::getPositionTexColorProgram);
|
||||
CelestriaClient.shootingStars.forEach(star -> renderShootingStar(world, matrices, star));
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableDepthTest();
|
||||
}
|
||||
}
|
||||
@SuppressWarnings("SuspiciousNameCombination")
|
||||
private void renderShootingStar(ClientWorld world, MatrixStack matrices, ShootingStar star) {
|
||||
if (world != null && CelestriaConfig.enableShootingStars && !CelestriaClient.shootingStars.isEmpty()) {
|
||||
world.getProfiler().swap("shooting_stars");
|
||||
float alpha = (float) Math.clamp((star.progress - pow(1f / star.progress, 4)) / CelestriaConfig.shootingStarPathLength, 0, 1);
|
||||
matrices.push();
|
||||
matrices.scale(CelestriaConfig.shootingStarDistance,CelestriaConfig.shootingStarDistance,CelestriaConfig.shootingStarDistance);
|
||||
int direction = isEven(star.type) ? -1 : 1;
|
||||
matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(star.y));
|
||||
matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(star.rotation * direction));
|
||||
matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(star.x+(star.progress*CelestriaConfig.shootingStarSpeed*0.05f)));
|
||||
matrices.translate(star.progress * CelestriaConfig.shootingStarSpeed * direction, 0, 0);
|
||||
Matrix4f matrix4f = matrices.peek().getPositionMatrix();
|
||||
RenderSystem.setShaderTexture(0, id("textures/environment/shooting_star"+(star.type+1)+".png"));
|
||||
BufferBuilder bufferBuilder = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR);
|
||||
float height = star.size / 100f * 20.0F;
|
||||
float width = star.size / 100f * 100.0F;
|
||||
bufferBuilder.vertex(matrix4f, -height, -width, height).texture(0.0F, 0.0F).color(1, 1, 1, alpha);
|
||||
bufferBuilder.vertex(matrix4f, height, -width, height).texture(1.0F, 0.0F).color(1, 1, 1, alpha);
|
||||
bufferBuilder.vertex(matrix4f, height, -width, -height).texture(1.0F, 1.0F).color(1, 1, 1, alpha);
|
||||
bufferBuilder.vertex(matrix4f, -height, -width, -height).texture(0.0F, 1.0F).color(1, 1, 1, alpha);
|
||||
BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
|
||||
matrices.pop();
|
||||
}
|
||||
}
|
||||
public static boolean isEven(int i) {
|
||||
return (i | 1) > i;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package eu.midnightdust.celestria.render;
|
||||
|
||||
import eu.midnightdust.celestria.CelestriaClient;
|
||||
import eu.midnightdust.celestria.ShootingStar;
|
||||
import eu.midnightdust.celestria.config.CelestriaConfig;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.render.*;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.math.RotationAxis;
|
||||
import net.minecraft.util.profiler.Profilers;
|
||||
import org.joml.Matrix4f;
|
||||
|
||||
import static eu.midnightdust.celestria.Celestria.id;
|
||||
import static java.lang.Math.pow;
|
||||
|
||||
public class ShootingStarRendering {
|
||||
public void renderShootingStars(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers) {
|
||||
if (MinecraftClient.getInstance().world == null) return;
|
||||
Profilers.get().swap("shooting_stars");
|
||||
CelestriaClient.shootingStars.forEach(star -> renderShootingStar(matrices, vertexConsumers, star));
|
||||
}
|
||||
|
||||
@SuppressWarnings("SuspiciousNameCombination")
|
||||
private void renderShootingStar(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers, ShootingStar star) {
|
||||
if (MinecraftClient.getInstance().world != null && CelestriaConfig.enableShootingStars && !CelestriaClient.shootingStars.isEmpty()) {
|
||||
matrices.push();
|
||||
float alpha = (float) Math.clamp((star.progress - pow(1f / star.progress, 4)) / CelestriaConfig.shootingStarPathLength, 0, 1);
|
||||
matrices.scale(CelestriaConfig.shootingStarDistance, CelestriaConfig.shootingStarDistance, CelestriaConfig.shootingStarDistance);
|
||||
int direction = isEven(star.type) ? -1 : 1;
|
||||
matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(-star.y));
|
||||
matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(-star.rotation * direction));
|
||||
matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-star.x - (star.progress * CelestriaConfig.shootingStarSpeed * 0.05f)));
|
||||
matrices.translate(star.progress * CelestriaConfig.shootingStarSpeed * direction, 0, 0);
|
||||
Matrix4f posMat4f = matrices.peek().getPositionMatrix();
|
||||
// draw the star
|
||||
float height = star.size / 100f * 20.0F;
|
||||
float width = star.size / 100f * 100.0F;
|
||||
VertexConsumer vertexconsumer = vertexConsumers.getBuffer(RenderLayer.getCelestial(id("textures/environment/shooting_star" + (star.type + 1) + ".png")));
|
||||
vertexconsumer.vertex(posMat4f, -height, -width, height).texture(0.0F, star.getPhase()).color(1.0F, 1.0F, 1.0F, alpha);
|
||||
vertexconsumer.vertex(posMat4f, height, -width, height).texture(1.0F, star.getPhase()).color(1.0F, 1.0F, 1.0F, alpha);
|
||||
vertexconsumer.vertex(posMat4f, height, -width, -height).texture(1.0F, star.getPhase() + 0.25F).color(1.0F, 1.0F, 1.0F, alpha);
|
||||
vertexconsumer.vertex(posMat4f, -height, -width, -height).texture(0.0F, star.getPhase() + 0.25F).color(1.0F, 1.0F, 1.0F, alpha);
|
||||
matrices.pop();
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isEven(int i) {
|
||||
return (i | 1) > i;
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,7 @@
|
||||
"celestria.midnightconfig.shootingStarChance": "Chance",
|
||||
"celestria.midnightconfig.shootingStarLuckDuration": "Luck Duration",
|
||||
"celestria.midnightconfig.shootingStarMessages": "Messages",
|
||||
"celestria.midnightconfig.shootingStarPhaseCycle": "Phase Cycle Duration (in ticks)",
|
||||
"celestria.midnightconfig.enableInsomnia": "Enable Insomnia",
|
||||
"celestria.midnightconfig.insomniaChance": "Chance",
|
||||
"celestria.midnightconfig.insomniaMessages": "Messages",
|
||||
|
||||
@@ -1,19 +1,27 @@
|
||||
{
|
||||
"celestria.midnightconfig.title": "Настройки Celestria",
|
||||
"celestria.midnightconfig.sendChatMessages": "Отправлять Сообщения в Чате о Событиях",
|
||||
"celestria.midnightconfig.enableShootingStars": "Включить Падающие Звёзды",
|
||||
"celestria.midnightconfig.shootingStarChance": "Шанс Падающей Звезды",
|
||||
"celestria.midnightconfig.shootingStarCooldownLength": "Длительность Отката Падающей Звезды",
|
||||
"celestria.midnightconfig.shootingStarLuckDuration": "Длительность Эффекта Удачи от Падающей Звезды",
|
||||
"celestria.midnightconfig.shootingStarMessages": "Сообщение о Падающей Звезде",
|
||||
"celestria.insomnia.1": "§cТы боишься полнолуния, поэтому не можешь найти себе покоя...",
|
||||
"celestria.insomnia.2": "§3Ауууууууу... Ты слышишь странные звуки издалека и не можешь закрыть глаза",
|
||||
"celestria.midnightconfig.category.insomnia": "Insomnia",
|
||||
"celestria.midnightconfig.category.stars": "Падающие звезды",
|
||||
"celestria.midnightconfig.enableInsomnia": "Включить Бессонницу",
|
||||
"celestria.midnightconfig.enableShootingStars": "Включить Падающие Звёзды",
|
||||
"celestria.midnightconfig.insomniaChance": "Шанс Бессонницы",
|
||||
"celestria.midnightconfig.insomniaMessages": "Сообщение при Бессоннице",
|
||||
"celestria.midnightconfig.insomniaDuration": "Длительность Эффекта Бессонницы",
|
||||
"celestria.midnightconfig.insomniaMessages": "Сообщение при Бессоннице",
|
||||
"celestria.midnightconfig.sendChatMessages": "Отправлять Сообщения в Чате о Событиях",
|
||||
"celestria.midnightconfig.shootingStarChance": "Шанс Падающей Звезды",
|
||||
"celestria.midnightconfig.shootingStarDistance": "Расстояние",
|
||||
"celestria.midnightconfig.shootingStarDistance.tooltip": "Регулировка расстояния может улучшить поддержку шейдеров",
|
||||
"celestria.midnightconfig.shootingStarLuckDuration": "Длительность Эффекта Удачи от Падающей Звезды",
|
||||
"celestria.midnightconfig.shootingStarMaxSize": "Max Size",
|
||||
"celestria.midnightconfig.shootingStarMessages": "Сообщение о Падающей Звезде",
|
||||
"celestria.midnightconfig.shootingStarMinSize": "Min Size",
|
||||
"celestria.midnightconfig.shootingStarPathLength": "Path Length",
|
||||
"celestria.midnightconfig.shootingStarPhaseCycle": "Phase Cycle Duration (in ticks)",
|
||||
"celestria.midnightconfig.shootingStarSpeed": "Скорость",
|
||||
"celestria.midnightconfig.title": "Настройки Celestria",
|
||||
"celestria.shootingStar.1": "§eО, гляди! Появилась падающая звезда и благословила тебя удачей!",
|
||||
"celestria.shootingStar.2": "§6Вау, появилась падающая звезда, загадай желание!",
|
||||
"celestria.shootingStar.3": "§2♪ Можем ли мы представить, что самолеты в ночном небе походят на падающие звезды...... ♫",
|
||||
"celestria.insomnia.1": "§cТы боишься полнолуния, поэтому не можешь найти себе покоя...",
|
||||
"celestria.insomnia.2": "§3Ауууууууу... Ты слышишь странные звуки издалека и не можешь закрыть глаза",
|
||||
"effect.celestria.insomnia": "Бессонница"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 2.0 KiB |
@@ -3,7 +3,7 @@
|
||||
"package": "eu.midnightdust.celestria.mixin",
|
||||
"compatibilityLevel": "JAVA_17",
|
||||
"client": [
|
||||
"MixinWorldRenderer"
|
||||
"MixinSkyRendering"
|
||||
],
|
||||
"mixins": [
|
||||
"MixinBedBlock"
|
||||
|
||||
Reference in New Issue
Block a user