diff --git a/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java b/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java index 67e59d1..00ff0fa 100644 --- a/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java +++ b/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java @@ -171,7 +171,7 @@ private static ItemStack lemonadeJugStack(ItemStack stack) { // Glass output.accept(ModBlocks.LEMONADE_GLASS); - output.accept(ModBlocks.LEMONADE_JUG_TERRACOTTA); + output.accept(lemonadeJugStack(ModItems.LEMONADE_JUG_TERRACOTTA.toStack())); output.accept(ModItems.ICE_CUBES); // Straws diff --git a/src/main/java/net/doppelr/lemonmates/LemonMatesTooltipUtils.java b/src/main/java/net/doppelr/lemonmates/LemonMatesTooltipUtils.java index acaf17e..43781f4 100644 --- a/src/main/java/net/doppelr/lemonmates/LemonMatesTooltipUtils.java +++ b/src/main/java/net/doppelr/lemonmates/LemonMatesTooltipUtils.java @@ -10,17 +10,6 @@ public class LemonMatesTooltipUtils { - public static void createCustomTooltip(String id, boolean hasConditionalBehaviour, List components) { - createShiftText(components); - if (Screen.hasShiftDown()) { - components.add(empty()); - components.addAll(getBasicSummary(id)); - if (hasConditionalBehaviour) { - createConditionalBehaviourTooltip(id, 1, components); - } - } - } - public static void createCustomTooltip(String id, boolean hasConditionalBehaviour, List components, Object... args) { createShiftText(components); if (Screen.hasShiftDown()) { @@ -57,23 +46,17 @@ public static List createGeneric(MutableComponent component) { return textComponentIndentHelper(component, FontHelper.Palette.STANDARD_CREATE, 1); } - public static void createAdditionalConditionalBehaviourTooltip(String id, int sequence, List components) { + public static void createAdditionalConditionalBehaviourTooltip(String id, int sequence, List components, Object... args) { if (Screen.hasShiftDown()) { - components.addAll(getCondition(id, sequence)); - components.addAll(getBehaviour(id, sequence)); + components.addAll(getCondition(id, sequence, args)); + components.addAll(getBehaviour(id, sequence, args)); } } - public static void createConditionalBehaviourTooltip(String id, int sequence, List components) { - components.add(empty()); - components.addAll(getCondition(id, sequence)); - components.addAll(getBehaviour(id, sequence)); - } - public static void createConditionalBehaviourTooltip(String id, int sequence, List components, Object... args) { components.add(empty()); components.addAll(getCondition(id, sequence, args)); - components.addAll(getBehaviour(id, sequence)); + components.addAll(getBehaviour(id, sequence, args)); } public static MutableComponent empty() { @@ -84,16 +67,12 @@ public static List getBasicSummary(String id) { return FontHelper.cutTextComponent(Component.translatable(id + ".tooltip.summary"), FontHelper.Palette.STANDARD_CREATE); } - public static List getCondition(String id, int sequence) { - return FontHelper.cutTextComponent(Component.translatable(id + ".tooltip.condition" + sequence), FontHelper.Palette.GRAY); - } - public static List getCondition(String id, int sequence, Object... args) { return FontHelper.cutTextComponent(Component.translatable(id + ".tooltip.condition" + sequence, args), FontHelper.Palette.GRAY); } - public static List getBehaviour(String id, int sequence) { - return textComponentIndentHelper(Component.translatable(id + ".tooltip.behaviour" + sequence), FontHelper.Palette.STANDARD_CREATE, 1); + public static List getBehaviour(String id, int sequence, Object... args) { + return textComponentIndentHelper(Component.translatable(id + ".tooltip.behaviour" + sequence, args), FontHelper.Palette.STANDARD_CREATE, 1); } public static List textComponentIndentHelper(Component component, FontHelper.Palette palette, int indent) { diff --git a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java index 3858d51..9d022ee 100644 --- a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java +++ b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java @@ -128,6 +128,8 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev if (state.getValue(FLUID) == ApplicableFluidsToFluidContainer.NONE || state.getValue(DRINK_LEVEL) == 0) { level.setBlockAndUpdate(pos, state.setValue(FLUID, pouredFluid).setValue(DRINK_LEVEL, blockDrinkLevel)); jugItem.removeFromJugLevel(stack, player, newDrinkLevel); + if (stack.get(AllDataComponents.JUG_LEVEL) > 0) + level.playSound(player, pos, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); } } } else { diff --git a/src/main/java/net/doppelr/lemonmates/block/properties/ApplicableFluidsToFluidContainer.java b/src/main/java/net/doppelr/lemonmates/block/properties/ApplicableFluidsToFluidContainer.java index dc4e117..6a8fad0 100644 --- a/src/main/java/net/doppelr/lemonmates/block/properties/ApplicableFluidsToFluidContainer.java +++ b/src/main/java/net/doppelr/lemonmates/block/properties/ApplicableFluidsToFluidContainer.java @@ -6,6 +6,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.util.StringRepresentable; import net.minecraft.world.food.FoodProperties; +import org.jetbrains.annotations.NotNull; import java.util.Locale; @@ -34,7 +35,7 @@ public FoodProperties getProperties() { } @Override - public String getSerializedName() { + public @NotNull String getSerializedName() { return name().toLowerCase(Locale.ROOT); } } diff --git a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java index 1c0e8bc..5e92c88 100644 --- a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java +++ b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java @@ -7,6 +7,8 @@ import net.doppelr.lemonmates.block.properties.ApplicableFluidsToFluidContainer; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; @@ -23,6 +25,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; +import java.util.Locale; public class ModJugItem extends BlockItem { public ModJugItem(Block block, Properties properties) { @@ -57,15 +60,18 @@ public void removeFromJugLevel(ItemStack stack, Player player, int decrement) { } public void jugLevelHandling(ItemStack stack, Player player, ApplicableFluidsToFluidContainer fluid) { + Level level = player.level(); if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != fluid) this.setContainedFluid(stack, fluid); if (stack.get(AllDataComponents.JUG_LEVEL) == null || stack.get(AllDataComponents.JUG_LEVEL) == 0) { this.setJugLevel(stack, 4); + level.playSound(player, player.blockPosition(), SoundEvents.BOTTLE_FILL, SoundSource.PLAYERS, 1.0F, 1.0F); if (!player.getAbilities().instabuild) player.setItemInHand(InteractionHand.OFF_HAND, ModItems.BOTTLE_EMPTY.toStack()); } else if (stack.get(AllDataComponents.JUG_LEVEL) <= 4) { this.addToJugLevel(stack, 4); + level.playSound(player, player.blockPosition(), SoundEvents.BOTTLE_FILL, SoundSource.PLAYERS, 1.0F, 1.0F); if (!player.getAbilities().instabuild) player.setItemInHand(InteractionHand.OFF_HAND, ModItems.BOTTLE_EMPTY.toStack()); } else if (stack.get(AllDataComponents.JUG_LEVEL) < 8) { @@ -73,6 +79,7 @@ public void jugLevelHandling(ItemStack stack, Player player, ApplicableFluidsToF if (stack.get(AllDataComponents.JUG_LEVEL) > 4) incrementJugLevel = 8 - stack.get(AllDataComponents.JUG_LEVEL); this.addToJugLevel(stack, incrementJugLevel); + level.playSound(player, player.blockPosition(), SoundEvents.BOTTLE_FILL, SoundSource.PLAYERS, 1.0F, 1.0F); if (!player.getAbilities().instabuild) player.setItemInHand(InteractionHand.OFF_HAND, ModItems.BOTTLE_EMPTY.toStack()); } @@ -134,8 +141,10 @@ public InteractionResult useOn(UseOnContext context) { public void appendHoverText(ItemStack stack, @NotNull TooltipContext context, @NotNull List tooltipComponents, @NotNull TooltipFlag tooltipFlag) { String id = "block.lemonmates.lemonade_jug_terracotta"; boolean pour = stack.get(AllDataComponents.CAN_POUR) != null ? stack.get(AllDataComponents.CAN_POUR) : false; - //String currentfluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != ApplicableFluidsToFluidContainer.NONE ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : ApplicableFluidsToFluidContainer.NONE ; - LemonMatesTooltipUtils.createCustomTooltip(id, true, tooltipComponents, pour );// , currentfluid); + ApplicableFluidsToFluidContainer applicableFluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : ApplicableFluidsToFluidContainer.NONE; + Component fluid = Component.translatable("jugFluid.lemonmates." + applicableFluid.getSerializedName()); + LemonMatesTooltipUtils.createCustomTooltip(id, true, tooltipComponents, pour, fluid); LemonMatesTooltipUtils.createAdditionalConditionalBehaviourTooltip(id, 2, tooltipComponents); + LemonMatesTooltipUtils.createAdditionalConditionalBehaviourTooltip(id, 3, tooltipComponents, fluid); } } diff --git a/src/main/resources/assets/lemonmates/blockstates/lemonade_glass_decorated.json b/src/main/resources/assets/lemonmates/blockstates/lemonade_glass_decorated.json deleted file mode 100644 index 908bc78..0000000 --- a/src/main/resources/assets/lemonmates/blockstates/lemonade_glass_decorated.json +++ /dev/null @@ -1,1122 +0,0 @@ -{ - "multipart": [ - { - "when": { - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass" - } - }, - { - "when": { - "drink_level": "1", - "facing": "north", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half" - } - }, - { - "when": { - "drink_level": "2", - "facing": "north", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full" - } - }, - { - "when": { - "drink_level": "1", - "facing": "north", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_yellow" - } - }, - { - "when": { - "drink_level": "2", - "facing": "north", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_yellow" - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "2", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/ice_cube_full" - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "1", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/ice_cube_half" - } - }, - { - "when": { - "fruit_slice": "citron", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/lemon_slice" - } - }, - { - "when": { - "fruit_slice": "orange", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/orange_slice" - } - }, - { - "when": { - "umbrella": "red_white", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_1" - } - }, - { - "when": { - "umbrella": "yellow_white", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_2" - } - }, - { - "when": { - "umbrella": "black_purple", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_3" - } - }, - { - "when": { - "umbrella": "orange_white", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_4" - } - }, - { - "when": { - "straw": "basic", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_basic" - } - }, - { - "when": { - "straw": "rainbow", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_rainbow" - } - }, - { - "when": { - "straw": "trans", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_trans" - } - }, - { - "when": { - "straw": "nonbinary", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_nonbinary" - } - }, - { - "when": { - "straw": "lesbian", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_lesbian" - } - }, - { - "when": { - "straw": "gay", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_gay" - } - }, - { - "when": { - "straw": "genderfluid", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_genderfluid" - } - }, - { - "when": { - "straw": "ace", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_ace" - } - }, - { - "when": { - "straw": "aro", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_aro" - } - }, - { - "when": { - "straw": "aroace", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_aroace" - } - }, - { - "when": { - "straw": "agender", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_agender" - } - }, - { - "when": { - "straw": "bi", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_bi" - } - }, - { - "when": { - "straw": "pan", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_pan" - } - }, - { - "when": { - "straw": "german", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_german" - } - }, - { - "when": { - "straw": "omnisexual", - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/straw_omnisexual" - } - }, - - - { - "when": { - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass", - "y": 180 - } - }, - { - "when": { - "drink_level": "1", - "facing": "south", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half", - "y": 180 - } - }, - { - "when": { - "drink_level": "2", - "facing": "south", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full", - "y": 180 - } - }, - { - "when": { - "drink_level": "1", - "facing": "south", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_yellow", - "y": 180 - } - }, - { - "when": { - "drink_level": "2", - "facing": "south", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_yellow", - "y": 180 - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "2", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/ice_cube_full", - "y": 180 - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "1", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/ice_cube_half", - "y": 180 - } - }, - { - "when": { - "fruit_slice": "citron", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/lemon_slice", - "y": 180 - } - }, - { - "when": { - "fruit_slice": "orange", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/orange_slice", - "y": 180 - } - }, - { - "when": { - "umbrella": "red_white", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_1", - "y": 180 - } - }, - { - "when": { - "umbrella": "yellow_white", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_2", - "y": 180 - } - }, - { - "when": { - "umbrella": "black_purple", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_3", - "y": 180 - } - }, - { - "when": { - "umbrella": "orange_white", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_4", - "y": 180 - } - }, - { - "when": { - "straw": "basic", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_basic", - "y": 180 - } - }, - { - "when": { - "straw": "rainbow", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_rainbow", - "y": 180 - } - }, - { - "when": { - "straw": "trans", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_trans", - "y": 180 - } - }, - { - "when": { - "straw": "nonbinary", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_nonbinary", - "y": 180 - } - }, - { - "when": { - "straw": "lesbian", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_lesbian", - "y": 180 - } - }, - { - "when": { - "straw": "gay", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_gay", - "y": 180 - } - }, - { - "when": { - "straw": "genderfluid", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_genderfluid", - "y": 180 - } - }, - { - "when": { - "straw": "ace", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_ace", - "y": 180 - } - }, - { - "when": { - "straw": "aro", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_aro", - "y": 180 - } - }, - { - "when": { - "straw": "aroace", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_aroace", - "y": 180 - } - }, - { - "when": { - "straw": "agender", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_agender", - "y": 180 - } - }, - { - "when": { - "straw": "bi", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_bi", - "y": 180 - } - }, - { - "when": { - "straw": "pan", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_pan", - "y": 180 - } - }, - { - "when": { - "straw": "german", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_german", - "y": 180 - } - }, - { - "when": { - "straw": "omnisexual", - "facing": "south" - }, - "apply": { - "model": "lemonmates:block/straw_omnisexual", - "y": 180 - } - }, - - - { - "when": { - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass", - "y": 90 - } - }, - { - "when": { - "drink_level": "1", - "facing": "east", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half", - "y": 90 - } - }, - { - "when": { - "drink_level": "2", - "facing": "east", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full", - "y": 90 - } - }, - { - "when": { - "drink_level": "1", - "facing": "east", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_yellow", - "y": 90 - } - }, - { - "when": { - "drink_level": "2", - "facing": "east", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_yellow", - "y": 90 - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "2", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/ice_cube_full", - "y": 90 - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "1", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/ice_cube_half", - "y": 90 - } - }, - { - "when": { - "fruit_slice": "citron", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/lemon_slice", - "y": 90 - } - }, - { - "when": { - "fruit_slice": "orange", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/orange_slice", - "y": 90 - } - }, - { - "when": { - "umbrella": "red_white", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_1", - "y": 90 - } - }, - { - "when": { - "umbrella": "yellow_white", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_2", - "y": 90 - } - }, - { - "when": { - "umbrella": "black_purple", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_3", - "y": 90 - } - }, - { - "when": { - "umbrella": "orange_white", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_4", - "y": 90 - } - }, - { - "when": { - "straw": "basic", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_basic", - "y": 90 - } - }, - { - "when": { - "straw": "rainbow", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_rainbow", - "y": 90 - } - }, - { - "when": { - "straw": "trans", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_trans", - "y": 90 - } - }, - { - "when": { - "straw": "nonbinary", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_nonbinary", - "y": 90 - } - }, - { - "when": { - "straw": "lesbian", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_lesbian", - "y": 90 - } - }, - { - "when": { - "straw": "gay", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_gay", - "y": 90 - } - }, - { - "when": { - "straw": "genderfluid", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_genderfluid", - "y": 90 - } - }, - { - "when": { - "straw": "ace", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_ace", - "y": 90 - } - }, - { - "when": { - "straw": "aro", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_aro", - "y": 90 - } - }, - { - "when": { - "straw": "aroace", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_aroace", - "y": 90 - } - }, - { - "when": { - "straw": "agender", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_agender", - "y": 90 - } - }, - { - "when": { - "straw": "bi", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_bi", - "y": 90 - } - }, - { - "when": { - "straw": "pan", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_pan", - "y": 90 - } - }, - { - "when": { - "straw": "german", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_german", - "y": 90 - } - }, - { - "when": { - "straw": "omnisexual", - "facing": "east" - }, - "apply": { - "model": "lemonmates:block/straw_omnisexual", - "y": 90 - } - }, - - - { - "when": { - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass", - "y": 270 - } - }, - { - "when": { - "drink_level": "1", - "facing": "west", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half", - "y": 270 - } - }, - { - "when": { - "drink_level": "2", - "facing": "west", - "fluid": "lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full", - "y": 270 - } - }, - { - "when": { - "drink_level": "1", - "facing": "west", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_yellow", - "y": 270 - } - }, - { - "when": { - "drink_level": "2", - "facing": "west", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_yellow", - "y": 270 - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "2", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/ice_cube_full", - "y": 270 - } - }, - { - "when": { - "has_ice": "true", - "drink_level": "1", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/ice_cube_half", - "y": 270 - } - }, - { - "when": { - "fruit_slice": "citron", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/lemon_slice", - "y": 270 - } - }, - { - "when": { - "fruit_slice": "orange", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/orange_slice", - "y": 270 - } - }, - { - "when": { - "umbrella": "red_white", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_1", - "y": 270 - } - }, - { - "when": { - "umbrella": "yellow_white", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_2", - "y": 270 - } - }, - { - "when": { - "umbrella": "black_purple", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_3", - "y": 270 - } - }, - { - "when": { - "umbrella": "orange_white", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/drink_umbrella_4", - "y": 270 - } - }, - { - "when": { - "straw": "basic", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_basic", - "y": 270 - } - }, - { - "when": { - "straw": "rainbow", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_rainbow", - "y": 270 - } - }, - { - "when": { - "straw": "trans", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_trans", - "y": 270 - } - }, - { - "when": { - "straw": "nonbinary", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_nonbinary", - "y": 270 - } - }, - { - "when": { - "straw": "lesbian", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_lesbian", - "y": 270 - } - }, - { - "when": { - "straw": "gay", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_gay", - "y": 270 - } - }, - { - "when": { - "straw": "genderfluid", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_genderfluid", - "y": 270 - } - }, - { - "when": { - "straw": "ace", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_ace", - "y": 270 - } - }, - { - "when": { - "straw": "aro", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_aro", - "y": 270 - } - }, - { - "when": { - "straw": "aroace", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_aroace", - "y": 270 - } - }, - { - "when": { - "straw": "agender", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_agender", - "y": 270 - } - }, - { - "when": { - "straw": "bi", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_bi", - "y": 270 - } - }, - { - "when": { - "straw": "pan", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_pan", - "y": 270 - } - }, - { - "when": { - "straw": "german", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_german", - "y": 270 - } - }, - { - "when": { - "straw": "omnisexual", - "facing": "west" - }, - "apply": { - "model": "lemonmates:block/straw_omnisexual", - "y": 270 - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/lang/en_us.json b/src/main/resources/assets/lemonmates/lang/en_us.json index fca917f..16712e4 100644 --- a/src/main/resources/assets/lemonmates/lang/en_us.json +++ b/src/main/resources/assets/lemonmates/lang/en_us.json @@ -172,11 +172,18 @@ "tag.fluid.c.lemonades": "Lemonades", "tag.fluid.c.plastic": "Plastic", + "jugFluid.lemonmates.none": "None", + "jugFluid.lemonmates.citron_lemonade": "Citron Lemonade", + "jugFluid.lemonmates.orange_lemonade": "Orange Lemonade", + "jugFluid.lemonmates.raspberry_lemonade": "Raspberry Lemonade", + "jugFluid.lemonmates.summermix_lemonade": "Summer-Mix Lemonade", + "jugFluid.lemonmates.watermelon_lemonade": "Watermelon Lemonade", + "block.lemonmates.lemonade_jug_terracotta.tooltip.summary": "A way to store your fluids _more aesthetically._", - "block.lemonmates.lemonade_jug_terracotta.tooltip.condition1": "_When Shift+R-Clicking with empty offhand_", - "block.lemonmates.lemonade_jug_terracotta.tooltip.behaviour1": "Toggle pouring functionality to either be _active or not._ *(Currently: %1$s)*", + "block.lemonmates.lemonade_jug_terracotta.tooltip.condition1": "_When Shift+R-Clicking with empty offhand_ (Currently able to pour: %1$s)", + "block.lemonmates.lemonade_jug_terracotta.tooltip.behaviour1": "Toggle pouring functionality to either be _active or not._ (Currently Pouring: %2$s)", "block.lemonmates.lemonade_jug_terracotta.tooltip.condition2": "_When R-Clicking onto a Lemonade Glass_", "block.lemonmates.lemonade_jug_terracotta.tooltip.behaviour2": "Pours the _fluid contained within_ into the glass.", "block.lemonmates.lemonade_jug_terracotta.tooltip.condition3": "_When R-Clicking in air with Lemonade Bottle in offhand_", - "block.lemonmates.lemonade_jug_terracotta.tooltip.behaviour3": "Pours the _fluid contained within_ into the jug. (Currently: %2$s)" + "block.lemonmates.lemonade_jug_terracotta.tooltip.behaviour3": "Pours the _fluid contained within_ into the jug. (Currently Pouring: %1$s)" } \ No newline at end of file