From 85f644c32c1cd720d177b3d57498afbc274a890c Mon Sep 17 00:00:00 2001 From: Artemis System Date: Sun, 27 Nov 2022 07:52:44 +0100 Subject: [PATCH] Register burnables properly on fabric Fix #76 This also creates a s_that_burn tag for each wood item and use that for registration, so that warped and crimson ones don't burn (like all their wooden items in vanilla) --- .../decorative_blocks/core/DBTags.java | 20 ++++++++++++++ .../mixin/AbstractFurnaceTileEntityMixin.java | 8 +++--- .../decorative_blocks/tags/blocks/beams.json | 8 +----- .../tags/blocks/beams_that_burn.json | 11 ++++++++ .../tags/blocks/palisades.json | 8 +----- .../tags/blocks/palisades_that_burn.json | 11 ++++++++ .../decorative_blocks/tags/blocks/seats.json | 8 +----- .../tags/blocks/seats_that_burn.json | 11 ++++++++ .../tags/blocks/supports.json | 8 +----- .../tags/blocks/supports_that_burn.json | 11 ++++++++ .../decorative_blocks/tags/items/beams.json | 8 +----- .../tags/items/beams_that_burn.json | 11 ++++++++ .../tags/items/palisades.json | 8 +----- .../tags/items/palisades_that_burn.json | 11 ++++++++ .../decorative_blocks/tags/items/seats.json | 8 +----- .../tags/items/seats_that_burn.json | 11 ++++++++ .../tags/items/supports.json | 8 +----- .../tags/items/supports_that_burn.json | 11 ++++++++ .../decorative_blocks/DecorativeBlocks.java | 1 + .../decorative_blocks/FuelRegistration.java | 27 +++++++++++++++++++ .../resources/decorative_blocks.mixins.json | 1 - gradlew | 0 22 files changed, 148 insertions(+), 61 deletions(-) create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/blocks/beams_that_burn.json create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades_that_burn.json create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/blocks/seats_that_burn.json create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/blocks/supports_that_burn.json create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/items/beams_that_burn.json create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/items/palisades_that_burn.json create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/items/seats_that_burn.json create mode 100644 Common/src/main/resources/data/decorative_blocks/tags/items/supports_that_burn.json create mode 100644 Fabric/src/main/java/lilypuree/decorative_blocks/FuelRegistration.java mode change 100644 => 100755 gradlew diff --git a/Common/src/main/java/lilypuree/decorative_blocks/core/DBTags.java b/Common/src/main/java/lilypuree/decorative_blocks/core/DBTags.java index 6f760eb..ca6fd72 100644 --- a/Common/src/main/java/lilypuree/decorative_blocks/core/DBTags.java +++ b/Common/src/main/java/lilypuree/decorative_blocks/core/DBTags.java @@ -10,6 +10,10 @@ public class DBTags { public static class Blocks { + public static TagKey PALISADES_THAT_BURN; + public static TagKey SUPPORTS_THAT_BURN; + public static TagKey SEATS_THAT_BURN; + public static TagKey BEAMS_THAT_BURN; public static TagKey PALISADES; public static TagKey SUPPORTS; public static TagKey SEATS; @@ -19,10 +23,16 @@ public static class Blocks { public static TagKey BONFIRES; public static void init() { + PALISADES_THAT_BURN = TagKey.create(Registry.BLOCK_REGISTRY, id("palisades_that_burn")); + SUPPORTS_THAT_BURN = TagKey.create(Registry.BLOCK_REGISTRY, id("supports_that_burn")); + SEATS_THAT_BURN = TagKey.create(Registry.BLOCK_REGISTRY, id("seats_that_burn")); + BEAMS_THAT_BURN = TagKey.create(Registry.BLOCK_REGISTRY, id("beams_that_burn")); + PALISADES = TagKey.create(Registry.BLOCK_REGISTRY, id("palisades")); SUPPORTS = TagKey.create(Registry.BLOCK_REGISTRY, id("supports")); SEATS = TagKey.create(Registry.BLOCK_REGISTRY, id("seats")); BEAMS = TagKey.create(Registry.BLOCK_REGISTRY, id("beams")); + CHANDELIERS = TagKey.create(Registry.BLOCK_REGISTRY, id("chandeliers")); BRAZIERS = TagKey.create(Registry.BLOCK_REGISTRY, id("braziers")); BONFIRES = TagKey.create(Registry.BLOCK_REGISTRY, id("bonfires")); @@ -30,6 +40,10 @@ public static void init() { } public static class Items { + public static TagKey PALISADES_THAT_BURN; + public static TagKey SUPPORTS_THAT_BURN; + public static TagKey SEATS_THAT_BURN; + public static TagKey BEAMS_THAT_BURN; public static TagKey PALISADES; public static TagKey SUPPORTS; public static TagKey SEATS; @@ -37,10 +51,16 @@ public static class Items { public static TagKey CHANDELIERS; public static void init() { + PALISADES_THAT_BURN = TagKey.create(Registry.ITEM_REGISTRY, id("palisades_that_burn")); + SUPPORTS_THAT_BURN = TagKey.create(Registry.ITEM_REGISTRY, id("supports_that_burn")); + SEATS_THAT_BURN = TagKey.create(Registry.ITEM_REGISTRY, id("seats_that_burn")); + BEAMS_THAT_BURN = TagKey.create(Registry.ITEM_REGISTRY, id("beams_that_burn")); + PALISADES = TagKey.create(Registry.ITEM_REGISTRY, id("palisades")); SUPPORTS = TagKey.create(Registry.ITEM_REGISTRY, id("supports")); SEATS = TagKey.create(Registry.ITEM_REGISTRY, id("seats")); BEAMS = TagKey.create(Registry.ITEM_REGISTRY, id("beams")); + CHANDELIERS = TagKey.create(Registry.ITEM_REGISTRY, id("chandeliers")); } } diff --git a/Common/src/main/java/lilypuree/decorative_blocks/mixin/AbstractFurnaceTileEntityMixin.java b/Common/src/main/java/lilypuree/decorative_blocks/mixin/AbstractFurnaceTileEntityMixin.java index 678ab7f..68b68a7 100644 --- a/Common/src/main/java/lilypuree/decorative_blocks/mixin/AbstractFurnaceTileEntityMixin.java +++ b/Common/src/main/java/lilypuree/decorative_blocks/mixin/AbstractFurnaceTileEntityMixin.java @@ -28,10 +28,10 @@ private static void add(Map map, ItemLike itemProvider, int burnT @Inject(method = "getFuel", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILSOFT) private static void onGetBurnTime(CallbackInfoReturnable> cir, Map map) { - add(map, DBTags.Items.BEAMS, 300); - add(map, DBTags.Items.PALISADES, 300); - add(map, DBTags.Items.SEATS, 300); - add(map, DBTags.Items.SUPPORTS, 300); + add(map, DBTags.Items.BEAMS_THAT_BURN, 300); + add(map, DBTags.Items.PALISADES_THAT_BURN, 300); + add(map, DBTags.Items.SEATS_THAT_BURN, 300); + add(map, DBTags.Items.SUPPORTS_THAT_BURN, 300); add(map, DBTags.Items.CHANDELIERS, 1600); add(map, DBBlocks.LATTICE, 100); } diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/beams.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/beams.json index e2e6298..610d61f 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/blocks/beams.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/beams.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_beam", - "decorative_blocks:birch_beam", - "decorative_blocks:spruce_beam", - "decorative_blocks:acacia_beam", - "decorative_blocks:jungle_beam", - "decorative_blocks:dark_oak_beam", - "decorative_blocks:mangrove_beam", + "#decorative_blocks:beams_that_burn", "decorative_blocks:crimson_beam", "decorative_blocks:warped_beam" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/beams_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/beams_that_burn.json new file mode 100644 index 0000000..b001bf2 --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/beams_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_beam", + "decorative_blocks:birch_beam", + "decorative_blocks:spruce_beam", + "decorative_blocks:acacia_beam", + "decorative_blocks:jungle_beam", + "decorative_blocks:dark_oak_beam", + "decorative_blocks:mangrove_beam" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades.json index 94a4069..cf3c0d0 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_palisade", - "decorative_blocks:birch_palisade", - "decorative_blocks:spruce_palisade", - "decorative_blocks:acacia_palisade", - "decorative_blocks:jungle_palisade", - "decorative_blocks:dark_oak_palisade", - "decorative_blocks:mangrove_palisade", + "#decorative_blocks:palisades_that_burn", "decorative_blocks:crimson_palisade", "decorative_blocks:warped_palisade" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades_that_burn.json new file mode 100644 index 0000000..69cbc75 --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/palisades_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_palisade", + "decorative_blocks:birch_palisade", + "decorative_blocks:spruce_palisade", + "decorative_blocks:acacia_palisade", + "decorative_blocks:jungle_palisade", + "decorative_blocks:dark_oak_palisade", + "decorative_blocks:mangrove_palisade" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/seats.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/seats.json index 197fa8c..59d308b 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/blocks/seats.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/seats.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_seat", - "decorative_blocks:birch_seat", - "decorative_blocks:spruce_seat", - "decorative_blocks:acacia_seat", - "decorative_blocks:jungle_seat", - "decorative_blocks:dark_oak_seat", - "decorative_blocks:mangrove_seat", + "#decorative_blocks:seats_that_burn", "decorative_blocks:crimson_seat", "decorative_blocks:warped_seat" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/seats_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/seats_that_burn.json new file mode 100644 index 0000000..1a9e1b9 --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/seats_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_seat", + "decorative_blocks:birch_seat", + "decorative_blocks:spruce_seat", + "decorative_blocks:acacia_seat", + "decorative_blocks:jungle_seat", + "decorative_blocks:dark_oak_seat", + "decorative_blocks:mangrove_seat" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/supports.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/supports.json index 7aa3917..050f020 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/blocks/supports.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/supports.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_support", - "decorative_blocks:birch_support", - "decorative_blocks:spruce_support", - "decorative_blocks:acacia_support", - "decorative_blocks:jungle_support", - "decorative_blocks:dark_oak_support", - "decorative_blocks:mangrove_support", + "#decorative_blocks:supports_that_burn", "decorative_blocks:crimson_support", "decorative_blocks:warped_support" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/blocks/supports_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/blocks/supports_that_burn.json new file mode 100644 index 0000000..eead77f --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/blocks/supports_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_support", + "decorative_blocks:birch_support", + "decorative_blocks:spruce_support", + "decorative_blocks:acacia_support", + "decorative_blocks:jungle_support", + "decorative_blocks:dark_oak_support", + "decorative_blocks:mangrove_support" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/beams.json b/Common/src/main/resources/data/decorative_blocks/tags/items/beams.json index e2e6298..610d61f 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/items/beams.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/beams.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_beam", - "decorative_blocks:birch_beam", - "decorative_blocks:spruce_beam", - "decorative_blocks:acacia_beam", - "decorative_blocks:jungle_beam", - "decorative_blocks:dark_oak_beam", - "decorative_blocks:mangrove_beam", + "#decorative_blocks:beams_that_burn", "decorative_blocks:crimson_beam", "decorative_blocks:warped_beam" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/beams_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/items/beams_that_burn.json new file mode 100644 index 0000000..b001bf2 --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/beams_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_beam", + "decorative_blocks:birch_beam", + "decorative_blocks:spruce_beam", + "decorative_blocks:acacia_beam", + "decorative_blocks:jungle_beam", + "decorative_blocks:dark_oak_beam", + "decorative_blocks:mangrove_beam" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/palisades.json b/Common/src/main/resources/data/decorative_blocks/tags/items/palisades.json index 94a4069..cf3c0d0 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/items/palisades.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/palisades.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_palisade", - "decorative_blocks:birch_palisade", - "decorative_blocks:spruce_palisade", - "decorative_blocks:acacia_palisade", - "decorative_blocks:jungle_palisade", - "decorative_blocks:dark_oak_palisade", - "decorative_blocks:mangrove_palisade", + "#decorative_blocks:palisades_that_burn", "decorative_blocks:crimson_palisade", "decorative_blocks:warped_palisade" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/palisades_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/items/palisades_that_burn.json new file mode 100644 index 0000000..69cbc75 --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/palisades_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_palisade", + "decorative_blocks:birch_palisade", + "decorative_blocks:spruce_palisade", + "decorative_blocks:acacia_palisade", + "decorative_blocks:jungle_palisade", + "decorative_blocks:dark_oak_palisade", + "decorative_blocks:mangrove_palisade" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/seats.json b/Common/src/main/resources/data/decorative_blocks/tags/items/seats.json index 197fa8c..59d308b 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/items/seats.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/seats.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_seat", - "decorative_blocks:birch_seat", - "decorative_blocks:spruce_seat", - "decorative_blocks:acacia_seat", - "decorative_blocks:jungle_seat", - "decorative_blocks:dark_oak_seat", - "decorative_blocks:mangrove_seat", + "#decorative_blocks:seats_that_burn", "decorative_blocks:crimson_seat", "decorative_blocks:warped_seat" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/seats_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/items/seats_that_burn.json new file mode 100644 index 0000000..1a9e1b9 --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/seats_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_seat", + "decorative_blocks:birch_seat", + "decorative_blocks:spruce_seat", + "decorative_blocks:acacia_seat", + "decorative_blocks:jungle_seat", + "decorative_blocks:dark_oak_seat", + "decorative_blocks:mangrove_seat" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/supports.json b/Common/src/main/resources/data/decorative_blocks/tags/items/supports.json index 7aa3917..050f020 100644 --- a/Common/src/main/resources/data/decorative_blocks/tags/items/supports.json +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/supports.json @@ -1,12 +1,6 @@ { "values": [ - "decorative_blocks:oak_support", - "decorative_blocks:birch_support", - "decorative_blocks:spruce_support", - "decorative_blocks:acacia_support", - "decorative_blocks:jungle_support", - "decorative_blocks:dark_oak_support", - "decorative_blocks:mangrove_support", + "#decorative_blocks:supports_that_burn", "decorative_blocks:crimson_support", "decorative_blocks:warped_support" ] diff --git a/Common/src/main/resources/data/decorative_blocks/tags/items/supports_that_burn.json b/Common/src/main/resources/data/decorative_blocks/tags/items/supports_that_burn.json new file mode 100644 index 0000000..eead77f --- /dev/null +++ b/Common/src/main/resources/data/decorative_blocks/tags/items/supports_that_burn.json @@ -0,0 +1,11 @@ +{ + "values": [ + "decorative_blocks:oak_support", + "decorative_blocks:birch_support", + "decorative_blocks:spruce_support", + "decorative_blocks:acacia_support", + "decorative_blocks:jungle_support", + "decorative_blocks:dark_oak_support", + "decorative_blocks:mangrove_support" + ] +} \ No newline at end of file diff --git a/Fabric/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java b/Fabric/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java index e0f86a9..c5e05fb 100644 --- a/Fabric/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java +++ b/Fabric/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java @@ -24,6 +24,7 @@ public void onInitialize() { Registration.init(); DBBlocks.init(); DBItems.init(); + FuelRegistration.init(); ModSetup.init(); Callbacks.initCallbacks(); } diff --git a/Fabric/src/main/java/lilypuree/decorative_blocks/FuelRegistration.java b/Fabric/src/main/java/lilypuree/decorative_blocks/FuelRegistration.java new file mode 100644 index 0000000..64313b8 --- /dev/null +++ b/Fabric/src/main/java/lilypuree/decorative_blocks/FuelRegistration.java @@ -0,0 +1,27 @@ +package lilypuree.decorative_blocks; + +import lilypuree.decorative_blocks.core.DBBlocks; +import lilypuree.decorative_blocks.core.DBTags; +import net.fabricmc.fabric.api.registry.FuelRegistry; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; + +public class FuelRegistration { + public static void init() { + register(DBTags.Items.BEAMS_THAT_BURN, 300); + register(DBTags.Items.PALISADES_THAT_BURN, 300); + register(DBTags.Items.SEATS_THAT_BURN, 300); + register(DBTags.Items.SUPPORTS_THAT_BURN, 300); + register(DBTags.Items.CHANDELIERS, 1600); + register(DBBlocks.LATTICE, 100); + } + + private static void register(ItemLike item, int time) { + FuelRegistry.INSTANCE.add(item, time); + } + + private static void register(TagKey tag, int time) { + FuelRegistry.INSTANCE.add(tag, time); + } +} diff --git a/Fabric/src/main/resources/decorative_blocks.mixins.json b/Fabric/src/main/resources/decorative_blocks.mixins.json index 4830dbb..bb87bac 100644 --- a/Fabric/src/main/resources/decorative_blocks.mixins.json +++ b/Fabric/src/main/resources/decorative_blocks.mixins.json @@ -3,7 +3,6 @@ "package": "lilypuree.decorative_blocks.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "AbstractFurnaceTileEntityMixin", "FireBlockInvoker", "ItemEntityMixin", "WalkNodeEvaluatorMixin", diff --git a/gradlew b/gradlew old mode 100644 new mode 100755