Skip to content

Commit

Permalink
FEX-M3 nerve gas grenade
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeltaHelios
DeltaHelios committed Jan 19, 2025
1 parent b6c5e4e commit 79a461b
Show file tree
Hide file tree
Showing 13 changed files with 346 additions and 136 deletions.
5 changes: 4 additions & 1 deletion projects/pswg_gadgets/src/client/java/dev/pswg/GadgetsClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import dev.pswg.api.GalaxiesClientAddon;
import dev.pswg.particles.*;
import dev.pswg.renderer.FragmentationGrenadeEntityRenderer;
import dev.pswg.renderer.NerveGasGrenadeEntityRenderer;
import dev.pswg.renderer.ThermalDetonatorEntityRenderer;
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
Expand All @@ -20,12 +21,14 @@ public void onGalaxiesClientReady()
EntityModelLayerRegistry.registerModelLayer(ThermalDetonatorEntityRenderer.MODEL_LAYER, ThermalDetonatorEntityRenderer.Model::getTexturedModelData);
EntityRendererRegistry.register(Gadgets.FRAGMENTATION_GRENADE_ENTITY, FragmentationGrenadeEntityRenderer::new);
EntityModelLayerRegistry.registerModelLayer(FragmentationGrenadeEntityRenderer.MODEL_LAYER, FragmentationGrenadeEntityRenderer.Model::getTexturedModelData);
EntityRendererRegistry.register(Gadgets.NERVE_GAS_GRENADE_ENTITY, NerveGasGrenadeEntityRenderer::new);
EntityModelLayerRegistry.registerModelLayer(NerveGasGrenadeEntityRenderer.MODEL_LAYER, NerveGasGrenadeEntityRenderer.Model::getTexturedModelData);

ParticleFactoryRegistry.getInstance().register(Gadgets.EXPLOSION_SMOKE_PARTICLE, ExplosionSmokeParticle.Factory::new);
ParticleFactoryRegistry.getInstance().register(Gadgets.FRAGMENTATION_GRENADE_SPARK_PARTICLE, FragmentationGrenadeSparkParticle.Factory::new);
ParticleFactoryRegistry.getInstance().register(Gadgets.FRAGMENTATION_GRENADE_WAVE_PARTICLE, FragmentationGrenadeWaveParticle.Factory::new);
ParticleFactoryRegistry.getInstance().register(Gadgets.SMOKE_PARTICLE, SmokeParticle.Factory::new);
ParticleFactoryRegistry.getInstance().register(Gadgets.NEURAL_GAS_PARTICLE, NeuralGasParticle.Factory::new);
ParticleFactoryRegistry.getInstance().register(Gadgets.NERVE_GAS_PARTICLE, NerveGasParticle.Factory::new);

Gadgets.LOGGER.info("Client module initialized");
}
Expand Down
163 changes: 163 additions & 0 deletions projects/pswg_gadgets/src/client/java/dev/pswg/particles/NerveGasParticle.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
package dev.pswg.particles;

import dev.pswg.PswgGadgetsRenderLayers;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.particle.*;
import net.minecraft.client.render.*;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.particle.SimpleParticleType;
import net.minecraft.text.Text;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import org.jetbrains.annotations.Nullable;
import org.joml.Quaternionf;
import org.joml.Vector3f;

