diff --git a/build.gradle b/build.gradle index 5eb41b58..ecbe33b0 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,14 @@ int javaVersion = Integer.parseInt(project.java_version) sourceCompatibility = javaVersion targetCompatibility = javaVersion +loom { + runs { + client { + vmArgs "-Dfabric-tag-conventions-v1.legacyTagWarning=DEV_VERBOSE" + } + } +} + repositories { maven { url = "https://maven.gegy.dev/" } maven { url = "https://maven.terraformersmc.com/releases/" } diff --git a/gradle.properties b/gradle.properties index dfb53ecb..9efd22e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,8 @@ archives_base_name = bodacious_berries # mod dependencies fabric_api_version=0.97.8+1.20.6 -emi_version=1.1.6+1.20.2 -mod_menu_version=9.0.0 +emi_version=1.1.6+1.20.6 +mod_menu_version=10.0.0-beta.1 # other dependencies night_config_version=3.6.6 \ No newline at end of file diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/BasicBerryBush.java b/src/main/java/io/ix0rai/bodacious_berries/block/BasicBerryBush.java index adc89383..ca006a28 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/BasicBerryBush.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/BasicBerryBush.java @@ -84,7 +84,7 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po public void randomTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) { int age = state.get(getAge()); // if the age isn't maximum and the light level is high enough grow the bush - if (age <= maxAge && random.nextInt(GROW_CHANCE) == 0 && world.getBaseLightLevel(pos.up(), 0) >= 9) { + if (age < maxAge && random.nextInt(GROW_CHANCE) == 0 && world.getBaseLightLevel(pos.up(), 0) >= 9) { grow(world, pos, state, age + 1); } } diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/BerryVine.java b/src/main/java/io/ix0rai/bodacious_berries/block/BerryVine.java index d2e83b5b..f95015ca 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/BerryVine.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/BerryVine.java @@ -17,7 +17,6 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.random.RandomGenerator; -import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; @@ -43,10 +42,10 @@ protected void appendProperties(StateManager.Builder builder) builder.add(AGE, UP, NORTH, EAST, SOUTH, WEST); } - @Override - public boolean hasRandomTicks(BlockState state) { - return state.get(AGE) < MAX_AGE; - } +// @Override +// public boolean hasRandomTicks(BlockState state) { +// return state.get(AGE) < MAX_AGE; +// } @Override public void randomTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) { @@ -104,12 +103,12 @@ public int getMaxBerryAmount() { @Override public boolean isFertilizable(WorldView world, BlockPos pos, BlockState state) { - return this.hasRandomTicks(state); + return state.hasRandomTicks(); } @Override public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) { - return this.hasRandomTicks(state); + return state.hasRandomTicks(); } @Override diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/CloudberryBush.java b/src/main/java/io/ix0rai/bodacious_berries/block/CloudberryBush.java index 386612a6..9ff1d160 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/CloudberryBush.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/CloudberryBush.java @@ -9,7 +9,6 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.random.RandomGenerator; @@ -30,11 +29,6 @@ protected void appendProperties(StateManager.Builder builder) super.appendProperties(builder); } - @Override - public boolean hasRandomTicks(BlockState state) { - return true; - } - @Override public void randomTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) { if (Boolean.TRUE.equals(state.get(DYING))) { diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/DoubleBerryBush.java b/src/main/java/io/ix0rai/bodacious_berries/block/DoubleBerryBush.java index a4f2e69a..aa73715e 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/DoubleBerryBush.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/DoubleBerryBush.java @@ -21,7 +21,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.random.RandomGenerator; -import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; @@ -56,10 +55,10 @@ protected void appendProperties(StateManager.Builder builder) builder.add(getAge()).add(HALF); } - @Override - public boolean hasRandomTicks(BlockState state) { - return state.get(getAge()) < MAX_AGE; - } +// @Override +// public boolean hasRandomTicks(BlockState state) { +// return state.get(getAge()) < MAX_AGE; +// } @Override public void randomTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) { @@ -72,12 +71,12 @@ public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random @Override public boolean isFertilizable(WorldView world, BlockPos pos, BlockState state) { - return hasRandomTicks(state); + return state.hasRandomTicks(); } @Override public boolean canFertilize(World world, RandomGenerator random, BlockPos pos, BlockState state) { - return hasRandomTicks(state); + return state.hasRandomTicks(); } @Override @@ -101,13 +100,13 @@ protected ItemInteractionResult onInteract(ItemStack stack, BlockState state, Wo @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hitResult) { - if (hasRandomTicks(state) && player.getStackInHand(hand).isOf(Items.BONE_MEAL)) { - return ActionResult.PASS; - } else if (state.get(getAge()) == MAX_AGE) { - return BasicBerryBush.pickBerries(pos, world, state, this.getBerryItem()); - } else { +// if (hasRandomTicks(state) && player.getStackInHand(hand).isOf(Items.BONE_MEAL)) { +// return ActionResult.PASS; +// } else if (state.get(getAge()) == MAX_AGE) { +// return BasicBerryBush.pickBerries(pos, world, state, this.getBerryItem()); +// } else { return super.onUse(state, world, pos, player, hitResult); - } +// } } @Override diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/GrowingBerryBush.java b/src/main/java/io/ix0rai/bodacious_berries/block/GrowingBerryBush.java index bcd0f31a..7ffc9be3 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/GrowingBerryBush.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/GrowingBerryBush.java @@ -56,16 +56,16 @@ protected ItemInteractionResult onInteract( @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity entity, BlockHitResult hitResult) { - // a GrowingBerryBush cannot produce berries until it grows to its double bush state - if (state.hasRandomTicks() && player.getStackInHand(hand).isOf(Items.BONE_MEAL)) { - final int newAge = Math.min(maxAge, state.get(getAge()) + 1); - // grow to a double bush if new age exceeds maximum - if (newAge > maxAge) { - TallPlantBlock.placeAt(world, futureBush.getDefaultState(), pos, Block.NOTIFY_LISTENERS); - } - - return ActionResult.PASS; - } +// // a GrowingBerryBush cannot produce berries until it grows to its double bush state +// if (state.hasRandomTicks() && player.getStackInHand(hand).isOf(Items.BONE_MEAL)) { +// final int newAge = Math.min(maxAge, state.get(getAge()) + 1); +// // grow to a double bush if new age exceeds maximum +// if (newAge > maxAge) { +// TallPlantBlock.placeAt(world, futureBush.getDefaultState(), pos, Block.NOTIFY_LISTENERS); +// } +// +// return ActionResult.PASS; +// } return ActionResult.FAIL; } diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/JuicerBlock.java b/src/main/java/io/ix0rai/bodacious_berries/block/JuicerBlock.java index dc8f5c27..b4655957 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/JuicerBlock.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/JuicerBlock.java @@ -1,5 +1,6 @@ package io.ix0rai.bodacious_berries.block; +import com.mojang.serialization.MapCodec; import io.ix0rai.bodacious_berries.block.entity.JuicerBlockEntity; import io.ix0rai.bodacious_berries.registry.BodaciousBlocks; import net.minecraft.block.Block; @@ -14,20 +15,25 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; import net.minecraft.util.ItemScatterer; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -@SuppressWarnings("deprecation") public class JuicerBlock extends BlockWithEntity { public static final BooleanProperty RUNNING = BooleanProperty.of("running"); + public static final MapCodec CODEC = createCodec(JuicerBlock::new); + public JuicerBlock(Settings settings) { super(settings); this.setDefaultState(this.getDefaultState().with(RUNNING, false)); } + @Override + protected MapCodec getCodec() { + return CODEC; + } + @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return new JuicerBlockEntity(pos, state); @@ -44,7 +50,7 @@ public BlockRenderType getRenderType(BlockState state) { } @Override - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity entity, BlockHitResult hitResult) { + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hitResult) { if (!world.isClient) { // create screen NamedScreenHandlerFactory screenHandlerFactory = state.createScreenHandlerFactory(world, pos); diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/entity/BerryHarvesterBlockEntity.java b/src/main/java/io/ix0rai/bodacious_berries/block/entity/BerryHarvesterBlockEntity.java index 376cd41f..d814ad52 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/entity/BerryHarvesterBlockEntity.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/entity/BerryHarvesterBlockEntity.java @@ -20,6 +20,7 @@ import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.registry.HolderLookup; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.sound.SoundCategory; @@ -40,14 +41,13 @@ public BerryHarvesterBlockEntity(BlockPos pos, BlockState state) { } @Override - public void readNbt(NbtCompound nbt) { - super.readNbt(nbt); - Inventories.readNbt(nbt, inventory); + public void method_11014(NbtCompound nbt, HolderLookup.Provider lookupProvider) { + Inventories.readNbt(nbt, inventory, lookupProvider); } @Override - public void writeNbt(NbtCompound nbt) { - Inventories.writeNbt(nbt, inventory); + public void writeNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) { + Inventories.writeNbt(nbt, inventory, lookupProvider); } @Override @@ -56,8 +56,8 @@ public Packet toUpdatePacket() { } @Override - public NbtCompound toSyncedNbt() { - return toNbt(); + public NbtCompound toSyncedNbt(HolderLookup.Provider lookupProvider) { + return toNbt(lookupProvider); } public static void tick(World world, BlockPos pos, BlockState state, BerryHarvesterBlockEntity harvester) { diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerBlockEntity.java b/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerBlockEntity.java index 80b6d8b2..a588e8e2 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerBlockEntity.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerBlockEntity.java @@ -18,6 +18,7 @@ import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeHolder; +import net.minecraft.registry.HolderLookup; import net.minecraft.screen.ArrayPropertyDelegate; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.PropertyDelegate; @@ -66,14 +67,13 @@ public JuicerBlockEntity(BlockPos pos, BlockState state) { } @Override - public void readNbt(NbtCompound nbt) { - super.readNbt(nbt); - Inventories.readNbt(nbt, inventory); + public void method_11014(NbtCompound nbt, HolderLookup.Provider lookupProvider) { + Inventories.readNbt(nbt, inventory, lookupProvider); } @Override - public void writeNbt(NbtCompound nbt) { - Inventories.writeNbt(nbt, inventory); + public void writeNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) { + Inventories.writeNbt(nbt, inventory, lookupProvider); } @Override diff --git a/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerRecipe.java b/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerRecipe.java index 8cc40138..c408449d 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerRecipe.java +++ b/src/main/java/io/ix0rai/bodacious_berries/block/entity/JuicerRecipe.java @@ -4,17 +4,19 @@ import com.mojang.datafixers.util.Either; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; +import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import io.ix0rai.bodacious_berries.BodaciousBerries; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.RegistryByteBuf; +import net.minecraft.network.codec.PacketCodec; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeHolder; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.RecipeType; -import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.HolderLookup; import net.minecraft.registry.Registries; import net.minecraft.server.MinecraftServer; import net.minecraft.util.collection.DefaultedList; @@ -77,8 +79,8 @@ public boolean matches(Inventory inv, World world) { } @Override - public ItemStack craft(Inventory inventory, DynamicRegistryManager registryManager) { - return getResult(registryManager).copy(); + public ItemStack craft(Inventory inventory, HolderLookup.Provider provider) { + return getResult(provider).copy(); } @Override @@ -87,7 +89,7 @@ public boolean fits(int width, int height) { } @Override - public ItemStack getResult(DynamicRegistryManager registryManager) { + public ItemStack getResult(HolderLookup.Provider provider) { return this.result; } @@ -162,15 +164,15 @@ private static boolean check(Predicate function) { */ public record IngredientSet(Ingredient ingredient0, Ingredient ingredient1, Ingredient ingredient2, Ingredient receptacle) { private static final Codec ALL_CODEC = RecordCodecBuilder.create((instance) -> instance.group( - Ingredient.field_46095.fieldOf("all").forGetter((set) -> set.ingredient0), - Ingredient.field_46095.fieldOf("receptacle").forGetter((set) -> set.receptacle) + Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("all").forGetter((set) -> set.ingredient0), + Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("receptacle").forGetter((set) -> set.receptacle) ).apply(instance, (ingredient, receptacle) -> new IngredientSet(ingredient, ingredient, ingredient, receptacle))); private static final Codec INDIVIDUAL_CODEC = RecordCodecBuilder.create((instance) -> instance.group( - Ingredient.field_46095.fieldOf("0").forGetter((set) -> set.ingredient0), - Ingredient.field_46095.fieldOf("1").forGetter((set) -> set.ingredient1), - Ingredient.field_46095.fieldOf("2").forGetter((set) -> set.ingredient2), - Ingredient.field_46095.fieldOf("receptacle").forGetter((set) -> set.receptacle) + Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("0").forGetter((set) -> set.ingredient0), + Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("1").forGetter((set) -> set.ingredient1), + Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("2").forGetter((set) -> set.ingredient2), + Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("receptacle").forGetter((set) -> set.receptacle) ).apply(instance, IngredientSet::new)); private static final Codec> EITHER_CODEC = Codec.either( @@ -194,32 +196,53 @@ private boolean ingredientsMatch() { } public static class Serializer implements RecipeSerializer { - private static final Codec CODEC = RecordCodecBuilder.create((instance) -> instance.group( - IngredientSet.CODEC.fieldOf("ingredients").forGetter((recipe) -> new IngredientSet(recipe.ingredient0, recipe.ingredient1, recipe.ingredient2, recipe.receptacle)), - Registries.ITEM.getCodec().xmap(ItemStack::new, ItemStack::getItem).fieldOf("result").forGetter((recipe) -> recipe.result) + private static final MapCodec CODEC = RecordCodecBuilder.mapCodec((instance) -> instance.group( + IngredientSet.CODEC.fieldOf("ingredients").forGetter((recipe) -> { + if (recipe instanceof JuicerRecipe juicerRecipe) { + return new IngredientSet(juicerRecipe.ingredient0, juicerRecipe.ingredient1, juicerRecipe.ingredient2, juicerRecipe.receptacle); + } else { + throw new RuntimeException("recipe error"); + } + }), + Registries.ITEM.getCodec().xmap(ItemStack::new, ItemStack::getItem).fieldOf("result").forGetter((recipe) -> { + if (recipe instanceof JuicerRecipe juicerRecipe) { + return juicerRecipe.result; + } else { + throw new RuntimeException("recipe error"); + } + }) ).apply(instance, (set, result) -> new JuicerRecipe(set.ingredient0(), set.ingredient1(), set.ingredient2(), set.receptacle(), result))); + private final PacketCodec packetCodec; + + public Serializer() { + packetCodec = PacketCodec.create(this::write, this::read); + } + + public JuicerRecipe read(RegistryByteBuf buf) { + Ingredient input1 = Ingredient.PACKET_CODEC.decode(buf); + Ingredient input2 = Ingredient.PACKET_CODEC.decode(buf); + Ingredient input3 = Ingredient.PACKET_CODEC.decode(buf); + Ingredient receptacle = Ingredient.PACKET_CODEC.decode(buf); + ItemStack result = ItemStack.PACKET_CODEC.decode(buf); + return new JuicerRecipe(input1, input2, input3, receptacle, result); + } - @Override - public JuicerRecipe read(PacketByteBuf buf) { - Ingredient input1 = Ingredient.fromPacket(buf); - Ingredient input2 = Ingredient.fromPacket(buf); - Ingredient input3 = Ingredient.fromPacket(buf); - Ingredient receptacle = Ingredient.fromPacket(buf); - return new JuicerRecipe(input1, input2, input3, receptacle, buf.readItemStack()); + public void write(RegistryByteBuf packetData, JuicerRecipe recipe) { + Ingredient.PACKET_CODEC.encode(packetData, recipe.ingredient0()); + Ingredient.PACKET_CODEC.encode(packetData, recipe.ingredient1()); + Ingredient.PACKET_CODEC.encode(packetData, recipe.ingredient2()); + Ingredient.PACKET_CODEC.encode(packetData, recipe.receptacle()); + ItemStack.PACKET_CODEC.encode(packetData, recipe.getResult()); } @Override - public Codec method_53736() { + public MapCodec getCodec() { return CODEC; } @Override - public void write(PacketByteBuf packetData, JuicerRecipe recipe) { - recipe.ingredient0().write(packetData); - recipe.ingredient1().write(packetData); - recipe.ingredient2().write(packetData); - recipe.receptacle().write(packetData); - packetData.writeItemStack(recipe.getResult()); + public PacketCodec getPacketCodec() { + return packetCodec; } } } diff --git a/src/main/java/io/ix0rai/bodacious_berries/config/BodaciousConfigScreen.java b/src/main/java/io/ix0rai/bodacious_berries/config/BodaciousConfigScreen.java index 61892794..e435dad6 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/config/BodaciousConfigScreen.java +++ b/src/main/java/io/ix0rai/bodacious_berries/config/BodaciousConfigScreen.java @@ -11,6 +11,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; +import java.util.List; import java.util.function.Consumer; import static io.ix0rai.bodacious_berries.BodaciousBerries.CONFIG; @@ -25,15 +26,16 @@ public BodaciousConfigScreen(@Nullable Screen parent) { super(parent, MinecraftClient.getInstance().options, BodaciousBerries.translatableText("config.title"), createOptions()); } + @SuppressWarnings("unchecked") private static Option[] createOptions() { - var options = new ArrayList<>(); + List> options = new ArrayList<>(); for (Berry berry : Berry.values()) { options.add(createGenOption(berry.toString(), value -> CONFIG.setGenerating(berry, value) )); } - return options.stream().toArray(Option[]::new); + return options.toArray(Option[]::new); } private static Option createGenOption(String key, Consumer setter) { diff --git a/src/main/java/io/ix0rai/bodacious_berries/registry/BodaciousBlocks.java b/src/main/java/io/ix0rai/bodacious_berries/registry/BodaciousBlocks.java index 80f92e8a..780f6a6f 100644 --- a/src/main/java/io/ix0rai/bodacious_berries/registry/BodaciousBlocks.java +++ b/src/main/java/io/ix0rai/bodacious_berries/registry/BodaciousBlocks.java @@ -8,8 +8,7 @@ import io.ix0rai.bodacious_berries.block.entity.JuicerBlockEntity; import io.ix0rai.bodacious_berries.block.entity.JuicerScreenHandler; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.feature_flags.FeatureFlags; @@ -27,13 +26,13 @@ public class BodaciousBlocks { public static final Identifier BERRY_HARVESTER = BodaciousBerries.id("berry_harvester"); - public static final BerryHarvesterBlock BERRY_HARVESTER_BLOCK = new BerryHarvesterBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.COPPER).strength(4.0f)); - public static final BlockEntityType BERRY_HARVESTER_ENTITY = FabricBlockEntityTypeBuilder.create(BerryHarvesterBlockEntity::new, BERRY_HARVESTER_BLOCK).build(null); + public static final BerryHarvesterBlock BERRY_HARVESTER_BLOCK = new BerryHarvesterBlock(AbstractBlock.Settings.create().sounds(BlockSoundGroup.COPPER).strength(4.0f)); + public static final BlockEntityType BERRY_HARVESTER_ENTITY = BlockEntityType.Builder.create(BerryHarvesterBlockEntity::new, BERRY_HARVESTER_BLOCK).build(null); public static final ScreenHandlerType BERRY_HARVESTER_SCREEN_HANDLER = new ScreenHandlerType<>(BerryHarvesterScreenHandler::new, FeatureFlags.DEFAULT_SET); public static final Identifier JUICER = BodaciousBerries.id("juicer"); - public static final JuicerBlock JUICER_BLOCK = new JuicerBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.COPPER).strength(4.0f)); - public static final BlockEntityType JUICER_ENTITY = FabricBlockEntityTypeBuilder.create(JuicerBlockEntity::new, JUICER_BLOCK).build(null); + public static final JuicerBlock JUICER_BLOCK = new JuicerBlock(AbstractBlock.Settings.create().sounds(BlockSoundGroup.COPPER).strength(4.0f)); + public static final BlockEntityType JUICER_ENTITY = BlockEntityType.Builder.create(JuicerBlockEntity::new, JUICER_BLOCK).build(null); public static final ScreenHandlerType JUICER_SCREEN_HANDLER = new ScreenHandlerType<>(JuicerScreenHandler::new, FeatureFlags.DEFAULT_SET); public static void register() { diff --git a/src/main/resources/data/bodacious_berries/recipes/berry_harvester.json b/src/main/resources/data/bodacious_berries/recipes/berry_harvester.json index b849416a..406796d1 100644 --- a/src/main/resources/data/bodacious_berries/recipes/berry_harvester.json +++ b/src/main/resources/data/bodacious_berries/recipes/berry_harvester.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "bodacious_berries:berry_harvester", + "id": "bodacious_berries:berry_harvester", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/badlands.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/badlands.json index ab86a700..90fcb219 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/badlands.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/badlands.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_badlands", + "id": "bodacious_berries:chorus_berry_juice_badlands", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/birch_forest.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/birch_forest.json index a48956b8..5f4603e0 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/birch_forest.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/birch_forest.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_birch_forest", + "id": "bodacious_berries:chorus_berry_juice_birch_forest", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dark_forest.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dark_forest.json index 5ca8e05f..d73f24cb 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dark_forest.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dark_forest.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_dark_forest", + "id": "bodacious_berries:chorus_berry_juice_dark_forest", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/desert.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/desert.json index dcb848d3..a7a94eb4 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/desert.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/desert.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_desert", + "id": "bodacious_berries:chorus_berry_juice_desert", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dripstone_caves.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dripstone_caves.json index 03de339e..c0329db6 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dripstone_caves.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/dripstone_caves.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_dripstone_caves", + "id": "bodacious_berries:chorus_berry_juice_dripstone_caves", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/flower_forest.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/flower_forest.json index 9a8c48e6..4e7b09d6 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/flower_forest.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/flower_forest.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_flower_forest", + "id": "bodacious_berries:chorus_berry_juice_flower_forest", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/forest.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/forest.json index 02f01555..3afa093e 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/forest.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/forest.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_forest", + "id": "bodacious_berries:chorus_berry_juice_forest", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/jungle.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/jungle.json index ba4f566b..c46d8221 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/jungle.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/jungle.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_jungle", + "id": "bodacious_berries:chorus_berry_juice_jungle", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/lush_caves.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/lush_caves.json index d56a18a4..2e2bd7af 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/lush_caves.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/lush_caves.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_lush_caves", + "id": "bodacious_berries:chorus_berry_juice_lush_caves", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/meadow.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/meadow.json index d660214f..46debf5d 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/meadow.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/meadow.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_meadow", + "id": "bodacious_berries:chorus_berry_juice_meadow", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/mushroom_fields.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/mushroom_fields.json index 5ecae782..549a4019 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/mushroom_fields.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/mushroom_fields.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_mushroom_fields", + "id": "bodacious_berries:chorus_berry_juice_mushroom_fields", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/ocean.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/ocean.json index 76877b2d..dd9bebd0 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/ocean.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/ocean.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_ocean", + "id": "bodacious_berries:chorus_berry_juice_ocean", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/plains.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/plains.json index 5cd1d44e..8ed54ed5 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/plains.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/plains.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_plains", + "id": "bodacious_berries:chorus_berry_juice_plains", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/savanna.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/savanna.json index 78bcbcf4..5b894b27 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/savanna.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/savanna.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_savanna", + "id": "bodacious_berries:chorus_berry_juice_savanna", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/snowy_slopes.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/snowy_slopes.json index 28242cf4..61d7425a 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/snowy_slopes.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/snowy_slopes.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_snowy_slopes", + "id": "bodacious_berries:chorus_berry_juice_snowy_slopes", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/sunflower_plains.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/sunflower_plains.json index fff0707f..a7213a05 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/sunflower_plains.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/sunflower_plains.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_sunflower_plains", + "id": "bodacious_berries:chorus_berry_juice_sunflower_plains", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/swamp.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/swamp.json index 4fc5138e..96aca222 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/swamp.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/swamp.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_swamp", + "id": "bodacious_berries:chorus_berry_juice_swamp", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/taiga.json b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/taiga.json index d4d8f407..09fa3400 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juice/chorus/taiga.json +++ b/src/main/resources/data/bodacious_berries/recipes/juice/chorus/taiga.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "bodacious_berries:chorus_berry_juice_taiga", + "id": "bodacious_berries:chorus_berry_juice_taiga", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/bodacious_berries/recipes/juicer.json b/src/main/resources/data/bodacious_berries/recipes/juicer.json index 9321f4cd..645ef34e 100644 --- a/src/main/resources/data/bodacious_berries/recipes/juicer.json +++ b/src/main/resources/data/bodacious_berries/recipes/juicer.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "bodacious_berries:juicer", + "id": "bodacious_berries:juicer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/c/tags/blocks/berry_bushes.json b/src/main/resources/data/c/tags/blocks/berry_bushes.json index cd5f0792..0bae2cc5 100644 --- a/src/main/resources/data/c/tags/blocks/berry_bushes.json +++ b/src/main/resources/data/c/tags/blocks/berry_bushes.json @@ -1,5 +1,5 @@ { - "replace": "false", + "replace": false, "values": [ "minecraft:sweet_berry_bush", "bodacious_berries:strawberry_bush", diff --git a/src/main/resources/data/c/tags/items/berries.json b/src/main/resources/data/c/tags/items/berries.json deleted file mode 100644 index 189c057f..00000000 --- a/src/main/resources/data/c/tags/items/berries.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:sweet_berries", - "#c:glow_berries", - "#c:saskatoon_berries", - "#c:raspberries", - "#c:strawberries", - "#c:blackberries", - "#c:chorus_berries", - "#c:rainberries", - "#c:lingonberries", - "#c:grapes", - "#c:goji_berries", - "#c:gooseberries", - "#c:cloudberries", - "#c:blueberries", - "#c:elderberries", - "#c:salmonberries", - "#c:yellow_berries", - "#c:green_berries", - "#c:purple_berries", - "#c:orange_berries", - "#c:green_berries" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/foods/berries.json b/src/main/resources/data/c/tags/items/foods/berries.json new file mode 100644 index 00000000..69a27766 --- /dev/null +++ b/src/main/resources/data/c/tags/items/foods/berries.json @@ -0,0 +1,26 @@ +{ + "replace": false, + "values": [ + "#c:foods/sweet_berries", + "#c:foods/glow_berries", + "#c:foods/saskatoon_berries", + "#c:foods/raspberries", + "#c:foods/strawberries", + "#c:foods/blackberries", + "#c:foods/chorus_berries", + "#c:foods/rainberries", + "#c:foods/lingonberries", + "#c:foods/grapes", + "#c:foods/goji_berries", + "#c:foods/gooseberries", + "#c:foods/cloudberries", + "#c:foods/blueberries", + "#c:foods/elderberries", + "#c:foods/salmonberries", + "#c:foods/yellow_berries", + "#c:foods/green_berries", + "#c:foods/purple_berries", + "#c:foods/orange_berries", + "#c:foods/green_berries" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/blackberries.json b/src/main/resources/data/c/tags/items/foods/blackberries.json similarity index 90% rename from src/main/resources/data/c/tags/items/blackberries.json rename to src/main/resources/data/c/tags/items/foods/blackberries.json index f4138170..be680e78 100644 --- a/src/main/resources/data/c/tags/items/blackberries.json +++ b/src/main/resources/data/c/tags/items/foods/blackberries.json @@ -1,5 +1,5 @@ { - "replace": "false", + "replace": false, "values": [ "bodacious_berries:blackberries", { diff --git a/src/main/resources/data/c/tags/items/blueberries.json b/src/main/resources/data/c/tags/items/foods/blueberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/blueberries.json rename to src/main/resources/data/c/tags/items/foods/blueberries.json diff --git a/src/main/resources/data/c/tags/items/cherries.json b/src/main/resources/data/c/tags/items/foods/cherries.json similarity index 100% rename from src/main/resources/data/c/tags/items/cherries.json rename to src/main/resources/data/c/tags/items/foods/cherries.json diff --git a/src/main/resources/data/c/tags/items/chorus_berries.json b/src/main/resources/data/c/tags/items/foods/chorus_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/chorus_berries.json rename to src/main/resources/data/c/tags/items/foods/chorus_berries.json diff --git a/src/main/resources/data/c/tags/items/cloudberries.json b/src/main/resources/data/c/tags/items/foods/cloudberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/cloudberries.json rename to src/main/resources/data/c/tags/items/foods/cloudberries.json diff --git a/src/main/resources/data/c/tags/items/cranberries.json b/src/main/resources/data/c/tags/items/foods/cranberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/cranberries.json rename to src/main/resources/data/c/tags/items/foods/cranberries.json diff --git a/src/main/resources/data/c/tags/items/elderberries.json b/src/main/resources/data/c/tags/items/foods/elderberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/elderberries.json rename to src/main/resources/data/c/tags/items/foods/elderberries.json diff --git a/src/main/resources/data/c/tags/items/fruits.json b/src/main/resources/data/c/tags/items/foods/fruits.json similarity index 64% rename from src/main/resources/data/c/tags/items/fruits.json rename to src/main/resources/data/c/tags/items/foods/fruits.json index 0697ef11..e3ad2aee 100644 --- a/src/main/resources/data/c/tags/items/fruits.json +++ b/src/main/resources/data/c/tags/items/foods/fruits.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#c:berries" + "#c:foods/berries" ] } \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/glow_berries.json b/src/main/resources/data/c/tags/items/foods/glow_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/glow_berries.json rename to src/main/resources/data/c/tags/items/foods/glow_berries.json diff --git a/src/main/resources/data/c/tags/items/goji_berries.json b/src/main/resources/data/c/tags/items/foods/goji_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/goji_berries.json rename to src/main/resources/data/c/tags/items/foods/goji_berries.json diff --git a/src/main/resources/data/c/tags/items/gooseberries.json b/src/main/resources/data/c/tags/items/foods/gooseberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/gooseberries.json rename to src/main/resources/data/c/tags/items/foods/gooseberries.json diff --git a/src/main/resources/data/c/tags/items/grapes.json b/src/main/resources/data/c/tags/items/foods/grapes.json similarity index 100% rename from src/main/resources/data/c/tags/items/grapes.json rename to src/main/resources/data/c/tags/items/foods/grapes.json diff --git a/src/main/resources/data/c/tags/items/green_berries.json b/src/main/resources/data/c/tags/items/foods/green_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/green_berries.json rename to src/main/resources/data/c/tags/items/foods/green_berries.json diff --git a/src/main/resources/data/c/tags/items/juices.json b/src/main/resources/data/c/tags/items/foods/juices.json similarity index 100% rename from src/main/resources/data/c/tags/items/juices.json rename to src/main/resources/data/c/tags/items/foods/juices.json diff --git a/src/main/resources/data/c/tags/items/lingonberries.json b/src/main/resources/data/c/tags/items/foods/lingonberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/lingonberries.json rename to src/main/resources/data/c/tags/items/foods/lingonberries.json diff --git a/src/main/resources/data/c/tags/items/orange_berries.json b/src/main/resources/data/c/tags/items/foods/orange_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/orange_berries.json rename to src/main/resources/data/c/tags/items/foods/orange_berries.json diff --git a/src/main/resources/data/c/tags/items/purple_berries.json b/src/main/resources/data/c/tags/items/foods/purple_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/purple_berries.json rename to src/main/resources/data/c/tags/items/foods/purple_berries.json diff --git a/src/main/resources/data/c/tags/items/rainberries.json b/src/main/resources/data/c/tags/items/foods/rainberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/rainberries.json rename to src/main/resources/data/c/tags/items/foods/rainberries.json diff --git a/src/main/resources/data/c/tags/items/raspberries.json b/src/main/resources/data/c/tags/items/foods/raspberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/raspberries.json rename to src/main/resources/data/c/tags/items/foods/raspberries.json diff --git a/src/main/resources/data/c/tags/items/salmonberries.json b/src/main/resources/data/c/tags/items/foods/salmonberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/salmonberries.json rename to src/main/resources/data/c/tags/items/foods/salmonberries.json diff --git a/src/main/resources/data/c/tags/items/saskatoon_berries.json b/src/main/resources/data/c/tags/items/foods/saskatoon_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/saskatoon_berries.json rename to src/main/resources/data/c/tags/items/foods/saskatoon_berries.json diff --git a/src/main/resources/data/c/tags/items/strawberries.json b/src/main/resources/data/c/tags/items/foods/strawberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/strawberries.json rename to src/main/resources/data/c/tags/items/foods/strawberries.json diff --git a/src/main/resources/data/c/tags/items/sweet_berries.json b/src/main/resources/data/c/tags/items/foods/sweet_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/sweet_berries.json rename to src/main/resources/data/c/tags/items/foods/sweet_berries.json diff --git a/src/main/resources/data/c/tags/items/yellow_berries.json b/src/main/resources/data/c/tags/items/foods/yellow_berries.json similarity index 100% rename from src/main/resources/data/c/tags/items/yellow_berries.json rename to src/main/resources/data/c/tags/items/foods/yellow_berries.json diff --git a/src/main/resources/data/dehydration/tags/items/hydrating_drinks.json b/src/main/resources/data/dehydration/tags/items/hydrating_drinks.json index 361fa813..86301d6a 100644 --- a/src/main/resources/data/dehydration/tags/items/hydrating_drinks.json +++ b/src/main/resources/data/dehydration/tags/items/hydrating_drinks.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#c:juices" + "#c:foods/juices" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/bee_growables.json b/src/main/resources/data/minecraft/tags/blocks/bee_growables.json index aa29ab8e..859c63a3 100644 --- a/src/main/resources/data/minecraft/tags/blocks/bee_growables.json +++ b/src/main/resources/data/minecraft/tags/blocks/bee_growables.json @@ -1,5 +1,5 @@ { - "replace": "false", + "replace": false, "values": [ "#c:berry_bushes" ] diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json index a645d72e..1eafd570 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,5 +1,5 @@ { - "replace": "false", + "replace": false, "values": [ "#c:berry_bushes", "bodacious_berries:berry_harvester" diff --git a/src/main/resources/data/minecraft/tags/items/fox_food.json b/src/main/resources/data/minecraft/tags/items/fox_food.json index 0697ef11..e3ad2aee 100644 --- a/src/main/resources/data/minecraft/tags/items/fox_food.json +++ b/src/main/resources/data/minecraft/tags/items/fox_food.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#c:berries" + "#c:foods/berries" ] } \ No newline at end of file