acethewildfire/acesbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixes 2.0.2

Browse Source
This commit is contained in:
Vos
2026-03-16 01:49:33 -05:00
parent db836f943f
commit 3b43a7175e
7 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES
+1 -7
View File
@@ -1,14 +1,8 @@
Command Core textures broken
Command Core Broken
Bricked Up does not do anything
Wildfire Particles missing
Particles not on server???
Fren is broken
Combustible LEmon will not render
Pauldron does not skeleton sounds
Crafting for the Plate Cariier, Beserkers Pauldron, Wildfire boots
src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java
+26 -9
View File
@@ -1,5 +1,6 @@
package com.acethewildfire.acesbs.effect;
import com.acethewildfire.acesbs.AcesBS;
import com.acethewildfire.acesbs.sounds.ModSounds;
import net.minecraft.entity.Flutterer;
import net.minecraft.entity.LivingEntity;
@@ -7,6 +8,7 @@ import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectCategory;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
@@ -18,21 +20,35 @@ public class BrickedUpEffect extends StatusEffect {
@Override
public boolean applyUpdateEffect(ServerWorld world, LivingEntity entity, int amplifier) {
int durationLeft = entity.getStatusEffect(ModEffects.BRICKED_UP).getDuration();
var effect = entity.getStatusEffect(ModEffects.BRICKED_UP);
if (effect == null) return false;
int durationLeft = effect.getDuration();
int idealLen = 160;
if(durationLeft > idealLen - 1){
world.playSound(entity, entity.getBlockPos(), ModSounds.BRICKED_UP, SoundCategory.PLAYERS, 2f, 1f);
if(durationLeft >= idealLen - 1){
if (!world.isClient()){
world.playSound(
null,
entity.getBlockPos(),
ModSounds.BRICKED_UP,
SoundCategory.PLAYERS,
2.0f,
1.0f
);
}
}
else if(durationLeft > idealLen - 120){
float p = world.getBlockState(entity.getBlockPos()).getBlock().getSlipperiness();
Vec3d vel = entity.getVelocity();
float p = entity.getEntityWorld().getBlockState(entity.getBlockPos()).getBlock().getSlipperiness();
float f = entity.isOnGround() ? p * 0.91F : 0.91F;
entity.travel(entity.getMovement());
Vec3d vec3d6 = entity.getVelocity();
double q = vec3d6.y;
q += (0.05 * 7.75 - vec3d6.y) * 0.2;
q += (0.05 * 10 - vec3d6.y) * 0.2;
entity.setVelocity(vec3d6.x * (double)f, this instanceof Flutterer ? q * (double)f : q * 0.9800000190734863, vec3d6.z * (double)f);
// entity.setVelocity(vel.x, vel.y + 0.08, vel.z);
entity.velocityModified = true;
}
// else if (durationLeft < idealLen - 80 && durationLeft > idealLen - 120) {
//
@@ -51,14 +67,15 @@ public class BrickedUpEffect extends StatusEffect {
// world.playSound(entity, entity.getBlockPos(), ModSounds.FART, SoundCategory.PLAYERS, 5f, 1f);
// }
else {
float p = world.getBlockState(entity.getBlockPos()).getBlock().getSlipperiness();
float p = entity.getEntityWorld().getBlockState(entity.getBlockPos()).getBlock().getSlipperiness();
float f = entity.isOnGround() ? p * 0.91F : 0.91F;
entity.travel(entity.getMovement());
Vec3d vec3d6 = entity.getVelocity();;
Vec3d vec3d6 = entity.getVelocity();
double q = vec3d6.y;
q += (0.05 * 250 - vec3d6.y) * 0.2;
entity.setVelocity(vec3d6.x * (double)f, this instanceof Flutterer ? q * (double)f : q * 0.9800000190734863, vec3d6.z * (double)f);
// entity.setVelocity(vel.x, vel.y + 2, vel.z);
entity.velocityModified = true;
}
src/main/java/com/acethewildfire/acesbs/item/custom/AquariumGravel.java
+14
View File
@@ -42,6 +42,20 @@ public class AquariumGravel extends Item {
@Override
public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) {
super.usageTick(world, user, stack, remainingUseTicks);
if (remainingUseTicks % 10 == 0){
world.playSound(
null,
user.getX(),
user.getY(),
user.getZ(),
ModSounds.CRUNCH,
SoundCategory.PLAYERS,
1.0F,
1.0F
);
}
}
@Override
src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteFunny.java
+4 -6
View File
@@ -131,12 +131,10 @@ public class CigaretteFunny extends Item {
double vz = look.z * speed + (world.random.nextDouble() - 0.5) * 0.3;
world.addParticleClient(
ParticleTypes.CAMPFIRE_COSY_SMOKE,
user.getX() + look.x * 0.3,
user.getEyeY() - 0.15,
user.getZ() + look.z * 0.3,
0.15, 0.1, 0.15
);
ParticleTypes.CAMPFIRE_COSY_SMOKE,
x, y, z,
vx, vy, vz
);
}
}
}
src/main/java/com/acethewildfire/acesbs/item/custom/WildfireArmorItem.java
+9 -7
View File
@@ -1,5 +1,6 @@
package com.acethewildfire.acesbs.item.custom;
import com.acethewildfire.acesbs.AcesBS;
import com.acethewildfire.acesbs.item.ModItems;
import com.acethewildfire.acesbs.particle.ModParticles;
import net.minecraft.entity.Entity;
@@ -32,7 +33,7 @@ public class WildfireArmorItem extends Item {
public void inventoryTick(ItemStack stack, ServerWorld world, Entity entity, @Nullable EquipmentSlot slot) {
if(!world.isClient()) {
if(entity instanceof PlayerEntity player) {
ItemStack bootsStack = player.getInventory().getStack(EquipmentSlot.FEET.getIndex());
ItemStack bootsStack = player.getEquippedStack(EquipmentSlot.FEET);
if (!bootsStack.isEmpty() && bootsStack.getItem() == ModItems.WILDFIRE_BOOTS){
double x = player.getX();
double y = player.getY(); // feet level
@@ -79,12 +80,13 @@ public class WildfireArmorItem extends Item {
};
} else {
packet = new ParticleS2CPacket(
ParticleTypes.FLAME,
true, false,
(float) x, (float) y + 0.2f, (float) z,
0.2f, 0f, 0.2f,
0.01f,
1
ParticleTypes.FLAME,
true,
false,
x, y + 0.2, z,
0.2f, 0f, 0.2f,
0.01f,
1
);
}
src/main/java/com/acethewildfire/acesbs/mixin/PlayerEntityMixin.java
+4 -7
View File
@@ -34,19 +34,16 @@ public abstract class PlayerEntityMixin{
@Inject(method = "damage", at = @At(value = "TAIL"), locals = LocalCapture.CAPTURE_FAILSOFT, cancellable = true)
private void damageMixin(ServerWorld world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
Item chestplate = this.inventory.player.getInventory().getStack(EquipmentSlot.CHEST.getIndex()).getItem();
if (chestplate == ModItems.BERSERKERS_PAULDRON && Objects.equals(this.getName().getLiteralString(), "Tennocraft12")){
PlayerEntity player = (PlayerEntity) (Object) this;
PlayerEntity player = (PlayerEntity)(Object)this;
ItemStack chest = player.getEquippedStack(EquipmentSlot.CHEST);
if (!chest.isEmpty() && chest.getItem() == ModItems.BERSERKERS_PAULDRON && Objects.equals(this.getName().getLiteralString(), "Tennocraft12")){
if (!world.isClient()) {
world.playSound(null, player.getX(),player.getY(), player.getZ(), SoundEvents.ENTITY_SKELETON_HURT, SoundCategory.PLAYERS, 2f, 1f);
}
cir.setReturnValue(true);
}
PlayerEntity player = (PlayerEntity)(Object)this;
ItemStack chest = player.getEquippedStack(EquipmentSlot.CHEST);
if (chest.getItem() instanceof SovsPlateCarrierArmorItem) {
int durabilityDamage = 1;