Skip to content

Commit

Permalink
chore: rename corrosive acid projectile to acid spit
Browse files Browse the repository at this point in the history
  • Loading branch information
Elenterius committed Jul 30, 2024
1 parent fbb90a1 commit 13df4a1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.elenterius.biomancy.client.render.entity.projectile;

import com.github.elenterius.biomancy.entity.projectile.CorrosiveAcidProjectile;
import com.github.elenterius.biomancy.entity.projectile.AcidSpitProjectile;
import com.github.elenterius.biomancy.init.ModMobEffects;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
Expand All @@ -13,18 +13,18 @@
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;

public class AcidProjectileRenderer extends EntityRenderer<CorrosiveAcidProjectile> {
public class AcidProjectileRenderer extends EntityRenderer<AcidSpitProjectile> {

private static final ResourceLocation TEXTURE = new ResourceLocation("textures/entity/llama/spit.png");
private final LlamaSpitModel<CorrosiveAcidProjectile> model;
private final LlamaSpitModel<AcidSpitProjectile> model;

public AcidProjectileRenderer(EntityRendererProvider.Context context) {
super(context);
model = new LlamaSpitModel<>(context.bakeLayer(ModelLayers.LLAMA_SPIT));
}

@Override
public void render(CorrosiveAcidProjectile entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource buffer, int packedLight) {
public void render(AcidSpitProjectile entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource buffer, int packedLight) {
poseStack.pushPose();

poseStack.translate(0, 0.15f, 0);
Expand All @@ -43,7 +43,7 @@ public void render(CorrosiveAcidProjectile entity, float entityYaw, float partia
}

@Override
public ResourceLocation getTextureLocation(CorrosiveAcidProjectile entity) {
public ResourceLocation getTextureLocation(AcidSpitProjectile entity) {
return TEXTURE;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import software.bernie.geckolib.core.animation.AnimatableManager;
import software.bernie.geckolib.util.GeckoLibUtil;

public class AcidBlobProjectile extends CorrosiveAcidProjectile implements GeoEntity {
public class AcidBlobProjectile extends AcidSpitProjectile implements GeoEntity {

protected final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
protected boolean canPlaceAcidFluid = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;

public class CorrosiveAcidProjectile extends BaseProjectile {
public class AcidSpitProjectile extends BaseProjectile {

public CorrosiveAcidProjectile(EntityType<? extends BaseProjectile> entityType, Level level) {
public AcidSpitProjectile(EntityType<? extends BaseProjectile> entityType, Level level) {
super(entityType, level);
}

public CorrosiveAcidProjectile(Level level, double x, double y, double z) {
public AcidSpitProjectile(Level level, double x, double y, double z) {
super(ModEntityTypes.CORROSIVE_ACID_PROJECTILE.get(), level, x, y, z);
}

public CorrosiveAcidProjectile(EntityType<? extends CorrosiveAcidProjectile> entityType, Level level, double x, double y, double z) {
public AcidSpitProjectile(EntityType<? extends AcidSpitProjectile> entityType, Level level, double x, double y, double z) {
super(entityType, level, x, y, z);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public final class ModEntityTypes {

//Projectiles
public static final RegistryObject<EntityType<ToothProjectile>> TOOTH_PROJECTILE = registerProjectile("tooth_projectile", ToothProjectile::new, builder -> builder.sized(0.25f, 0.25f));
public static final RegistryObject<EntityType<CorrosiveAcidProjectile>> CORROSIVE_ACID_PROJECTILE = registerProjectile("corrosive_acid_projectile", CorrosiveAcidProjectile::new, builder -> builder.sized(0.25f, 0.25f));
public static final RegistryObject<EntityType<AcidSpitProjectile>> CORROSIVE_ACID_PROJECTILE = registerProjectile("corrosive_acid_projectile", AcidSpitProjectile::new, builder -> builder.sized(0.25f, 0.25f));
public static final RegistryObject<EntityType<BloomberryProjectile>> BLOOMBERRY_PROJECTILE = registerProjectile("bloomberry_projectile", BloomberryProjectile::new, builder -> builder.sized(8f / 16f, 8f / 16f));
public static final RegistryObject<EntityType<AcidBlobProjectile>> ACID_BLOB_PROJECTILE = registerProjectile("acid_blob_projectile", AcidBlobProjectile::new, builder -> builder.sized(6f / 16f, 6f / 16f));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public final class ModProjectiles {
public static final ConfiguredProjectile<AcidBlobProjectile> ACID_BLOB = build("Acid Blob", 1.2f, 2, 0, convertToInaccuracy(0.9f), SoundEvents.SLIME_JUMP_SMALL, (level, x, y, z) -> new AcidBlobProjectile(level, x, y, z, false));
public static final ConfiguredProjectile<AcidBlobProjectile> FALLING_ACID_BLOB = build("Falling Acid Blob", 0.1f, 2, 0, convertToInaccuracy(0.9f), SoundEvents.SLIME_SQUISH_SMALL, AcidBlobProjectile::new);
public static final ConfiguredProjectile<BloomberryProjectile> BLOOMBERRY = build("Bloomberry", 1.25f, 2, 0, convertToInaccuracy(0.9f), BloomberryProjectile::new);
public static final ConfiguredProjectile<CorrosiveAcidProjectile> GASTRIC_SPIT = build("Gastric Spit", 1.5f, 1, 0, 0.25f, SoundEvents.LLAMA_SPIT, CorrosiveAcidProjectile::new);
public static final ConfiguredProjectile<AcidSpitProjectile> GASTRIC_SPIT = build("Gastric Spit", 1.5f, 1, 0, 0.25f, SoundEvents.LLAMA_SPIT, AcidSpitProjectile::new);

private static float convertToInaccuracy(float accuracy) {
return -Gun.MAX_INACCURACY * accuracy + Gun.MAX_INACCURACY;
Expand Down

0 comments on commit 13df4a1

Please sign in to comment.