Skip to content

Commit e2f161f

Browse files
committed
Make robit's immune to fall damage (mekanism/Mekanism-Feature-Requests#667) and fix certain laser and radiation applying knockback (#8110)
1 parent e633b43 commit e2f161f

File tree

10 files changed

+51
-6
lines changed

10 files changed

+51
-6
lines changed

src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/damage_type/burns_armor_stands.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/damage_type/bypasses_resistance.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/damage_type/bypasses_shield.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/damage_type/no_knockback.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/damage_type/panic_causes.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/damage_type/panic_environmental_causes.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/entity_type/fall_damage_immune.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ private void addEntities() {
145145
addEntitiesToTag(EntityTypeTags.IGNORES_POISON_AND_REGEN, MekanismEntityTypes.ROBIT);
146146
addEntitiesToTag(EntityTypeTags.IMMUNE_TO_INFESTED, MekanismEntityTypes.ROBIT);
147147
addEntitiesToTag(EntityTypeTags.IMMUNE_TO_OOZING, MekanismEntityTypes.ROBIT);
148+
addEntitiesToTag(EntityTypeTags.FALL_DAMAGE_IMMUNE, MekanismEntityTypes.ROBIT);
148149
//Robit's are not scary, they are friends!
149150
addEntitiesToTag(EntityTypeTags.NOT_SCARY_FOR_PUFFERFISH, MekanismEntityTypes.ROBIT);
150151
addEntitiesToTag(EntityTypeTags.ILLAGER_FRIENDS, MekanismEntityTypes.ROBIT);
@@ -504,8 +505,14 @@ private void addBiomes() {
504505
private void addDamageTypes() {
505506
addToTag(Tags.DamageTypes.IS_ENVIRONMENT, MekanismDamageTypes.RADIATION);
506507
addToTag(DamageTypeTags.BYPASSES_ARMOR, MekanismDamageTypes.RADIATION);
508+
addToTag(DamageTypeTags.BYPASSES_RESISTANCE, MekanismDamageTypes.RADIATION);
509+
addToTag(DamageTypeTags.BYPASSES_SHIELD, MekanismDamageTypes.RADIATION);
507510
addToTag(DamageTypeTags.BYPASSES_WOLF_ARMOR, MekanismDamageTypes.RADIATION);
508511
addToTag(DamageTypeTags.BYPASSES_COOLDOWN, MekanismDamageTypes.LASER);
512+
addToTag(DamageTypeTags.BURNS_ARMOR_STANDS, MekanismDamageTypes.LASER);
513+
addToTag(DamageTypeTags.PANIC_CAUSES, MekanismDamageTypes.LASER);
514+
addToTag(DamageTypeTags.NO_KNOCKBACK, MekanismDamageTypes.LASER, MekanismDamageTypes.RADIATION);
515+
addToTag(DamageTypeTags.PANIC_ENVIRONMENTAL_CAUSES, MekanismDamageTypes.RADIATION);
509516
getDamageTypeBuilder(MekanismTags.DamageTypes.IS_PREVENTABLE_MAGIC).add(DamageTypes.MAGIC, DamageTypes.INDIRECT_MAGIC);
510517

511518
addToTag(MekanismTags.DamageTypes.MEKASUIT_ALWAYS_SUPPORTED, DamageTypes.FALLING_ANVIL, DamageTypes.CACTUS, DamageTypes.CRAMMING,

src/main/java/mekanism/common/entity/EntityRobit.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
import net.minecraft.server.level.ServerPlayer;
9999
import net.minecraft.server.level.TicketType;
100100
import net.minecraft.sounds.SoundEvents;
101-
import net.minecraft.tags.DamageTypeTags;
102101
import net.minecraft.world.InteractionHand;
103102
import net.minecraft.world.InteractionResult;
104103
import net.minecraft.world.MenuProvider;
@@ -536,10 +535,6 @@ protected void actuallyHurt(@NotNull DamageSource damageSource, float amount) {
536535
}
537536
amount = getDamageAfterArmorAbsorb(damageSource, amount);
538537
amount = getDamageAfterMagicAbsorb(damageSource, amount);
539-
if (damageSource.is(DamageTypeTags.IS_FALL)) {
540-
//Half the "potential" damage the Robit can take from falling
541-
amount /= 2;
542-
}
543538
energyContainer.extract(FloatingLong.create(1_000 * amount), Action.EXECUTE, AutomationType.INTERNAL);
544539
getCombatTracker().recordDamage(damageSource, amount);
545540
}

0 commit comments

Comments
 (0)