Skip to content

[26.1] Refactor IFallingFruit and fix bonk translation #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ninjaguardian wants to merge 1 commit into
base: 26.1
Choose a base branch
from
Open

[26.1] Refactor IFallingFruit and fix bonk translation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions src/main/java/com/dtteam/dtaddon_lib/blocks/fruit/IFallingFruit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.dtteam.dtaddon_lib.blocks.fruit;

import com.dtteam.dtaddon_lib.init.DTAddonLibRegistries;
import com.google.common.collect.Lists;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundSource;
Expand All @@ -16,11 +15,8 @@
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.FallingBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public interface IFallingFruit {

Expand Down Expand Up @@ -56,31 +52,40 @@ default boolean doFall(BlockState state, Level world, BlockPos pos){
return false;
}

default FallingBlockEntity getFallingEntity (Level world, BlockPos pos, BlockState state){
return new FallingBlockEntity(world, (double)pos.getX() + 0.5D, pos.getY(), (double)pos.getZ() + 0.5D, state){
default FallingBlockEntity getFallingEntity(Level world, @NotNull BlockPos pos, BlockState state) {
return new FallingBlockEntity(world, (double)pos.getX() + 0.5D, pos.getY(), (double)pos.getZ() + 0.5D, state) {

@Override
public boolean causeFallDamage(double pFallDistance, float pMultiplier, DamageSource pSource) {
public boolean causeFallDamage(double pFallDistance, float pMultiplier, @NotNull DamageSource pSource) {
int i = (int)Math.ceil(pFallDistance - 1.0F);
if (i > 0) {
List<Entity> list = Lists.newArrayList(level().getEntities(this, this.getBoundingBox()));
for(Entity entity : list) {
if (entity instanceof LivingEntity){
entity.hurt(getDamageSource(level()),
(float)Math.min(Math.floor((float)i * IFallingFruit.fallDamageAmount), IFallingFruit.fallDamageMax) * pMultiplier);
level().playSound(null, pos,
DTAddonLibRegistries.FRUIT_BONK.get(), SoundSource.BLOCKS,
1.0F, 1.0F);
}
if (i <= 0) {
return false;
}

//noinspection resource
if (!(level() instanceof ServerLevel serverLevel)) {
return false;
}

for (Entity entity : serverLevel.getEntities(this, this.getBoundingBox())) {
if (!(entity instanceof LivingEntity)) {
continue;
}

entity.hurtServer(serverLevel, getDamageSource(serverLevel),
(float)Math.min(Math.floor((float)i * IFallingFruit.fallDamageAmount), IFallingFruit.fallDamageMax) * pMultiplier);
serverLevel.playSound(null, getX(), getY(), getZ(),
DTAddonLibRegistries.FRUIT_BONK.get(), SoundSource.BLOCKS,
1.0F, 1.0F);
}

return false;
}

@Nullable
@Override
public ItemEntity spawnAtLocation(ServerLevel pLevel, @Nonnull ItemStack pStack, float pOffsetY) {
return super.spawnAtLocation(pLevel, getDropOnFallItems( this), pOffsetY);
public ItemEntity spawnAtLocation(@NotNull ServerLevel pLevel, @NotNull ItemStack pStack, float pOffsetY) {
return super.spawnAtLocation(pLevel, getDropOnFallItems(this), pOffsetY);
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/dtaddon_lib/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"subtitle.dtaddon_lib.falling_fruit.bonk": "Player bonked by fruit",
"subtitle.dtaddon_lib.falling_fruit.bonk": "Entity bonked by fruit",
"block.dtaddon_lib.large_rooty_water":"Large Water Roots",

"block.dtaddon_lib.big_oak_branch": "Big Oak Tree",
Expand Down