mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
1.21 Update
Co-authored-by: RealMangoRage <[email protected]> Co-authored-by: Daniel Norris <[email protected]> Co-authored-by: Ven <[email protected]>
This commit is contained in:
941 files changed
+3119
-4266
No files matched your search
@@ -158,6 +158,7 @@ import net.minecraftforge.event.entity.living.LivingHealEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingKnockBackEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingPackSizeEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingSwapItemsEvent;
|
||||
import net.minecraftforge.event.entity.living.LootingLevelEvent;
|
||||
import net.minecraftforge.event.entity.living.MobEffectEvent;
|
||||
import net.minecraftforge.event.entity.living.MobSpawnEvent;
|
||||
import net.minecraftforge.event.entity.living.MobSpawnEvent.AllowDespawn;
|
||||
@@ -798,14 +799,6 @@ public final class ForgeEventFactory {
|
||||
post(new PlayerEvent.ItemSmeltedEvent(player, smelted));
|
||||
}
|
||||
|
||||
public static void onRenderTickStart(float timer) {
|
||||
post(new TickEvent.RenderTickEvent(TickEvent.Phase.START, timer));
|
||||
}
|
||||
|
||||
public static void onRenderTickEnd(float timer) {
|
||||
post(new TickEvent.RenderTickEvent(TickEvent.Phase.END, timer));
|
||||
}
|
||||
|
||||
public static void onPlayerPreTick(Player player) {
|
||||
post(new TickEvent.PlayerTickEvent(TickEvent.Phase.START, player));
|
||||
}
|
||||
@@ -954,8 +947,8 @@ public final class ForgeEventFactory {
|
||||
return post(new LivingDeathEvent(entity, src));
|
||||
}
|
||||
|
||||
public static boolean onLivingDrops(LivingEntity entity, DamageSource source, Collection<ItemEntity> drops, int lootingLevel, boolean recentlyHit) {
|
||||
return post(new LivingDropsEvent(entity, source, drops, lootingLevel, recentlyHit));
|
||||
public static boolean onLivingDrops(LivingEntity entity, DamageSource source, Collection<ItemEntity> drops, boolean recentlyHit) {
|
||||
return post(new LivingDropsEvent(entity, source, drops, recentlyHit));
|
||||
}
|
||||
|
||||
public static void onLeftClickEmpty(Player player) {
|
||||
@@ -1094,4 +1087,8 @@ public final class ForgeEventFactory {
|
||||
public static GatherComponentsEvent.Item gatherItemComponentsEvent(Item item, DataComponentMap dataComponents) {
|
||||
return fire(new GatherComponentsEvent.Item(item, dataComponents));
|
||||
}
|
||||
|
||||
public static LootingLevelEvent fireLootingLevel(LivingEntity target, @Nullable DamageSource cause, int level) {
|
||||
return fire(new LootingLevelEvent(target, cause, level));
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
package net.minecraftforge.event;
|
||||
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.client.DeltaTracker;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
import java.util.function.BooleanSupplier;
|
||||
@@ -54,7 +55,7 @@ public class TickEvent extends Event
|
||||
{
|
||||
return this.haveTime.getAsBoolean();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* {@return the server instance}
|
||||
*/
|
||||
@@ -105,11 +106,27 @@ public class TickEvent extends Event
|
||||
}
|
||||
|
||||
public static class RenderTickEvent extends TickEvent {
|
||||
public final float renderTickTime;
|
||||
public RenderTickEvent(Phase phase, float renderTickTime)
|
||||
{
|
||||
private final DeltaTracker timer;
|
||||
|
||||
private RenderTickEvent(Phase phase, DeltaTracker timer) {
|
||||
super(Type.RENDER, LogicalSide.CLIENT, phase);
|
||||
this.renderTickTime = renderTickTime;
|
||||
this.timer = timer;
|
||||
}
|
||||
|
||||
public DeltaTracker getTimer() {
|
||||
return this.timer;
|
||||
}
|
||||
|
||||
public static class Start extends RenderTickEvent {
|
||||
public Start(DeltaTracker timer) {
|
||||
super(Phase.START, timer);
|
||||
}
|
||||
}
|
||||
|
||||
public static class End extends RenderTickEvent {
|
||||
public End(DeltaTracker timer) {
|
||||
super(Phase.END, timer);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -34,39 +34,27 @@ import net.minecraftforge.eventbus.api.Cancelable;
|
||||
* This event is fired on the {@link MinecraftForge#EVENT_BUS}.
|
||||
**/
|
||||
@net.minecraftforge.eventbus.api.Cancelable
|
||||
public class LivingDropsEvent extends LivingEvent
|
||||
{
|
||||
public class LivingDropsEvent extends LivingEvent {
|
||||
private final DamageSource source;
|
||||
private final Collection<ItemEntity> drops;
|
||||
private final int lootingLevel;
|
||||
private final boolean recentlyHit;
|
||||
|
||||
public LivingDropsEvent(LivingEntity entity, DamageSource source, Collection<ItemEntity> drops, int lootingLevel, boolean recentlyHit)
|
||||
{
|
||||
public LivingDropsEvent(LivingEntity entity, DamageSource source, Collection<ItemEntity> drops, boolean recentlyHit) {
|
||||
super(entity);
|
||||
this.source = source;
|
||||
this.drops = drops;
|
||||
this.lootingLevel = lootingLevel;
|
||||
this.recentlyHit = recentlyHit;
|
||||
}
|
||||
|
||||
public DamageSource getSource()
|
||||
{
|
||||
public DamageSource getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public Collection<ItemEntity> getDrops()
|
||||
{
|
||||
public Collection<ItemEntity> getDrops() {
|
||||
return drops;
|
||||
}
|
||||
|
||||
public int getLootingLevel()
|
||||
{
|
||||
return lootingLevel;
|
||||
}
|
||||
|
||||
public boolean isRecentlyHit()
|
||||
{
|
||||
public boolean isRecentlyHit() {
|
||||
return recentlyHit;
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,9 @@ package net.minecraftforge.event.level;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.world.item.context.UseOnContext;
|
||||
import net.minecraft.world.item.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.world.level.block.BaseFireBlock;
|
||||
import net.minecraft.world.level.portal.PortalShape;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
@@ -73,8 +75,10 @@ public class BlockEvent extends Event {
|
||||
if (state == null || !ForgeHooks.isCorrectToolForDrops(state, player)) { // Handle empty block or player unable to break block scenario
|
||||
this.exp = 0;
|
||||
} else {
|
||||
int fortuneLevel = player.getMainHandItem().getEnchantmentLevel(Enchantments.FORTUNE);
|
||||
int silkTouchLevel = player.getMainHandItem().getEnchantmentLevel(Enchantments.SILK_TOUCH);
|
||||
var lookup = level.registryAccess().lookup(Registries.ENCHANTMENT).get();
|
||||
|
||||
int fortuneLevel = EnchantmentHelper.getItemEnchantmentLevel(lookup.getOrThrow(Enchantments.FORTUNE), player.getMainHandItem());
|
||||
int silkTouchLevel = EnchantmentHelper.getItemEnchantmentLevel(lookup.getOrThrow(Enchantments.SILK_TOUCH), player.getMainHandItem());
|
||||
this.exp = state.getExpDrop(level, level.random, pos, fortuneLevel, silkTouchLevel);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user