Skip to content

Commit

Permalink
refactor(next): remove FishingRodCastEvent, ItemHurtEvent
Browse files Browse the repository at this point in the history
  • Loading branch information
WakelessSloth56 committed Sep 28, 2022
1 parent cc3df54 commit 5373a5e
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 419 deletions.
Expand Up @@ -4,7 +4,7 @@
import net.minecraft.world.food.FoodData;
import net.minecraftforge.event.entity.living.LivingEvent;

public class FoodDataEvent extends LivingEvent {
public abstract class FoodDataEvent extends LivingEvent {

private final FoodData foodData;

Expand Down
Expand Up @@ -3,7 +3,7 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.event.entity.living.LivingEvent;

public class ServerPlayerEvent extends LivingEvent {
public abstract class ServerPlayerEvent extends LivingEvent {

private final ServerPlayer player;

Expand Down
Expand Up @@ -5,13 +5,10 @@
import java.util.Random;
import java.util.UUID;
import java.util.function.Function;
import javax.annotation.Nullable;
import org.apache.logging.log4j.Marker;
import org.auioc.mcmod.arnicalib.base.log.LogUtil;
import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
import org.auioc.mcmod.arnicalib.server.event.impl.EyeOfEnderSurvivableEvent;
import org.auioc.mcmod.arnicalib.server.event.impl.FishingRodCastEvent;
import org.auioc.mcmod.arnicalib.server.event.impl.ItemHurtEvent;
import org.auioc.mcmod.arnicalib.server.event.impl.LivingEatAddEffectEvent;
import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
import org.auioc.mcmod.arnicalib.server.event.impl.ServerPlayerSendMessageEvent;
Expand All @@ -20,14 +17,11 @@
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
import net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.projectile.EyeOfEnder;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;

Expand Down Expand Up @@ -72,18 +66,4 @@ public static Function<Random, Boolean> onEyeOfEnderSetSurvivable(ServerPlayer p
return event.getSurvivable();
}

// Coremod arnicalib.fishing_rod_item
public static FishingRodCastEvent.Pre preFishingRodCast(Player player, Level level, ItemStack fishingRod, int speedBonus, int luckBonus) {
var event = new FishingRodCastEvent.Pre((ServerPlayer) player, (ServerLevel) level, fishingRod, speedBonus, luckBonus);
BUS.post(event);
return event;
}

// Coremod arnicalib.item_stack
public static int onItemHurt(ItemStack itemStack, int damage, Random random, @Nullable ServerPlayer player) {
var event = new ItemHurtEvent(itemStack, damage, random, player);
BUS.post(event);
return event.getDamage();
}

}

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/resources/META-INF/coremods.json

This file was deleted.

185 changes: 0 additions & 185 deletions src/main/resources/coremods/fishing_rod_item.js

This file was deleted.

0 comments on commit 5373a5e

Please sign in to comment.