Dev Commit

src/main/java/net/doppelr/lemonmates/AllBlockStateProperties.java

@@ -0,0 +1,21 @@
+package net.doppelr.lemonmates;
+
+import net.doppelr.lemonmates.block.properties.ApplicableFluidsToFluidContainer;
+import net.doppelr.lemonmates.block.properties.FruitSlices;
+import net.doppelr.lemonmates.block.properties.StrawsVariants;
+import net.doppelr.lemonmates.block.properties.UmbrellaVariants;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+import net.minecraft.world.level.block.state.properties.EnumProperty;
+import net.minecraft.world.level.block.state.properties.IntegerProperty;
+
+public class AllBlockStateProperties {
+    public static final IntegerProperty DRINK_LEVEL = IntegerProperty.create("drink_level", 0, 2);
+    public static final EnumProperty<StrawsVariants> STRAWS = EnumProperty.create("straw", StrawsVariants.class);
+    public static final BooleanProperty ICE_CUBES = BooleanProperty.create("has_ice");
+    public static final EnumProperty<FruitSlices> FRUIT_SLICES = EnumProperty.create("fruit_slice", FruitSlices.class);
+    public static final EnumProperty<UmbrellaVariants> UMBRELLAS = EnumProperty.create("umbrella", UmbrellaVariants.class);
+    public static final EnumProperty<ApplicableFluidsToFluidContainer> APPLICABLE_FLUID_TO_CONTAINER = EnumProperty.create("fluid", ApplicableFluidsToFluidContainer.class);
+
+    public static final IntegerProperty JUG_LEVEL = IntegerProperty.create("jug_level", 0, 8);
+    public static final BooleanProperty CAN_POUR = BooleanProperty.create("can_pour");
+}

src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java

@@ -34,6 +34,10 @@ public class AllCreativeModeTabs {
                 output.accept(ModBlocks.ORANGE_CRATE);
                 output.accept(ModBlocks.RASPBERRY_CRATE);
 
+                // Misc
+                output.accept(ModBlocks.LEMONADE_GLASS);
+                output.accept(ModBlocks.TERRACOTTA_LEMONADE_JUG);
+
                 // Finished Lemonades
                 output.accept(ModItems.CITRON_LEMONADE_BOTTLE);
                 output.accept(ModItems.ORANGE_LEMONADE_BOTTLE);

src/main/java/net/doppelr/lemonmates/AllDataComponents.java

@@ -0,0 +1,42 @@
+package net.doppelr.lemonmates;
+
+import com.mojang.serialization.Codec;
+import net.doppelr.lemonmates.block.properties.ApplicableFluidsToFluidContainer;
+import net.minecraft.core.component.DataComponentType;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.util.ExtraCodecs;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.registries.DeferredRegister;
+
+import java.util.function.UnaryOperator;
+
+public class AllDataComponents {
+    private static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(Registries.DATA_COMPONENT_TYPE, LemonMates.MOD_ID);
+
+    public static final DataComponentType<Integer> JUG_LEVEL = register(
+            "jug_level",
+            builder -> builder.persistent(ExtraCodecs.NON_NEGATIVE_INT).networkSynchronized(ByteBufCodecs.VAR_INT)
+    );
+
+    public static final DataComponentType<ApplicableFluidsToFluidContainer> APPLICABLE_FLUID_TO_CONTAINER = register(
+            "fluid",
+            builder -> builder.persistent(ApplicableFluidsToFluidContainer.CODEC).networkSynchronized(ApplicableFluidsToFluidContainer.STREAM_CODEC)
+    );
+
+    public static final DataComponentType<Boolean> CAN_POUR = register(
+            "can_pour",
+            builder -> builder.persistent(Codec.BOOL).networkSynchronized(ByteBufCodecs.BOOL)
+    );
+
+    private static <T> DataComponentType<T> register(String name, UnaryOperator<DataComponentType.Builder<T>> builder) {
+        DataComponentType<T> type = builder.apply(DataComponentType.builder()).build();
+        DATA_COMPONENTS.register(name, () -> type);
+        return type;
+    }
+
+    public static void register(IEventBus modEventBus) {
+        DATA_COMPONENTS.register(modEventBus);
+    }
+
+}

src/main/java/net/doppelr/lemonmates/LemonMates.java

@@ -1,19 +1,17 @@
 package net.doppelr.lemonmates;
 
+import com.mojang.logging.LogUtils;
 import net.doppelr.lemonmates.block.ModBlocks;
 import net.doppelr.lemonmates.block.entity.ModBlockEntities;
 import net.doppelr.lemonmates.datagen.DataGenerators;
-import net.doppelr.lemonmates.fluid.ModFluids;
 import net.doppelr.lemonmates.entity.ModEntities;
+import net.doppelr.lemonmates.fluid.ModFluids;
 import net.doppelr.lemonmates.item.ModItems;
 import net.minecraft.resources.ResourceLocation;
-import org.slf4j.Logger;
-
-import com.mojang.logging.LogUtils;
-
 import net.neoforged.bus.api.IEventBus;
-import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.common.Mod;
+import org.slf4j.Logger;
 
 @Mod(LemonMates.MOD_ID)
 public class LemonMates {
@@ -22,6 +20,7 @@ public class LemonMates {
 
     public LemonMates(IEventBus modEventBus, ModContainer modContainer) {
         AllCreativeModeTabs.register(modEventBus);
+        AllDataComponents.register(modEventBus);
 
         ModItems.register(modEventBus);
         ModBlocks.register(modEventBus);

src/main/java/net/doppelr/lemonmates/block/ModBlocks.java

@@ -114,6 +114,14 @@ public class ModBlocks {
                 .sound(SoundType.GLASS)
         ));
 
+    public static final DeferredBlock<Block> TERRACOTTA_LEMONADE_JUG = registerBlockWithoutBlockItem("terracotta_lemonade_jug",
+            () -> new ModJugBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TERRACOTTA).noOcclusion()));
+
+    private static <T extends Block> DeferredBlock<T> registerBlockWithoutBlockItem(String name, Supplier <T> block) {
+        DeferredBlock<T> toReturn = BLOCKS.register(name, block);
+        return toReturn;
+    }
+
     private static <T extends Block> DeferredBlock<T> registerBlock(String name, Supplier <T> block) {
         DeferredBlock<T> toReturn = BLOCKS.register(name, block);
         registerBlockItem(name, toReturn);