mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-12 11:18:52 -05:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8cd297f47b | ||
|
|
95fa6d022a | ||
|
|
a050a3d3da | ||
|
|
85fbdda897 |
No files matched your search
@@ -8,6 +8,7 @@
|
||||
|
||||
package com.cobblemon.mod.common.mixin.entity;
|
||||
|
||||
import com.cobblemon.mod.common.CobblemonItems;
|
||||
import com.cobblemon.mod.common.OrientationControllable;
|
||||
import com.cobblemon.mod.common.duck.RidePassenger;
|
||||
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
|
||||
@@ -21,9 +22,13 @@ import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
|
||||
import net.minecraft.client.player.LocalPlayer;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.LightningBolt;
|
||||
import net.minecraft.world.entity.animal.IronGolem;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.level.GameRules;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
@@ -151,4 +156,19 @@ public abstract class EntityMixin {
|
||||
|
||||
original.call(pusher, d * pusheeReceivedForce.get(), 0.0, e * pusheeReceivedForce.get());
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "thunderHit(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LightningBolt;)V",
|
||||
at = @At("TAIL")
|
||||
)
|
||||
private void cobblemon$dropMetalAlloyOnLightningKill(ServerLevel level, LightningBolt lightningBolt, CallbackInfo ci) {
|
||||
var entity = (Entity) (Object) this;
|
||||
if (!(entity instanceof IronGolem) || entity.isAlive()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
|
||||
entity.spawnAtLocation(CobblemonItems.METAL_ALLOY);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -508,7 +508,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
|
||||
@JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
|
||||
@JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
|
||||
@JvmField val SHELL_HELMET = heldItem("shell_helmet")
|
||||
@JvmField val METAL_ALLOY = noSettingsItem("metal_alloy")
|
||||
@JvmField val METAL_ALLOY = create("metal_alloy", CobblemonItem(Item.Properties().fireResistant()))
|
||||
@JvmField val SCROLL_OF_DARKNESS = noSettingsItem("scroll_of_darkness")
|
||||
@JvmField val SCROLL_OF_WATERS = noSettingsItem("scroll_of_waters")
|
||||
|
||||
|
||||
Reference in new issue
Block a user