Skip to content

Commit 8c61140

Browse files
committed
refactor(26.3)!: Remove setBurnTime in favor of Data Component
1 parent 88ec533 commit 8c61140

4 files changed

Lines changed: 0 additions & 53 deletions

File tree

common/src/main/java/net/blay09/mods/balm/platform/BalmHooks.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package net.blay09.mods.balm.platform;
22

33
import net.minecraft.core.BlockPos;
4-
import net.minecraft.core.Holder;
54
import net.minecraft.nbt.CompoundTag;
6-
import net.minecraft.util.RandomSource;
75
import net.minecraft.world.Container;
86
import net.minecraft.world.InteractionHand;
97
import net.minecraft.world.entity.Entity;
108
import net.minecraft.world.entity.Pose;
119
import net.minecraft.world.entity.player.Player;
1210
import net.minecraft.world.item.DyeColor;
13-
import net.minecraft.world.item.Item;
1411
import net.minecraft.world.item.ItemStack;
1512
import net.minecraft.world.item.ItemStackTemplate;
1613
import net.minecraft.world.level.Level;
@@ -57,8 +54,6 @@ default CompoundTag getPersistentData(Player player) {
5754
@Nullable
5855
DyeColor getColor(ItemStack itemStack);
5956

60-
void setBurnTime(Item item, int burnTime);
61-
6257
void firePlayerCraftingEvent(Player player, ItemStack crafted, Container craftMatrix);
6358

6459
/**

fabric/src/main/java/net/blay09/mods/balm/fabric/platform/internal/FabricBalmHooks.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
import net.blay09.mods.balm.world.entity.BalmForcedPoseHolder;
77
import net.blay09.mods.balm.platform.capabilities.CommonCapabilities;
88
import net.fabricmc.fabric.api.entity.FakePlayer;
9-
import net.fabricmc.fabric.api.registry.FuelValueEvents;
109
import net.minecraft.core.BlockPos;
11-
import net.minecraft.core.Holder;
1210
import net.minecraft.core.component.DataComponents;
1311
import net.minecraft.core.registries.BuiltInRegistries;
1412
import net.minecraft.nbt.CompoundTag;
1513
import net.minecraft.sounds.SoundEvents;
16-
import net.minecraft.util.RandomSource;
1714
import net.minecraft.world.Container;
1815
import net.minecraft.world.InteractionHand;
1916
import net.minecraft.world.entity.Entity;
@@ -72,11 +69,6 @@ public boolean isFakePlayer(Player player) {
7269
return itemStack.get(DataComponents.DYE);
7370
}
7471

75-
@Override
76-
public void setBurnTime(Item item, int burnTime) {
77-
FuelValueEvents.BUILD.register((builder, context) -> builder.add(item, burnTime));
78-
}
79-
8072
@Override
8173
public void firePlayerCraftingEvent(Player player, ItemStack crafted, Container craftMatrix) {
8274
}

forge/src/main/java/net/blay09/mods/balm/forge/platform/internal/ForgeBalmHooks.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
import net.blay09.mods.balm.nbt.BalmDataHolder;
44
import net.blay09.mods.balm.platform.BalmHooks;
55
import net.minecraft.core.BlockPos;
6-
import net.minecraft.core.Holder;
76
import net.minecraft.nbt.CompoundTag;
87
import net.minecraft.server.level.ServerPlayer;
9-
import net.minecraft.util.RandomSource;
108
import net.minecraft.world.Container;
119
import net.minecraft.world.InteractionHand;
1210
import net.minecraft.world.entity.Entity;
@@ -18,7 +16,6 @@
1816
import net.minecraft.world.phys.BlockHitResult;
1917
import net.minecraftforge.common.util.Result;
2018
import net.minecraftforge.event.ForgeEventFactory;
21-
import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent;
2219
import net.minecraftforge.fluids.FluidUtil;
2320
import org.jspecify.annotations.Nullable;
2421

@@ -27,19 +24,6 @@
2724

2825
public class ForgeBalmHooks implements BalmHooks {
2926

30-
public final Map<Item, Integer> burnTimes = new ConcurrentHashMap<>();
31-
32-
public ForgeBalmHooks() {
33-
FurnaceFuelBurnTimeEvent.BUS.addListener(this::furnaceFuelBurnTime);
34-
}
35-
36-
private void furnaceFuelBurnTime(FurnaceFuelBurnTimeEvent event) {
37-
final var found = burnTimes.get(event.getItemStack().getItem());
38-
if (found != null) {
39-
event.setBurnTime(found);
40-
}
41-
}
42-
4327
@Override
4428
public boolean growCrop(ItemStack itemStack, Level level, BlockPos pos, @Nullable Player player) {
4529
if (player != null) {
@@ -89,11 +73,6 @@ public boolean isFakePlayer(Player player) {
8973
return DyeColor.getColor(itemStack);
9074
}
9175

92-
@Override
93-
public void setBurnTime(Item item, int burnTime) {
94-
burnTimes.put(item, burnTime);
95-
}
96-
9776
@Override
9877
public void firePlayerCraftingEvent(Player player, ItemStack crafted, Container craftMatrix) {
9978
ForgeEventFactory.firePlayerCraftingEvent(player, crafted, craftMatrix);

neoforge/src/main/java/net/blay09/mods/balm/neoforge/platform/internal/NeoForgeBalmHooks.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import net.blay09.mods.balm.nbt.BalmDataHolder;
44
import net.blay09.mods.balm.platform.BalmHooks;
55
import net.minecraft.core.BlockPos;
6-
import net.minecraft.core.Holder;
76
import net.minecraft.nbt.CompoundTag;
8-
import net.minecraft.util.RandomSource;
97
import net.minecraft.world.Container;
108
import net.minecraft.world.InteractionHand;
119
import net.minecraft.world.entity.Entity;
@@ -18,7 +16,6 @@
1816
import net.neoforged.neoforge.common.NeoForge;
1917
import net.neoforged.neoforge.common.util.FakePlayer;
2018
import net.neoforged.neoforge.event.EventHooks;
21-
import net.neoforged.neoforge.event.furnace.FurnaceFuelBurnTimeEvent;
2219
import net.neoforged.neoforge.transfer.fluid.FluidUtil;
2320
import org.jspecify.annotations.Nullable;
2421

@@ -29,17 +26,6 @@ public class NeoForgeBalmHooks implements BalmHooks {
2926

3027
public final Map<Item, Integer> burnTimes = new ConcurrentHashMap<>();
3128

32-
public NeoForgeBalmHooks() {
33-
NeoForge.EVENT_BUS.addListener(this::furnaceFuelBurnTime);
34-
}
35-
36-
private void furnaceFuelBurnTime(FurnaceFuelBurnTimeEvent event) {
37-
final var found = burnTimes.get(event.getItemStack().getItem());
38-
if (found != null) {
39-
event.setBurnTime(found);
40-
}
41-
}
42-
4329
@Override
4430
public boolean growCrop(ItemStack itemStack, Level level, BlockPos pos, @Nullable Player player) {
4531
if (player != null) {
@@ -89,11 +75,6 @@ public boolean isFakePlayer(Player player) {
8975
return DyeColor.getColor(itemStack);
9076
}
9177

92-
@Override
93-
public void setBurnTime(Item item, int burnTime) {
94-
burnTimes.put(item, burnTime);
95-
}
96-
9778
@Override
9879
public void firePlayerCraftingEvent(Player player, ItemStack crafted, Container craftMatrix) {
9980
EventHooks.firePlayerCraftingEvent(player, crafted, craftMatrix);

0 commit comments

Comments
 (0)