@Environment(value = EnvType.CLIENT)
public class NerveGasParticle extends SpriteBillboardParticle
{
private final int variant;
final int NUM_VARIANTS = 5;
final float shrinkSpeed;
final float growthSpeed;
final int dirX;
final int dirZ;
final float billowing;

protected NerveGasParticle(ClientWorld clientWorld, double x, double y, double z, double vX, double vY, double vZ, SpriteProvider spriteProvider)
{
super(clientWorld, x, y, z);
scale(8f);

setBoundingBoxSpacing(0f, 0f);
this.setAlpha(0.05f);
shrinkSpeed = (float)random.nextBetween(1, 10) / 2000f;
growthSpeed = (float)random.nextBetween(1, 10) / 100f;
billowing = (float)random.nextBetween(1, 10) / 25000f;
variant = random.nextInt(NUM_VARIANTS);
dirX = random.nextBoolean() ? 1 : -1;
dirZ = random.nextBoolean() ? 1 : -1;
velocityX = random.nextFloat() / 8f * dirX;
velocityZ = random.nextFloat() / 8f * dirZ;
age = 0;
this.setColor(1f, 0.9f, 0.6f);
}

@Override
public void render(VertexConsumer vertexConsumer, Camera camera, float tickDelta)
{
var texture = this.sprite.getAtlasId();
var mc = MinecraftClient.getInstance();
var v = mc.getBufferBuilders().getEffectVertexConsumers().getBuffer(PswgGadgetsRenderLayers.pswgParticle(texture, true));

Vec3d vec3d = camera.getPos();
float f = (float)(MathHelper.lerp((double)tickDelta, this.prevPosX, this.x) - vec3d.getX());
float g = (float)(MathHelper.lerp((double)tickDelta, this.prevPosY, this.y) - vec3d.getY());
float h = (float)(MathHelper.lerp((double)tickDelta, this.prevPosZ, this.z) - vec3d.getZ());
Vector3f[] corners = new Vector3f[] {
new Vector3f(-1.0F, -1.0F, 0.0F), new Vector3f(-1.0F, 1.0F, 0.0F), new Vector3f(1.0F, 1.0F, 0.0F), new Vector3f(1.0F, -1.0F, 0.0F)
};
float size = this.getSize(tickDelta);

for (int j = 0; j < 4; ++j)
{
Vector3f vector3f = corners[j];
vector3f.rotate(camera.getRotation().rotateZ((float)Math.toRadians((float)age * billowing)));
vector3f.mul(size);
vector3f.add(f, g, h);
}

float k = this.getMinU();
float l = this.getMaxU();
float m = this.getMinV();
float n = this.getMaxV();
int o = this.getBrightness(tickDelta);
v.vertex(corners[0].x(), corners[0].y(), corners[0].z())
.texture(l, n)
.color(this.red, this.green, this.blue, this.alpha)
.light(o);
v.vertex(corners[1].x(), corners[1].y(), corners[1].z())
.texture(l, m)
.color(this.red, this.green, this.blue, this.alpha)
.light(o);
v.vertex(corners[2].x(), corners[2].y(), corners[2].z())
.texture(k, m)
.color(this.red, this.green, this.blue, this.alpha)
.light(o);
v.vertex(corners[3].x(), corners[3].y(), corners[3].z())
.texture(k, n)
.color(this.red, this.green, this.blue, this.alpha)
.light(o);
//super.render(v, camera, tickDelta);
}

@Override
public void tick()
{

prevPosX = x;
prevPosY = y;
prevPosZ = z;
age++;
if (alpha <= 0.0f)
{
markDead();
return;
}
if (age <= 100)
{
if (alpha <= 0.9f)
alpha += 0.025f;
if (scale <= 2)
scale += growthSpeed;
}
if (age >= 300)
{
alpha -= 0.00125f;
}
if (age >= 550)
{
scale -= shrinkSpeed;

}
if (age == 600)
{
velocityX = random.nextFloat() / 128f * dirX;
velocityZ = random.nextFloat() / 128f * dirZ;
}
if (age <= 500)
{
velocityX *= 0.95;
velocityZ *= 0.95;
}
move(velocityX, velocityY, velocityZ);
}

@Override
public ParticleTextureSheet getType()
{
return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT;
}

@Environment(value = EnvType.CLIENT)
public static class Factory implements ParticleFactory<SimpleParticleType>
{
private final SpriteProvider spriteProvider;

public Factory(SpriteProvider spriteProvider)
{
this.spriteProvider = spriteProvider;
}

@Nullable
@Override
public Particle createParticle(SimpleParticleType parameters, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ)
{
NerveGasParticle nerveGasParticle = new NerveGasParticle(world, x, y, z, velocityX, velocityY, velocityZ, spriteProvider);
nerveGasParticle.setSprite(spriteProvider);
return nerveGasParticle;
}
}
}
90 changes: 0 additions & 90 deletions projects/pswg_gadgets/src/client/java/dev/pswg/particles/NeuralGasParticle.java
View file

This file was deleted.

82 changes: 82 additions & 0 deletions projects/pswg_gadgets/src/client/java/dev/pswg/renderer/NerveGasGrenadeEntityRenderer.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package dev.pswg.renderer;

import dev.pswg.Gadgets;
import dev.pswg.entity.FragmentationGrenadeEntity;
import dev.pswg.entity.NerveGasGrenadeEntity;
import net.minecraft.client.model.*;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderer;
import net.minecraft.client.render.entity.EntityRendererFactory;
import net.minecraft.client.render.entity.model.EntityModel;
import net.minecraft.client.render.entity.model.EntityModelLayer;
import net.minecraft.client.render.entity.state.EntityRenderState;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.RotationAxis;

public class NerveGasGrenadeEntityRenderer extends EntityRenderer<NerveGasGrenadeEntity, NerveGasGrenadeEntityRenderer.State>
{
public static class Model extends EntityModel<State>
{
public Model(ModelPart modelPart)
{
super(modelPart, RenderLayer::getEntityCutout);
}

public static TexturedModelData getTexturedModelData()
{
ModelData modelData = new ModelData();
ModelPartData modelPartData = modelData.getRoot();
modelPartData.addChild("body", ModelPartBuilder.create().uv(0, 0).cuboid(-1.5F, -3F, -1.5F, 3F, 3F, 3F), ModelTransform.of(0F, 0F, 0F, 0, 0, (float)Math.toRadians(180)));
modelPartData.addChild("trigger", ModelPartBuilder.create().uv(0, 6).cuboid(-0.5F, -3.5F, -0.75F, 1F, 1F, 2F), ModelTransform.of(0F, 0F, 0F, 0, 0, (float)Math.toRadians(180)));
return TexturedModelData.of(modelData, 16, 16);
}
}

public static final EntityModelLayer MODEL_LAYER = new EntityModelLayer(Gadgets.id("nerve_gas_grenade"), "temp");
public static final Identifier TEXTURE = Identifier.of("pswg_gadgets", "textures/items/thermal_detonator.png");
private final Model model;

public NerveGasGrenadeEntityRenderer(EntityRendererFactory.Context context)
{
super(context);
this.model = new Model(context.getPart(MODEL_LAYER));
}

@Override
public void render(State state, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light)
{
matrixStack.push();
VertexConsumer vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getEntityCutout(TEXTURE));

matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(-state.yaw));

this.model.setAngles(state);
this.model.render(matrixStack, vertexConsumer, light, OverlayTexture.DEFAULT_UV);
matrixStack.pop();
super.render(state, matrixStack, vertexConsumerProvider, light);
}

@Override
public State createRenderState()
{
return new State();
}

@Override
public void updateRenderState(NerveGasGrenadeEntity entity, State state, float tickDelta)
{
super.updateRenderState(entity, state, tickDelta);
state.pitch = entity.getLerpedPitch(tickDelta);
state.yaw = entity.getClientYaw();
}

public static class State extends EntityRenderState
{
public float pitch;
public float yaw;
}
}
Loading

0 comments on commit 79a461b

Please sign in to comment.