-
-
Notifications
You must be signed in to change notification settings - Fork 523
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Handle entity spawn placements via the deferred register, and make ba…
…by mobs copy all entity properties
- Loading branch information
1 parent
c4442fc
commit dea06c3
Showing
11 changed files
with
202 additions
and
307 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 9 additions & 45 deletions
54
src/additions/java/mekanism/additions/common/entity/baby/EntityBabyCreeper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 9 additions & 51 deletions
60
src/additions/java/mekanism/additions/common/entity/baby/EntityBabyEnderman.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,28 @@ | ||
| package mekanism.additions.common.entity.baby; | ||
|
|
||
| import net.minecraft.network.syncher.EntityDataAccessor; | ||
| import net.minecraft.network.syncher.EntityDataSerializers; | ||
| import net.minecraft.network.syncher.SynchedEntityData; | ||
| import net.minecraft.world.entity.EntityDimensions; | ||
| import mekanism.additions.common.registries.AdditionsEntityTypes; | ||
| import net.minecraft.world.entity.EntityType; | ||
| import net.minecraft.world.entity.Pose; | ||
| import net.minecraft.world.entity.monster.EnderMan; | ||
| import net.minecraft.world.level.Level; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class EntityBabyEnderman extends EnderMan implements IBabyEntity { | ||
|
|
||
| private static final EntityDataAccessor<Boolean> IS_CHILD = SynchedEntityData.defineId(EntityBabyEnderman.class, EntityDataSerializers.BOOLEAN); | ||
| private static final EntityDimensions BABY_DIMENSIONS = EntityType.ENDERMAN.getDimensions().scale(0.5F).withEyeHeight(1.3F); | ||
| public class EntityBabyEnderman extends EnderMan { | ||
|
|
||
| public EntityBabyEnderman(EntityType<EntityBabyEnderman> type, Level world) { | ||
| super(type, world); | ||
| setBaby(true); | ||
| } | ||
|
|
||
| @Override | ||
| protected void defineSynchedData(@NotNull SynchedEntityData.Builder builder) { | ||
| super.defineSynchedData(builder); | ||
| builder.define(IS_CHILD, true); | ||
| AdditionsEntityTypes.setupBabyModifiers(this); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isBaby() { | ||
| return getEntityData().get(IS_CHILD); | ||
| } | ||
|
|
||
| @Override | ||
| public void setBaby(boolean child) { | ||
| setChild(IS_CHILD, child); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSyncedDataUpdated(@NotNull EntityDataAccessor<?> key) { | ||
| if (IS_CHILD.equals(key)) { | ||
| refreshDimensions(); | ||
| } | ||
| super.onSyncedDataUpdated(key); | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public int getExperienceReward() { | ||
| if (isBaby()) { | ||
| int oldXp = xpReward; | ||
| xpReward = (int) (xpReward * 2.5F); | ||
| int reward = super.getExperienceReward(); | ||
| xpReward = oldXp; | ||
| return reward; | ||
| } | ||
| return super.getExperienceReward(); | ||
| } | ||
|
|
||
| //TODO - 1.20.5: Figure out what controls this now | ||
| /*@Override | ||
| public float ridingOffset(@NotNull Entity other) { | ||
| return -1.3F; | ||
| }*/ | ||
|
|
||
| @NotNull | ||
| @Override | ||
| public EntityDimensions getDefaultDimensions(@NotNull Pose pose) { | ||
| return this.isBaby() ? BABY_DIMENSIONS : super.getDefaultDimensions(pose); | ||
| int oldXp = xpReward; | ||
| xpReward = (int) (xpReward * 2.5F); | ||
| int reward = super.getExperienceReward(); | ||
| xpReward = oldXp; | ||
| return reward; | ||
| } | ||
| } |
53 changes: 8 additions & 45 deletions
53
src/additions/java/mekanism/additions/common/entity/baby/EntityBabySkeleton.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.