From 4065a646a529aec4839afe9335ebad1862b3fad4 Mon Sep 17 00:00:00 2001 From: Dakota Date: Sun, 31 May 2026 13:52:53 -0500 Subject: [PATCH] Bug fixes + moar adjustments --- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 6 +- .../recipes/misc/lemonade_jug_glass.json | 32 - .../recipes/misc/lemonade_jug_terracotta.json | 32 - .../blocks/lemonade_glass_decorated.json | 4 - .../lemonmates/AllCreativeModeTabs.java | 7 +- .../lemonmates/LemonMatesTooltipUtils.java | 6 +- .../doppelr/lemonmates/block/ModBlocks.java | 4 - .../block/ModDrinkingGlassBlock.java | 4 +- .../doppelr/lemonmates/block/ModJugBlock.java | 7 +- .../datagen/ModBlockLootTableProvider.java | 3 - .../lemonmates/datagen/ModRecipeProvider.java | 31 +- .../net/doppelr/lemonmates/item/ModItems.java | 3 + .../doppelr/lemonmates/item/ModJugItem.java | 75 +- .../blockstates/lemonade_glass_decorated.json | 1380 ----------------- .../blockstates/lemonade_jug_glass.json | 2 +- .../assets/lemonmates/lang/en_us.json | 2 +- .../models/block/ice_cube_full.json | 1 + .../models/block/ice_cube_half.json | 1 + .../block/lemonade_glass_decorated.json | 424 ----- .../models/block/lemonade_jug_glass.json | 23 +- .../models/block/lemonade_jug_terracotta.json | 14 + .../lemonmates/models/item/ice_cubes.json | 4 +- .../models/item/lemonade_glass_decorated.json | 423 ++++- .../recipe/shaped}/lemonade_jug_glass.json | 5 + .../shaped}/lemonade_jug_terracotta.json | 5 + 26 files changed, 575 insertions(+), 1926 deletions(-) delete mode 100644 src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_glass.json delete mode 100644 src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_terracotta.json delete mode 100644 src/generated/resources/data/lemonmates/loot_table/blocks/lemonade_glass_decorated.json delete mode 100644 src/main/resources/assets/lemonmates/blockstates/lemonade_glass_decorated.json delete mode 100644 src/main/resources/assets/lemonmates/models/block/lemonade_glass_decorated.json rename src/{generated/resources/data/lemonmates/recipe => main/resources/data/lemonmates/recipe/shaped}/lemonade_jug_glass.json (70%) rename src/{generated/resources/data/lemonmates/recipe => main/resources/data/lemonmates/recipe/shaped}/lemonade_jug_terracotta.json (66%) diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 838620e..7bde315 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2026-05-31T12:41:06.4543352 Loot Tables +// 1.21.1 2026-05-31T12:33:12.8145748 Loot Tables 7e6629cf425f2397f87b1a6c439f701aa8b4fd04 data/lemonmates/loot_table/blocks/citron_button.json 5ecfcd3e41895ce2db80738f891e13845547f945 data/lemonmates/loot_table/blocks/citron_crate.json 1126754d8c95732b55490a43313d49624d070270 data/lemonmates/loot_table/blocks/citron_door.json @@ -18,7 +18,6 @@ be56f3f3d40997839e2f5cafbdd671ad138bff15 data/lemonmates/loot_table/blocks/citro d4e59033f364cc2b689d470b73733bcad5a931a8 data/lemonmates/loot_table/blocks/citron_wall_sign.json 4098d61de0b4bf5314926c5a4b04f366f2f7f8d2 data/lemonmates/loot_table/blocks/citron_wood.json 52b02e8a86046b0714d06d30e507355d0db80338 data/lemonmates/loot_table/blocks/lemonade_glass.json -6cec54e70429e90771526e7e9654ddf9c135eced data/lemonmates/loot_table/blocks/lemonade_glass_decorated.json 823beb259369acb4fdd376e070194ff9e62c9466 data/lemonmates/loot_table/blocks/lemonade_jug_glass.json aed3ef01a3de02d9c3c734a23806caf4d1878430 data/lemonmates/loot_table/blocks/lemonade_jug_terracotta.json f904d74cc3fafb07d9e23051af019f5edaebaeae data/lemonmates/loot_table/blocks/orange_button.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 7caef74..c1a24e9 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21.1 2026-05-31T12:41:06.4572641 Recipes +// 1.21.1 2026-05-31T13:09:44.0424189 Recipes facd248ef881f97de28f9e5e269db79dc09c7fb3 data/lemonmates/advancement/recipes/building_blocks/citron.json 1d7c61d7aa66adee3bb6a9752e28e5b3481ff485 data/lemonmates/advancement/recipes/building_blocks/citron_crate.json 8c180e50e9625c1985dfc40e7be05f0293d92fd2 data/lemonmates/advancement/recipes/building_blocks/citron_planks.json @@ -28,8 +28,6 @@ ed7cc37c657142fcfb7a9f35e05ee108279cba8f data/lemonmates/advancement/recipes/mis 3f7b9d8f197674a62374728056c3fbb0390897b6 data/lemonmates/advancement/recipes/misc/citron_slice.json 8a5ff5088292e7db5904b0488942fcdeb4f3d8b7 data/lemonmates/advancement/recipes/misc/label_empty.json 2ce38d1b0a3191d6ccf0b53638f457b5a8c0f517 data/lemonmates/advancement/recipes/misc/lemonade_glass.json -42bd069b3e8b34bf2504b8845a13f913b13a3212 data/lemonmates/advancement/recipes/misc/lemonade_jug_glass.json -07794e11bca6b3f5a4541c23ce70e184079ba7f2 data/lemonmates/advancement/recipes/misc/lemonade_jug_terracotta.json 7090289653e8095ab022c12bc87396441acb7b00 data/lemonmates/advancement/recipes/misc/orange_from_crate.json 79dda7e25b11b57791df4af5f50cd05c55a68eb6 data/lemonmates/advancement/recipes/misc/orange_slice.json 02a69065c1431db74b184acb80e738e17de6d632 data/lemonmates/advancement/recipes/misc/preform.json @@ -73,8 +71,6 @@ a2e9563dd03da6f91007bce9d7f5ca443a86d2be data/lemonmates/recipe/citron_slice.jso 8a180511c751f3e23544d072d880c7d0cc60ccec data/lemonmates/recipe/citron_wood.json f37e26b1d661dbf1d288bc4fa2a3d2590aa307d7 data/lemonmates/recipe/label_empty.json 972a1051a558fd53ff3e93e533239e7822f32984 data/lemonmates/recipe/lemonade_glass.json -cc2f7168aee3730ff80483f5ad8eeb6f43c83dec data/lemonmates/recipe/lemonade_jug_glass.json -95577366693e19041ea153ada391de14ccdca07c data/lemonmates/recipe/lemonade_jug_terracotta.json fa5c3be35146baac35c21ac10ea3fce7aa431d80 data/lemonmates/recipe/orange.json 4fee22ae48a9903db8201e411fad82b780879c23 data/lemonmates/recipe/orange_boat.json 446643ff87c3cd0eea22285bb723163ae970c0d4 data/lemonmates/recipe/orange_button.json diff --git a/src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_glass.json b/src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_glass.json deleted file mode 100644 index 7055116..0000000 --- a/src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_glass.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_glass": { - "conditions": { - "items": [ - { - "items": "#c:glass_blocks" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "lemonmates:lemonade_jug_glass" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_glass" - ] - ], - "rewards": { - "recipes": [ - "lemonmates:lemonade_jug_glass" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_terracotta.json b/src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_terracotta.json deleted file mode 100644 index 9698b40..0000000 --- a/src/generated/resources/data/lemonmates/advancement/recipes/misc/lemonade_jug_terracotta.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_bricks": { - "conditions": { - "items": [ - { - "items": "#c:bricks" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "lemonmates:lemonade_jug_terracotta" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_bricks" - ] - ], - "rewards": { - "recipes": [ - "lemonmates:lemonade_jug_terracotta" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/lemonmates/loot_table/blocks/lemonade_glass_decorated.json b/src/generated/resources/data/lemonmates/loot_table/blocks/lemonade_glass_decorated.json deleted file mode 100644 index 8dd6c16..0000000 --- a/src/generated/resources/data/lemonmates/loot_table/blocks/lemonade_glass_decorated.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "random_sequence": "lemonmates:blocks/lemonade_glass_decorated" -} \ No newline at end of file diff --git a/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java b/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java index 00ff0fa..bcd87de 100644 --- a/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java +++ b/src/main/java/net/doppelr/lemonmates/AllCreativeModeTabs.java @@ -1,6 +1,7 @@ package net.doppelr.lemonmates; import net.doppelr.lemonmates.block.ModBlocks; +import net.doppelr.lemonmates.block.properties.ApplicableFluidsToFluidContainer; import net.doppelr.lemonmates.block.properties.StrawsVariants; import net.doppelr.lemonmates.block.properties.UmbrellaVariants; import net.doppelr.lemonmates.fluid.ModFluids; @@ -19,6 +20,8 @@ public class AllCreativeModeTabs { private static ItemStack lemonadeJugStack(ItemStack stack) { stack.set(AllDataComponents.CAN_POUR, false); + stack.set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, ApplicableFluidsToFluidContainer.NONE); + stack.set(AllDataComponents.JUG_LEVEL, 0); return stack; } @@ -43,6 +46,7 @@ private static ItemStack lemonadeJugStack(ItemStack stack) { // Misc output.accept(ModBlocks.LEMONADE_GLASS); output.accept(lemonadeJugStack(ModItems.LEMONADE_JUG_TERRACOTTA.toStack())); + output.accept(lemonadeJugStack(ModItems.LEMONADE_JUG_GLASS.toStack())); // Finished Lemonades output.accept(ModItems.CITRON_LEMONADE_BOTTLE); @@ -166,12 +170,13 @@ private static ItemStack lemonadeJugStack(ItemStack stack) { () -> CreativeModeTab.builder() .title(Component.translatable("itemGroup." + LemonMates.MOD_ID + ".serving")) .withTabsBefore(AllCreativeModeTabs.PROCESSING_CREATIVE_TAB.getKey()) - .icon(() -> new ItemStack(ModBlocks.LEMONADE_GLASS_DECORATED.get())) + .icon(() -> new ItemStack(ModItems.LEMONADE_GLASS_DECORATED.get())) .displayItems((params, output) -> { // Glass output.accept(ModBlocks.LEMONADE_GLASS); output.accept(lemonadeJugStack(ModItems.LEMONADE_JUG_TERRACOTTA.toStack())); + output.accept(lemonadeJugStack(ModItems.LEMONADE_JUG_GLASS.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 43781f4..33332ae 100644 --- a/src/main/java/net/doppelr/lemonmates/LemonMatesTooltipUtils.java +++ b/src/main/java/net/doppelr/lemonmates/LemonMatesTooltipUtils.java @@ -14,7 +14,7 @@ public static void createCustomTooltip(String id, boolean hasConditionalBehaviou createShiftText(components); if (Screen.hasShiftDown()) { components.add(empty()); - components.addAll(getBasicSummary(id)); + components.addAll(getBasicSummary(id, args)); if (hasConditionalBehaviour) { createConditionalBehaviourTooltip(id, 1, components, args); } @@ -63,8 +63,8 @@ public static MutableComponent empty() { return Component.literal(""); } - public static List getBasicSummary(String id) { - return FontHelper.cutTextComponent(Component.translatable(id + ".tooltip.summary"), FontHelper.Palette.STANDARD_CREATE); + public static List getBasicSummary(String id, Object... args) { + return FontHelper.cutTextComponent(Component.translatable(id + ".tooltip.summary", args), FontHelper.Palette.STANDARD_CREATE); } public static List getCondition(String id, int sequence, Object... args) { diff --git a/src/main/java/net/doppelr/lemonmates/block/ModBlocks.java b/src/main/java/net/doppelr/lemonmates/block/ModBlocks.java index 07567ec..e687395 100644 --- a/src/main/java/net/doppelr/lemonmates/block/ModBlocks.java +++ b/src/main/java/net/doppelr/lemonmates/block/ModBlocks.java @@ -118,10 +118,6 @@ public class ModBlocks { () -> new ModDrinkingGlassBlock(BlockBehaviour.Properties.of() .sound(SoundType.GLASS).pushReaction(PushReaction.DESTROY) )); - public static final DeferredBlock LEMONADE_GLASS_DECORATED = registerBlock("lemonade_glass_decorated", - () -> new ModDrinkingGlassBlock(BlockBehaviour.Properties.of() - .sound(SoundType.GLASS) - )); public static final DeferredBlock LEMONADE_JUG_TERRACOTTA = registerBlockWithoutBlockItem("lemonade_jug_terracotta", () -> new ModJugBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.FLOWER_POT).noOcclusion())); diff --git a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java index 9d022ee..febe16d 100644 --- a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java +++ b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java @@ -126,10 +126,10 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev int blockDrinkLevel = state.getValue(DRINK_LEVEL) == 1 ? 2 : newDrinkLevel; ApplicableFluidsToFluidContainer pouredFluid = stack.get(AllDataComponents.JUG_LEVEL) > 0 ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : state.getValue(FLUID); 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); + level.setBlockAndUpdate(pos, state.setValue(FLUID, pouredFluid).setValue(DRINK_LEVEL, blockDrinkLevel)); + jugItem.removeFromJugLevelWithBlockStateData(stack, player, newDrinkLevel); } } } else { diff --git a/src/main/java/net/doppelr/lemonmates/block/ModJugBlock.java b/src/main/java/net/doppelr/lemonmates/block/ModJugBlock.java index d87c368..3b3259b 100644 --- a/src/main/java/net/doppelr/lemonmates/block/ModJugBlock.java +++ b/src/main/java/net/doppelr/lemonmates/block/ModJugBlock.java @@ -59,17 +59,16 @@ public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, ItemStack itemStack = new ItemStack(this); int jugLevel = state.getValue(JUG_LEVEL); ApplicableFluidsToFluidContainer fluid = state.getValue(FLUID); - boolean canPour = state.getValue(CAN_POUR); - if (jugLevel > 0 || fluid != ApplicableFluidsToFluidContainer.NONE || canPour) { + if (jugLevel > 0 || fluid != ApplicableFluidsToFluidContainer.NONE) { DataComponentMap.Builder map = DataComponentMap.builder(); map.set(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY .with(AllBlockStateProperties.JUG_LEVEL, jugLevel) .with(AllBlockStateProperties.APPLICABLE_FLUID_TO_CONTAINER, fluid) - .with(AllBlockStateProperties.CAN_POUR, canPour)) + .with(AllBlockStateProperties.CAN_POUR, false)) .set(AllDataComponents.JUG_LEVEL, jugLevel) .set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, fluid) - .set(AllDataComponents.CAN_POUR, canPour); + .set(AllDataComponents.CAN_POUR, false); itemStack.applyComponents(map.build()); } diff --git a/src/main/java/net/doppelr/lemonmates/datagen/ModBlockLootTableProvider.java b/src/main/java/net/doppelr/lemonmates/datagen/ModBlockLootTableProvider.java index 24886de..7bdc33b 100644 --- a/src/main/java/net/doppelr/lemonmates/datagen/ModBlockLootTableProvider.java +++ b/src/main/java/net/doppelr/lemonmates/datagen/ModBlockLootTableProvider.java @@ -128,9 +128,6 @@ protected void generate() { add(ModBlocks.LEMONADE_GLASS.get(), noDrop()); add(ModBlocks.LEMONADE_JUG_TERRACOTTA.get(), noDrop()); add(ModBlocks.LEMONADE_JUG_GLASS.get(), noDrop()); - - // Temp to fix datagen nagging - add(ModBlocks.LEMONADE_GLASS_DECORATED.get(), noDrop()); } @Override diff --git a/src/main/java/net/doppelr/lemonmates/datagen/ModRecipeProvider.java b/src/main/java/net/doppelr/lemonmates/datagen/ModRecipeProvider.java index 2014280..fc34816 100644 --- a/src/main/java/net/doppelr/lemonmates/datagen/ModRecipeProvider.java +++ b/src/main/java/net/doppelr/lemonmates/datagen/ModRecipeProvider.java @@ -1,5 +1,6 @@ package net.doppelr.lemonmates.datagen; +import net.doppelr.lemonmates.AllDataComponents; import net.doppelr.lemonmates.AllTags; import net.doppelr.lemonmates.LemonMates; import net.doppelr.lemonmates.block.ModBlocks; @@ -136,13 +137,13 @@ protected void buildRecipes(RecipeOutput recipeOutput) { .save(recipeOutput); // Lemonade Jug/Glass - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.LEMONADE_JUG_TERRACOTTA.get()) - .pattern("# #") - .pattern("# #") - .pattern(" # ") - .define('#', Tags.Items.BRICKS) - .unlockedBy("has_bricks", has(Tags.Items.BRICKS)) - .save(recipeOutput); +// ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.LEMONADE_JUG_TERRACOTTA.get()) +// .pattern("# #") +// .pattern("# #") +// .pattern(" # ") +// .define('#', Tags.Items.BRICKS) +// .unlockedBy("has_bricks", has(Tags.Items.BRICKS)) +// .save(recipeOutput); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.LEMONADE_GLASS.get()) .pattern(" ") @@ -153,14 +154,14 @@ protected void buildRecipes(RecipeOutput recipeOutput) { .unlockedBy("has_glass", has(Tags.Items.GLASS_BLOCKS)) .save(recipeOutput); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.LEMONADE_JUG_GLASS.get()) - .pattern("# #") - .pattern("# #") - .pattern(" B ") - .define('#', Tags.Items.GLASS_PANES) - .define('B', Tags.Items.GLASS_BLOCKS) - .unlockedBy("has_glass", has(Tags.Items.GLASS_BLOCKS)) - .save(recipeOutput); +// ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.LEMONADE_JUG_GLASS.get()) +// .pattern("# #") +// .pattern("# #") +// .pattern(" B ") +// .define('#', Tags.Items.GLASS_PANES) +// .define('B', Tags.Items.GLASS_BLOCKS) +// .unlockedBy("has_glass", has(Tags.Items.GLASS_BLOCKS)) +// .save(recipeOutput); // get Molds back ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.PREFORM.get(), 1) diff --git a/src/main/java/net/doppelr/lemonmates/item/ModItems.java b/src/main/java/net/doppelr/lemonmates/item/ModItems.java index db46a61..939046c 100644 --- a/src/main/java/net/doppelr/lemonmates/item/ModItems.java +++ b/src/main/java/net/doppelr/lemonmates/item/ModItems.java @@ -161,6 +161,9 @@ public class ModItems { /** Move registration to enum -> {@link UmbrellaVariants} **/ + public static final DeferredItem LEMONADE_GLASS_DECORATED = ITEMS.register("lemonade_glass_decorated", + () -> new Item(new Item.Properties())); + public static final DeferredItem LEMONADE_JUG_TERRACOTTA = ITEMS.register("lemonade_jug_terracotta", () -> new ModJugItem(ModBlocks.LEMONADE_JUG_TERRACOTTA.get(), new Item.Properties().stacksTo(1))); public static final DeferredItem LEMONADE_JUG_GLASS = ITEMS.register("lemonade_jug_glass", diff --git a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java index 5e92c88..3c72716 100644 --- a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java +++ b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java @@ -6,6 +6,8 @@ import net.doppelr.lemonmates.block.ModDrinkingGlassBlock; import net.doppelr.lemonmates.block.properties.ApplicableFluidsToFluidContainer; import net.minecraft.core.BlockPos; +import net.minecraft.core.component.DataComponentMap; +import net.minecraft.core.component.DataComponents; import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -16,6 +18,7 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.BlockItemStateProperties; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; @@ -25,7 +28,6 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.Locale; public class ModJugItem extends BlockItem { public ModJugItem(Block block, Properties properties) { @@ -38,7 +40,11 @@ public void setPourAbility(ItemStack stack, boolean pour) { } public void setContainedFluid(ItemStack stack, ApplicableFluidsToFluidContainer fluid) { - stack.set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, fluid); + if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == ApplicableFluidsToFluidContainer.NONE + || stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == fluid) + stack.set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, fluid); + else if (stack.get(AllDataComponents.JUG_LEVEL) != null && stack.get(AllDataComponents.JUG_LEVEL) == 0) + stack.set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, fluid); } public void setJugLevel(ItemStack stack, int jugLevel) { @@ -50,35 +56,82 @@ public void addToJugLevel(ItemStack stack, int increment) { stack.set(AllDataComponents.JUG_LEVEL, stack.get(AllDataComponents.JUG_LEVEL) + increment); } + public void addToJugLevelWithBlockStateData(ItemStack stack, int increment) { + if (stack.get(AllDataComponents.JUG_LEVEL) != null) { + int f = stack.get(AllDataComponents.JUG_LEVEL) + increment; + this.addToJugLevel(stack, increment); + + if (stack.get(DataComponents.BLOCK_STATE) != null) { + DataComponentMap.Builder map = DataComponentMap.builder(); + + ApplicableFluidsToFluidContainer applicableFluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : ApplicableFluidsToFluidContainer.NONE; + + map.set(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY + .with(AllBlockStateProperties.JUG_LEVEL, f) + .with(AllBlockStateProperties.APPLICABLE_FLUID_TO_CONTAINER, applicableFluid)) + .set(AllDataComponents.JUG_LEVEL, f) + .set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, applicableFluid); + + stack.applyComponents(map.build()); + } + } + } + public void removeFromJugLevel(ItemStack stack, Player player, int decrement) { if (!player.getAbilities().instabuild) if (stack.get(AllDataComponents.JUG_LEVEL) != null) { int f = stack.get(AllDataComponents.JUG_LEVEL) - decrement; if (f >= 0 && f <= 8) - stack.set(AllDataComponents.JUG_LEVEL, stack.get(AllDataComponents.JUG_LEVEL) - decrement); + stack.set(AllDataComponents.JUG_LEVEL, f); } } + public void removeFromJugLevelWithBlockStateData(ItemStack stack, Player player, int decrement) { + if (!player.getAbilities().instabuild) { + if (stack.get(AllDataComponents.JUG_LEVEL) != null) { + int f = stack.get(AllDataComponents.JUG_LEVEL) - decrement; + this.removeFromJugLevel(stack, player, decrement); + + if (stack.get(DataComponents.BLOCK_STATE) != null) { + DataComponentMap.Builder map = DataComponentMap.builder(); + + ApplicableFluidsToFluidContainer applicableFluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : ApplicableFluidsToFluidContainer.NONE; + + map.set(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY + .with(AllBlockStateProperties.JUG_LEVEL, f) + .with(AllBlockStateProperties.APPLICABLE_FLUID_TO_CONTAINER, applicableFluid)) + .set(AllDataComponents.JUG_LEVEL, f) + .set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, applicableFluid); + + if (f >= 0 && f <= 8) + stack.applyComponents(map.build()); + } + } + } + } + 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); + boolean checkFluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null && (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == fluid || stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == ApplicableFluidsToFluidContainer.NONE); + 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); + } else if (stack.get(AllDataComponents.JUG_LEVEL) <= 4 && checkFluid) { + this.addToJugLevelWithBlockStateData(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) { + } else if (stack.get(AllDataComponents.JUG_LEVEL) < 8 && checkFluid) { int incrementJugLevel = 4; if (stack.get(AllDataComponents.JUG_LEVEL) > 4) incrementJugLevel = 8 - stack.get(AllDataComponents.JUG_LEVEL); - this.addToJugLevel(stack, incrementJugLevel); + this.addToJugLevelWithBlockStateData(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()); @@ -98,6 +151,11 @@ public void jugLevelHandling(ItemStack stack, Player player, ApplicableFluidsToF .setValue(AllBlockStateProperties.CAN_POUR, canPour) : null; } + @Override + protected boolean canPlace(BlockPlaceContext context, BlockState state) { + return super.canPlace(context, state) && !context.getItemInHand().get(AllDataComponents.CAN_POUR); + } + @Override public InteractionResult useOn(UseOnContext context) { ItemStack stack = context.getItemInHand(); @@ -143,7 +201,8 @@ public void appendHoverText(ItemStack stack, @NotNull TooltipContext context, @N boolean pour = stack.get(AllDataComponents.CAN_POUR) != null ? stack.get(AllDataComponents.CAN_POUR) : false; 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); + int capacity = stack.get(AllDataComponents.JUG_LEVEL) != null ? stack.get(AllDataComponents.JUG_LEVEL) : 0; + LemonMatesTooltipUtils.createCustomTooltip(id, true, tooltipComponents, pour, fluid, capacity); 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 66d2f6f..0000000 --- a/src/main/resources/assets/lemonmates/blockstates/lemonade_glass_decorated.json +++ /dev/null @@ -1,1380 +0,0 @@ -{ - "multipart": [ - { - "when": { - "facing": "north" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass" - } - }, - { - "when": { - "drink_level": "1", - "facing": "north", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half" - } - }, - { - "when": { - "drink_level": "2", - "facing": "north", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full" - } - }, - { - "when": { - "drink_level": "1", - "facing": "north", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_orange" - } - }, - { - "when": { - "drink_level": "2", - "facing": "north", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_orange" - } - }, - { - "when": { - "drink_level": "1", - "facing": "north", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_summermix" - } - }, - { - "when": { - "drink_level": "2", - "facing": "north", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_summermix" - } - }, - { - "when": { - "drink_level": "1", - "facing": "north", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_raspberry" - } - }, - { - "when": { - "drink_level": "2", - "facing": "north", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_raspberry" - } - }, - { - "when": { - "drink_level": "1", - "facing": "north", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_watermelon" - } - }, - { - "when": { - "drink_level": "2", - "facing": "north", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_watermelon" - } - }, - { - "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": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half", - "y": 180 - } - }, - { - "when": { - "drink_level": "2", - "facing": "south", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full", - "y": 180 - } - }, - { - "when": { - "drink_level": "1", - "facing": "south", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_orange", - "y": 180 - } - }, - { - "when": { - "drink_level": "2", - "facing": "south", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_orange", - "y": 180 - } - }, - { - "when": { - "drink_level": "1", - "facing": "south", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_summermix", - "y": 180 - } - }, - { - "when": { - "drink_level": "2", - "facing": "south", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_summermix", - "y": 180 - } - }, - { - "when": { - "drink_level": "1", - "facing": "south", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_raspberry", - "y": 180 - } - }, - { - "when": { - "drink_level": "2", - "facing": "south", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_raspberry", - "y": 180 - } - }, - { - "when": { - "drink_level": "1", - "facing": "south", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_watermelon", - "y": 180 - } - }, - { - "when": { - "drink_level": "2", - "facing": "south", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_watermelon", - "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": "yellow_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": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half", - "y": 90 - } - }, - { - "when": { - "drink_level": "2", - "facing": "east", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full", - "y": 90 - } - }, - { - "when": { - "drink_level": "1", - "facing": "east", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_orange", - "y": 90 - } - }, - { - "when": { - "drink_level": "2", - "facing": "east", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_orange", - "y": 90 - } - }, - { - "when": { - "drink_level": "1", - "facing": "east", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_summermix", - "y": 90 - } - }, - { - "when": { - "drink_level": "2", - "facing": "east", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_summermix", - "y": 90 - } - }, - { - "when": { - "drink_level": "1", - "facing": "east", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_raspberry", - "y": 90 - } - }, - { - "when": { - "drink_level": "2", - "facing": "east", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_raspberry", - "y": 90 - } - }, - { - "when": { - "drink_level": "1", - "facing": "east", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_watermelon", - "y": 90 - } - }, - { - "when": { - "drink_level": "2", - "facing": "east", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_watermelon", - "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": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half", - "y": 270 - } - }, - { - "when": { - "drink_level": "2", - "facing": "west", - "fluid": "citron_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full", - "y": 270 - } - }, - { - "when": { - "drink_level": "1", - "facing": "west", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_orange", - "y": 270 - } - }, - { - "when": { - "drink_level": "2", - "facing": "west", - "fluid": "orange_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_orange", - "y": 270 - } - }, - { - "when": { - "drink_level": "1", - "facing": "west", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_summermix", - "y": 270 - } - }, - { - "when": { - "drink_level": "2", - "facing": "west", - "fluid": "summermix_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_summermix", - "y": 270 - } - }, - { - "when": { - "drink_level": "1", - "facing": "west", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_raspberry", - "y": 270 - } - }, - { - "when": { - "drink_level": "2", - "facing": "west", - "fluid": "raspberry_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_raspberry", - "y": 270 - } - }, - { - "when": { - "drink_level": "1", - "facing": "west", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_half_watermelon", - "y": 270 - } - }, - { - "when": { - "drink_level": "2", - "facing": "west", - "fluid": "watermelon_lemonade" - }, - "apply": { - "model": "lemonmates:block/lemonade_glass_fluid_full_watermelon", - "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/blockstates/lemonade_jug_glass.json b/src/main/resources/assets/lemonmates/blockstates/lemonade_jug_glass.json index 0b85292..5934e24 100644 --- a/src/main/resources/assets/lemonmates/blockstates/lemonade_jug_glass.json +++ b/src/main/resources/assets/lemonmates/blockstates/lemonade_jug_glass.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "lemonmates:block/lemonade_jug_terracotta" + "model": "lemonmates:block/lemonade_jug_glass" } }, { diff --git a/src/main/resources/assets/lemonmates/lang/en_us.json b/src/main/resources/assets/lemonmates/lang/en_us.json index 262485c..b39aa27 100644 --- a/src/main/resources/assets/lemonmates/lang/en_us.json +++ b/src/main/resources/assets/lemonmates/lang/en_us.json @@ -182,7 +182,7 @@ "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._ Holds enough fluid to fill _8 glasses_.", + "block.lemonmates.lemonade_jug_terracotta.tooltip.summary": "A way to store your fluids _more aesthetically._ Holds enough fluid to fill _8 glasses_. (Current Capacity: %3$s/8)", "block.lemonmates.lemonade_jug_terracotta.tooltip.condition1": "_When used while sneaking 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 used onto a Lemonade Glass_", diff --git a/src/main/resources/assets/lemonmates/models/block/ice_cube_full.json b/src/main/resources/assets/lemonmates/models/block/ice_cube_full.json index 75ff90d..5885991 100644 --- a/src/main/resources/assets/lemonmates/models/block/ice_cube_full.json +++ b/src/main/resources/assets/lemonmates/models/block/ice_cube_full.json @@ -1,6 +1,7 @@ { "format_version": "1.9.0", "credit": "Made with Blockbench", + "render_type": "minecraft:translucent", "textures": { "0": "minecraft:block/ice", "particle": "minecraft:block/ice" diff --git a/src/main/resources/assets/lemonmates/models/block/ice_cube_half.json b/src/main/resources/assets/lemonmates/models/block/ice_cube_half.json index 523d281..489f3a5 100644 --- a/src/main/resources/assets/lemonmates/models/block/ice_cube_half.json +++ b/src/main/resources/assets/lemonmates/models/block/ice_cube_half.json @@ -1,6 +1,7 @@ { "format_version": "1.9.0", "credit": "Made with Blockbench", + "render_type": "minecraft:translucent", "textures": { "0": "minecraft:block/ice", "particle": "minecraft:block/ice" diff --git a/src/main/resources/assets/lemonmates/models/block/lemonade_glass_decorated.json b/src/main/resources/assets/lemonmates/models/block/lemonade_glass_decorated.json deleted file mode 100644 index 8921785..0000000 --- a/src/main/resources/assets/lemonmates/models/block/lemonade_glass_decorated.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "format_version": "1.9.0", - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "render_type": "minecraft:translucent", - "textures": { - "g0": "lemonmates:item/lemonade_glass", - "particle": "lemonmates:item/lemonade_glass", - "s50": "lemonmates:block/flag_color/red", - "s51": "lemonmates:block/flag_color/white", - "s52": "lemonmates:block/flag_color/red", - "s53": "lemonmates:block/flag_color/white", - "s54": "lemonmates:block/flag_color/red", - "u1": "lemonmates:block/drink_umbrella_1" - }, - "elements": [ - { - "name": "north_west", - "from": [5, 0, 5], - "to": [6, 7, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 5]}, - "faces": { - "north": {"uv": [6, 2, 6.5, 5.5], "texture": "#g0"}, - "east": {"uv": [6, 5.5, 6.5, 9], "texture": "#g0"}, - "south": {"uv": [6.5, 2, 7, 5.5], "texture": "#g0"}, - "west": {"uv": [6.5, 5.5, 7, 9], "texture": "#g0"}, - "up": {"uv": [4, 10, 3.5, 9.5], "texture": "#g0"}, - "down": {"uv": [10, 7, 9.5, 7.5], "texture": "#g0"} - } - }, - { - "name": "north_east", - "from": [10, 0, 5], - "to": [11, 7, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 5]}, - "faces": { - "north": {"uv": [7, 2, 7.5, 5.5], "texture": "#g0"}, - "east": {"uv": [4, 7, 4.5, 10.5], "texture": "#g0"}, - "south": {"uv": [4.5, 7, 5, 10.5], "texture": "#g0"}, - "west": {"uv": [5, 7, 5.5, 10.5], "texture": "#g0"}, - "up": {"uv": [10, 8, 9.5, 7.5], "texture": "#g0"}, - "down": {"uv": [10, 8, 9.5, 8.5], "texture": "#g0"} - } - }, - { - "name": "south_east", - "from": [10, 0, 10], - "to": [11, 7, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 10]}, - "faces": { - "north": {"uv": [5.5, 7, 6, 10.5], "texture": "#g0"}, - "east": {"uv": [7, 5.5, 7.5, 9], "texture": "#g0"}, - "south": {"uv": [0, 7.5, 0.5, 11], "texture": "#g0"}, - "west": {"uv": [0.5, 7.5, 1, 11], "texture": "#g0"}, - "up": {"uv": [10, 9, 9.5, 8.5], "texture": "#g0"}, - "down": {"uv": [9.5, 9.5, 9, 10], "texture": "#g0"} - } - }, - { - "name": "south_west", - "from": [5, 0, 10], - "to": [6, 7, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 10]}, - "faces": { - "north": {"uv": [1, 7.5, 1.5, 11], "texture": "#g0"}, - "east": {"uv": [1.5, 7.5, 2, 11], "texture": "#g0"}, - "south": {"uv": [2, 7.5, 2.5, 11], "texture": "#g0"}, - "west": {"uv": [7.5, 2, 8, 5.5], "texture": "#g0"}, - "up": {"uv": [10, 10, 9.5, 9.5], "texture": "#g0"}, - "down": {"uv": [10.5, 0, 10, 0.5], "texture": "#g0"} - } - }, - { - "name": "north", - "from": [6, 6, 5], - "to": [10, 7, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 5]}, - "faces": { - "north": {"uv": [7.5, 5.5, 9.5, 6], "texture": "#g0"}, - "south": {"uv": [7.5, 6, 9.5, 6.5], "texture": "#g0"}, - "up": {"uv": [9.5, 7, 7.5, 6.5], "texture": "#g0"}, - "down": {"uv": [9.5, 7, 7.5, 7.5], "texture": "#g0"} - } - }, - { - "name": "east", - "from": [10, 6, 6], - "to": [11, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 6, 6]}, - "faces": { - "east": {"uv": [7.5, 7.5, 9.5, 8], "texture": "#g0"}, - "west": {"uv": [8, 0, 10, 0.5], "texture": "#g0"}, - "up": {"uv": [3, 9.5, 2.5, 7.5], "texture": "#g0"}, - "down": {"uv": [3.5, 7.5, 3, 9.5], "texture": "#g0"} - } - }, - { - "name": "south", - "from": [6, 6, 10], - "to": [10, 7, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 10]}, - "faces": { - "north": {"uv": [8, 0.5, 10, 1], "texture": "#g0"}, - "south": {"uv": [8, 1, 10, 1.5], "texture": "#g0"}, - "up": {"uv": [10, 2, 8, 1.5], "texture": "#g0"}, - "down": {"uv": [10, 2, 8, 2.5], "texture": "#g0"} - } - }, - { - "name": "west", - "from": [5, 6, 6], - "to": [6, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 6, 6]}, - "faces": { - "east": {"uv": [8, 2.5, 10, 3], "texture": "#g0"}, - "west": {"uv": [8, 3, 10, 3.5], "texture": "#g0"}, - "up": {"uv": [4, 9.5, 3.5, 7.5], "texture": "#g0"}, - "down": {"uv": [8.5, 3.5, 8, 5.5], "texture": "#g0"} - } - }, - { - "name": "north", - "from": [6, 0, 5], - "to": [10, 1, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 5]}, - "faces": { - "north": {"uv": [7.5, 8, 9.5, 8.5], "texture": "#g0"}, - "south": {"uv": [8.5, 3.5, 10.5, 4], "texture": "#g0"}, - "up": {"uv": [10.5, 4.5, 8.5, 4], "texture": "#g0"}, - "down": {"uv": [10.5, 4.5, 8.5, 5], "texture": "#g0"} - } - }, - { - "name": "east", - "from": [10, 0, 6], - "to": [11, 1, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 6]}, - "faces": { - "east": {"uv": [8.5, 5, 10.5, 5.5], "texture": "#g0"}, - "west": {"uv": [7.5, 8.5, 9.5, 9], "texture": "#g0"}, - "up": {"uv": [6.5, 11, 6, 9], "texture": "#g0"}, - "down": {"uv": [7, 9, 6.5, 11], "texture": "#g0"} - } - }, - { - "name": "south", - "from": [6, 0, 10], - "to": [10, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 10]}, - "faces": { - "north": {"uv": [7, 9, 9, 9.5], "texture": "#g0"}, - "south": {"uv": [9, 9, 11, 9.5], "texture": "#g0"}, - "up": {"uv": [11.5, 6, 9.5, 5.5], "texture": "#g0"}, - "down": {"uv": [11.5, 6, 9.5, 6.5], "texture": "#g0"} - } - }, - { - "name": "west", - "from": [5, 0, 6], - "to": [6, 1, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 6]}, - "faces": { - "east": {"uv": [9.5, 6.5, 11.5, 7], "texture": "#g0"}, - "west": {"uv": [7, 9.5, 9, 10], "texture": "#g0"}, - "up": {"uv": [3, 11.5, 2.5, 9.5], "texture": "#g0"}, - "down": {"uv": [3.5, 9.5, 3, 11.5], "texture": "#g0"} - } - }, - { - "name": "bottom", - "from": [6, 0, 6], - "to": [10, 1, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]}, - "faces": { - "up": {"uv": [6, 7, 4, 5], "texture": "#g0"}, - "down": {"uv": [8, 0, 6, 2], "texture": "#g0"} - } - }, - { - "name": "west", - "from": [5, 1, 6], - "to": [6, 6, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 1, 6]}, - "faces": { - "east": {"uv": [0, 0, 2, 2.5], "texture": "#g0"}, - "west": {"uv": [2, 0, 4, 2.5], "texture": "#g0"} - } - }, - { - "name": "east", - "from": [10, 1, 6], - "to": [11, 6, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 1, 6]}, - "faces": { - "east": {"uv": [0, 2.5, 2, 5], "texture": "#g0"}, - "west": {"uv": [2, 2.5, 4, 5], "texture": "#g0"} - } - }, - { - "name": "north", - "from": [6, 1, 5], - "to": [10, 6, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 5]}, - "faces": { - "north": {"uv": [4, 0, 6, 2.5], "texture": "#g0"}, - "south": {"uv": [4, 2.5, 6, 5], "texture": "#g0"} - } - }, - { - "name": "south", - "from": [6, 1, 10], - "to": [10, 6, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 10]}, - "faces": { - "north": {"uv": [0, 5, 2, 7.5], "texture": "#g0"}, - "south": {"uv": [2, 5, 4, 7.5], "texture": "#g0"} - } - }, - { - "name": "bottom", - "from": [8, 1, 9], - "to": [9, 2.8, 10], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, - "faces": { - "north": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, - "east": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, - "south": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, - "west": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, - "down": {"uv": [2, 1, 1, 2], "texture": "#s50"} - } - }, - { - "name": "middle_bottom", - "from": [8, 2.8, 9], - "to": [9, 4.6, 10], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, - "faces": { - "north": {"uv": [0, 6.2, 1, 8], "texture": "#s51"}, - "east": {"uv": [0, 6.2, 1, 8], "texture": "#s51"}, - "south": {"uv": [0, 6.2, 1, 8], "texture": "#s51"}, - "west": {"uv": [0, 6.2, 1, 8], "texture": "#s51"} - } - }, - { - "name": "middle", - "from": [8, 4.6, 9], - "to": [9, 6.4, 10], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, - "faces": { - "north": {"uv": [0, 4.2, 1, 6], "texture": "#s52"}, - "east": {"uv": [0, 4.2, 1, 6], "texture": "#s52"}, - "south": {"uv": [0, 4.2, 1, 6], "texture": "#s52"}, - "west": {"uv": [0, 4.2, 1, 6], "texture": "#s52"} - } - }, - { - "name": "middle_top", - "from": [8, 6.4, 9], - "to": [9, 8.2, 10], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, - "faces": { - "north": {"uv": [0, 2.2, 1, 4], "texture": "#s53"}, - "east": {"uv": [0, 2.2, 1, 4], "texture": "#s53"}, - "south": {"uv": [0, 2.2, 1, 4], "texture": "#s53"}, - "west": {"uv": [0, 2.2, 1, 4], "texture": "#s53"} - } - }, - { - "name": "top", - "from": [8, 8.2, 9], - "to": [9, 10, 10], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, - "faces": { - "north": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, - "east": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, - "south": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, - "west": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, - "up": {"uv": [2, 1, 1, 0], "texture": "#s54"} - } - }, - { - "name": "shaft", - "from": [9, 5, 5.5], - "to": [10, 10, 6.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, - "faces": { - "north": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, - "east": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, - "south": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, - "west": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, - "up": {"uv": [6, 4, 5, 3], "texture": "#u1"}, - "down": {"uv": [6, 3, 5, 4], "texture": "#u1"} - } - }, - { - "name": "top", - "from": [7, 9.5, 3.5], - "to": [12, 9.5, 8.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, - "faces": { - "north": {"uv": [1, 0, 6, 0], "texture": "#u1"}, - "east": {"uv": [0, 0, 5, 0], "texture": "#u1"}, - "south": {"uv": [0, 0, 5, 0], "texture": "#u1"}, - "west": {"uv": [0, 0, 5, 0], "texture": "#u1"}, - "up": {"uv": [5, 5, 0, 0], "texture": "#u1"}, - "down": {"uv": [5, 0, 0, 5], "texture": "#u1"} - } - }, - { - "name": "north", - "from": [7, 8.5, 3.5], - "to": [12, 9.5, 3.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, - "faces": { - "north": {"uv": [5, 0, 10, 1], "texture": "#u1"}, - "east": {"uv": [5, 0, 5, 1], "texture": "#u1"}, - "south": {"uv": [10, 0, 5, 1], "texture": "#u1"}, - "west": {"uv": [0, 0, 0, 1], "texture": "#u1"}, - "up": {"uv": [0, 0, 5, 0], "texture": "#u1"}, - "down": {"uv": [0, 5, 5, 5], "texture": "#u1"} - } - }, - { - "name": "south", - "from": [7, 8.5, 8.5], - "to": [12, 9.5, 8.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, - "faces": { - "north": {"uv": [10, 0, 5, 1], "texture": "#u1"}, - "east": {"uv": [5, 0, 5, 1], "texture": "#u1"}, - "south": {"uv": [5, 0, 10, 1], "texture": "#u1"}, - "west": {"uv": [0, 0, 0, 1], "texture": "#u1"}, - "up": {"uv": [0, 0, 5, 0], "texture": "#u1"}, - "down": {"uv": [0, 5, 5, 5], "texture": "#u1"} - } - }, - { - "name": "west", - "from": [7, 8.5, 3.5], - "to": [7, 9.5, 8.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, - "faces": { - "north": {"uv": [6, 0, 6, 1], "texture": "#u1"}, - "east": {"uv": [10, 1, 5, 2], "texture": "#u1"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#u1"}, - "west": {"uv": [5, 1, 10, 2], "texture": "#u1"}, - "up": {"uv": [0, 2, 0, 7], "texture": "#u1"}, - "down": {"uv": [0, 5, 0, 10], "texture": "#u1"} - } - }, - { - "name": "east", - "from": [12, 8.5, 3.5], - "to": [12, 9.5, 8.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, - "faces": { - "north": {"uv": [6, 0, 6, 1], "texture": "#u1"}, - "east": {"uv": [5, 1, 10, 2], "texture": "#u1"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#u1"}, - "west": {"uv": [10, 1, 5, 2], "texture": "#u1"}, - "up": {"uv": [0, 2, 0, 7], "texture": "#u1"}, - "down": {"uv": [0, 5, 0, 10], "texture": "#u1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 5.25, 1.5], - "scale": [0.67, 0.67, 0.67] - }, - "thirdperson_lefthand": { - "translation": [0, 5.25, 1.5], - "scale": [0.67, 0.67, 0.67] - }, - "firstperson_righthand": { - "translation": [0, 6, 0], - "scale": [0.8, 0.8, 0.8] - }, - "firstperson_lefthand": { - "translation": [0, 6, 0], - "scale": [0.8, 0.8, 0.8] - }, - "ground": { - "translation": [0, 3.5, 0], - "scale": [0.68, 0.68, 0.68] - }, - "gui": { - "rotation": [22.5, -22.5, 0], - "translation": [0, 3.5, 0] - }, - "head": { - "translation": [0, 14.5, 0] - }, - "on_shelf": { - "scale": [1.87, 1.87, 1.87] - } - }, - "groups": [ - { - "name": "edges", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2, 3] - }, - { - "name": "top_edges", - "origin": [8, 8, 8], - "color": 0, - "children": [4, 5, 6, 7] - }, - { - "name": "bottom_edges", - "origin": [8, 8, 8], - "color": 0, - "children": [8, 9, 10, 11] - }, - { - "name": "faces", - "origin": [8, 8, 8], - "color": 0, - "children": [12, 13, 14, 15, 16] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/block/lemonade_jug_glass.json b/src/main/resources/assets/lemonmates/models/block/lemonade_jug_glass.json index 508e281..81242ca 100644 --- a/src/main/resources/assets/lemonmates/models/block/lemonade_jug_glass.json +++ b/src/main/resources/assets/lemonmates/models/block/lemonade_jug_glass.json @@ -1,10 +1,11 @@ { "format_version": "1.9.0", "credit": "Made with Blockbench", + "render_type": "minecraft:translucent", "texture_size": [32, 32], "textures": { - "jg": "item/lemonade_jug_glass", - "particle": "item/lemonade_jug_glass" + "jg": "lemonmates:block/lemonade_jug_glass", + "particle": "lemonmates:block/lemonade_jug_glass" }, "elements": [ { @@ -189,6 +190,24 @@ } ], "display": { + "thirdperson_righthand": { + "rotation": [-179.74, -8.52, -176.45], + "translation": [-0.25, 0.5, -3.75], + "scale": [0.85, 0.85, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [-179.74, -8.52, -176.45], + "translation": [-0.25, 0.5, -3.75], + "scale": [0.85, 0.85, 0.85] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, -45, 0], + "translation": [0, 1.75, 0] + }, "head": { "translation": [0, 14.5, 0] } diff --git a/src/main/resources/assets/lemonmates/models/block/lemonade_jug_terracotta.json b/src/main/resources/assets/lemonmates/models/block/lemonade_jug_terracotta.json index a9edd47..12e5170 100644 --- a/src/main/resources/assets/lemonmates/models/block/lemonade_jug_terracotta.json +++ b/src/main/resources/assets/lemonmates/models/block/lemonade_jug_terracotta.json @@ -190,6 +190,20 @@ } ], "display": { + "thirdperson_righthand": { + "rotation": [-179.74, -8.52, -176.45], + "translation": [-0.25, 0.5, -3.75], + "scale": [0.85, 0.85, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [-179.74, -8.52, -176.45], + "translation": [-0.25, 0.5, -3.75], + "scale": [0.85, 0.85, 0.85] + }, + "gui": { + "rotation": [30, -45, 0], + "translation": [0, 1.75, 0] + }, "head": { "translation": [0, 14.5, 0] } diff --git a/src/main/resources/assets/lemonmates/models/item/ice_cubes.json b/src/main/resources/assets/lemonmates/models/item/ice_cubes.json index 118852c..dac8632 100644 --- a/src/main/resources/assets/lemonmates/models/item/ice_cubes.json +++ b/src/main/resources/assets/lemonmates/models/item/ice_cubes.json @@ -2,8 +2,8 @@ "format_version": "1.21.6", "credit": "Made with Blockbench", "textures": { - "0": "item/ice_cube", - "particle": "item/ice_cube" + "0": "minecraft:block/ice", + "particle": "minecraft:block/ice" }, "elements": [ { diff --git a/src/main/resources/assets/lemonmates/models/item/lemonade_glass_decorated.json b/src/main/resources/assets/lemonmates/models/item/lemonade_glass_decorated.json index 1f4b947..1dc7290 100644 --- a/src/main/resources/assets/lemonmates/models/item/lemonade_glass_decorated.json +++ b/src/main/resources/assets/lemonmates/models/item/lemonade_glass_decorated.json @@ -1,3 +1,424 @@ { - "parent": "lemonmates:block/lemonade_glass_decorated" + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "render_type": "minecraft:translucent", + "textures": { + "g0": "lemonmates:item/lemonade_glass", + "particle": "lemonmates:item/lemonade_glass", + "s50": "lemonmates:block/flag_color/red", + "s51": "lemonmates:block/flag_color/white", + "s52": "lemonmates:block/flag_color/red", + "s53": "lemonmates:block/flag_color/white", + "s54": "lemonmates:block/flag_color/red", + "u1": "lemonmates:block/drink_umbrella_1" + }, + "elements": [ + { + "name": "north_west", + "from": [5, 0, 5], + "to": [6, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 5]}, + "faces": { + "north": {"uv": [6, 2, 6.5, 5.5], "texture": "#g0"}, + "east": {"uv": [6, 5.5, 6.5, 9], "texture": "#g0"}, + "south": {"uv": [6.5, 2, 7, 5.5], "texture": "#g0"}, + "west": {"uv": [6.5, 5.5, 7, 9], "texture": "#g0"}, + "up": {"uv": [4, 10, 3.5, 9.5], "texture": "#g0"}, + "down": {"uv": [10, 7, 9.5, 7.5], "texture": "#g0"} + } + }, + { + "name": "north_east", + "from": [10, 0, 5], + "to": [11, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 5]}, + "faces": { + "north": {"uv": [7, 2, 7.5, 5.5], "texture": "#g0"}, + "east": {"uv": [4, 7, 4.5, 10.5], "texture": "#g0"}, + "south": {"uv": [4.5, 7, 5, 10.5], "texture": "#g0"}, + "west": {"uv": [5, 7, 5.5, 10.5], "texture": "#g0"}, + "up": {"uv": [10, 8, 9.5, 7.5], "texture": "#g0"}, + "down": {"uv": [10, 8, 9.5, 8.5], "texture": "#g0"} + } + }, + { + "name": "south_east", + "from": [10, 0, 10], + "to": [11, 7, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 10]}, + "faces": { + "north": {"uv": [5.5, 7, 6, 10.5], "texture": "#g0"}, + "east": {"uv": [7, 5.5, 7.5, 9], "texture": "#g0"}, + "south": {"uv": [0, 7.5, 0.5, 11], "texture": "#g0"}, + "west": {"uv": [0.5, 7.5, 1, 11], "texture": "#g0"}, + "up": {"uv": [10, 9, 9.5, 8.5], "texture": "#g0"}, + "down": {"uv": [9.5, 9.5, 9, 10], "texture": "#g0"} + } + }, + { + "name": "south_west", + "from": [5, 0, 10], + "to": [6, 7, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 10]}, + "faces": { + "north": {"uv": [1, 7.5, 1.5, 11], "texture": "#g0"}, + "east": {"uv": [1.5, 7.5, 2, 11], "texture": "#g0"}, + "south": {"uv": [2, 7.5, 2.5, 11], "texture": "#g0"}, + "west": {"uv": [7.5, 2, 8, 5.5], "texture": "#g0"}, + "up": {"uv": [10, 10, 9.5, 9.5], "texture": "#g0"}, + "down": {"uv": [10.5, 0, 10, 0.5], "texture": "#g0"} + } + }, + { + "name": "north", + "from": [6, 6, 5], + "to": [10, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 5]}, + "faces": { + "north": {"uv": [7.5, 5.5, 9.5, 6], "texture": "#g0"}, + "south": {"uv": [7.5, 6, 9.5, 6.5], "texture": "#g0"}, + "up": {"uv": [9.5, 7, 7.5, 6.5], "texture": "#g0"}, + "down": {"uv": [9.5, 7, 7.5, 7.5], "texture": "#g0"} + } + }, + { + "name": "east", + "from": [10, 6, 6], + "to": [11, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 6, 6]}, + "faces": { + "east": {"uv": [7.5, 7.5, 9.5, 8], "texture": "#g0"}, + "west": {"uv": [8, 0, 10, 0.5], "texture": "#g0"}, + "up": {"uv": [3, 9.5, 2.5, 7.5], "texture": "#g0"}, + "down": {"uv": [3.5, 7.5, 3, 9.5], "texture": "#g0"} + } + }, + { + "name": "south", + "from": [6, 6, 10], + "to": [10, 7, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 10]}, + "faces": { + "north": {"uv": [8, 0.5, 10, 1], "texture": "#g0"}, + "south": {"uv": [8, 1, 10, 1.5], "texture": "#g0"}, + "up": {"uv": [10, 2, 8, 1.5], "texture": "#g0"}, + "down": {"uv": [10, 2, 8, 2.5], "texture": "#g0"} + } + }, + { + "name": "west", + "from": [5, 6, 6], + "to": [6, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 6, 6]}, + "faces": { + "east": {"uv": [8, 2.5, 10, 3], "texture": "#g0"}, + "west": {"uv": [8, 3, 10, 3.5], "texture": "#g0"}, + "up": {"uv": [4, 9.5, 3.5, 7.5], "texture": "#g0"}, + "down": {"uv": [8.5, 3.5, 8, 5.5], "texture": "#g0"} + } + }, + { + "name": "north", + "from": [6, 0, 5], + "to": [10, 1, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 5]}, + "faces": { + "north": {"uv": [7.5, 8, 9.5, 8.5], "texture": "#g0"}, + "south": {"uv": [8.5, 3.5, 10.5, 4], "texture": "#g0"}, + "up": {"uv": [10.5, 4.5, 8.5, 4], "texture": "#g0"}, + "down": {"uv": [10.5, 4.5, 8.5, 5], "texture": "#g0"} + } + }, + { + "name": "east", + "from": [10, 0, 6], + "to": [11, 1, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 6]}, + "faces": { + "east": {"uv": [8.5, 5, 10.5, 5.5], "texture": "#g0"}, + "west": {"uv": [7.5, 8.5, 9.5, 9], "texture": "#g0"}, + "up": {"uv": [6.5, 11, 6, 9], "texture": "#g0"}, + "down": {"uv": [7, 9, 6.5, 11], "texture": "#g0"} + } + }, + { + "name": "south", + "from": [6, 0, 10], + "to": [10, 1, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 10]}, + "faces": { + "north": {"uv": [7, 9, 9, 9.5], "texture": "#g0"}, + "south": {"uv": [9, 9, 11, 9.5], "texture": "#g0"}, + "up": {"uv": [11.5, 6, 9.5, 5.5], "texture": "#g0"}, + "down": {"uv": [11.5, 6, 9.5, 6.5], "texture": "#g0"} + } + }, + { + "name": "west", + "from": [5, 0, 6], + "to": [6, 1, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 6]}, + "faces": { + "east": {"uv": [9.5, 6.5, 11.5, 7], "texture": "#g0"}, + "west": {"uv": [7, 9.5, 9, 10], "texture": "#g0"}, + "up": {"uv": [3, 11.5, 2.5, 9.5], "texture": "#g0"}, + "down": {"uv": [3.5, 9.5, 3, 11.5], "texture": "#g0"} + } + }, + { + "name": "bottom", + "from": [6, 0, 6], + "to": [10, 1, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]}, + "faces": { + "up": {"uv": [6, 7, 4, 5], "texture": "#g0"}, + "down": {"uv": [8, 0, 6, 2], "texture": "#g0"} + } + }, + { + "name": "west", + "from": [5, 1, 6], + "to": [6, 6, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 1, 6]}, + "faces": { + "east": {"uv": [0, 0, 2, 2.5], "texture": "#g0"}, + "west": {"uv": [2, 0, 4, 2.5], "texture": "#g0"} + } + }, + { + "name": "east", + "from": [10, 1, 6], + "to": [11, 6, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 1, 6]}, + "faces": { + "east": {"uv": [0, 2.5, 2, 5], "texture": "#g0"}, + "west": {"uv": [2, 2.5, 4, 5], "texture": "#g0"} + } + }, + { + "name": "north", + "from": [6, 1, 5], + "to": [10, 6, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 5]}, + "faces": { + "north": {"uv": [4, 0, 6, 2.5], "texture": "#g0"}, + "south": {"uv": [4, 2.5, 6, 5], "texture": "#g0"} + } + }, + { + "name": "south", + "from": [6, 1, 10], + "to": [10, 6, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 10]}, + "faces": { + "north": {"uv": [0, 5, 2, 7.5], "texture": "#g0"}, + "south": {"uv": [2, 5, 4, 7.5], "texture": "#g0"} + } + }, + { + "name": "bottom", + "from": [8, 1, 9], + "to": [9, 2.8, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, + "faces": { + "north": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, + "east": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, + "south": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, + "west": {"uv": [0, 8.2, 1, 10], "texture": "#s50"}, + "down": {"uv": [2, 1, 1, 2], "texture": "#s50"} + } + }, + { + "name": "middle_bottom", + "from": [8, 2.8, 9], + "to": [9, 4.6, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, + "faces": { + "north": {"uv": [0, 6.2, 1, 8], "texture": "#s51"}, + "east": {"uv": [0, 6.2, 1, 8], "texture": "#s51"}, + "south": {"uv": [0, 6.2, 1, 8], "texture": "#s51"}, + "west": {"uv": [0, 6.2, 1, 8], "texture": "#s51"} + } + }, + { + "name": "middle", + "from": [8, 4.6, 9], + "to": [9, 6.4, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, + "faces": { + "north": {"uv": [0, 4.2, 1, 6], "texture": "#s52"}, + "east": {"uv": [0, 4.2, 1, 6], "texture": "#s52"}, + "south": {"uv": [0, 4.2, 1, 6], "texture": "#s52"}, + "west": {"uv": [0, 4.2, 1, 6], "texture": "#s52"} + } + }, + { + "name": "middle_top", + "from": [8, 6.4, 9], + "to": [9, 8.2, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, + "faces": { + "north": {"uv": [0, 2.2, 1, 4], "texture": "#s53"}, + "east": {"uv": [0, 2.2, 1, 4], "texture": "#s53"}, + "south": {"uv": [0, 2.2, 1, 4], "texture": "#s53"}, + "west": {"uv": [0, 2.2, 1, 4], "texture": "#s53"} + } + }, + { + "name": "top", + "from": [8, 8.2, 9], + "to": [9, 10, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8.5, 7, 10]}, + "faces": { + "north": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, + "east": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, + "south": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, + "west": {"uv": [0, 0.2, 1, 2], "texture": "#s54"}, + "up": {"uv": [2, 1, 1, 0], "texture": "#s54"} + } + }, + { + "name": "shaft", + "from": [9, 5, 5.5], + "to": [10, 10, 6.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, + "faces": { + "north": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, + "east": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, + "south": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, + "west": {"uv": [5, 4, 10, 5], "rotation": 90, "texture": "#u1"}, + "up": {"uv": [6, 4, 5, 3], "texture": "#u1"}, + "down": {"uv": [6, 3, 5, 4], "texture": "#u1"} + } + }, + { + "name": "top", + "from": [7, 9.5, 3.5], + "to": [12, 9.5, 8.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, + "faces": { + "north": {"uv": [1, 0, 6, 0], "texture": "#u1"}, + "east": {"uv": [0, 0, 5, 0], "texture": "#u1"}, + "south": {"uv": [0, 0, 5, 0], "texture": "#u1"}, + "west": {"uv": [0, 0, 5, 0], "texture": "#u1"}, + "up": {"uv": [5, 5, 0, 0], "texture": "#u1"}, + "down": {"uv": [5, 0, 0, 5], "texture": "#u1"} + } + }, + { + "name": "north", + "from": [7, 8.5, 3.5], + "to": [12, 9.5, 3.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, + "faces": { + "north": {"uv": [5, 0, 10, 1], "texture": "#u1"}, + "east": {"uv": [5, 0, 5, 1], "texture": "#u1"}, + "south": {"uv": [10, 0, 5, 1], "texture": "#u1"}, + "west": {"uv": [0, 0, 0, 1], "texture": "#u1"}, + "up": {"uv": [0, 0, 5, 0], "texture": "#u1"}, + "down": {"uv": [0, 5, 5, 5], "texture": "#u1"} + } + }, + { + "name": "south", + "from": [7, 8.5, 8.5], + "to": [12, 9.5, 8.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, + "faces": { + "north": {"uv": [10, 0, 5, 1], "texture": "#u1"}, + "east": {"uv": [5, 0, 5, 1], "texture": "#u1"}, + "south": {"uv": [5, 0, 10, 1], "texture": "#u1"}, + "west": {"uv": [0, 0, 0, 1], "texture": "#u1"}, + "up": {"uv": [0, 0, 5, 0], "texture": "#u1"}, + "down": {"uv": [0, 5, 5, 5], "texture": "#u1"} + } + }, + { + "name": "west", + "from": [7, 8.5, 3.5], + "to": [7, 9.5, 8.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, + "faces": { + "north": {"uv": [6, 0, 6, 1], "texture": "#u1"}, + "east": {"uv": [10, 1, 5, 2], "texture": "#u1"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#u1"}, + "west": {"uv": [5, 1, 10, 2], "texture": "#u1"}, + "up": {"uv": [0, 2, 0, 7], "texture": "#u1"}, + "down": {"uv": [0, 5, 0, 10], "texture": "#u1"} + } + }, + { + "name": "east", + "from": [12, 8.5, 3.5], + "to": [12, 9.5, 8.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [9.5, 6, 6]}, + "faces": { + "north": {"uv": [6, 0, 6, 1], "texture": "#u1"}, + "east": {"uv": [5, 1, 10, 2], "texture": "#u1"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#u1"}, + "west": {"uv": [10, 1, 5, 2], "texture": "#u1"}, + "up": {"uv": [0, 2, 0, 7], "texture": "#u1"}, + "down": {"uv": [0, 5, 0, 10], "texture": "#u1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 5.25, 1.5], + "scale": [0.67, 0.67, 0.67] + }, + "thirdperson_lefthand": { + "translation": [0, 5.25, 1.5], + "scale": [0.67, 0.67, 0.67] + }, + "firstperson_righthand": { + "translation": [0, 6, 0], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_lefthand": { + "translation": [0, 6, 0], + "scale": [0.8, 0.8, 0.8] + }, + "ground": { + "translation": [0, 3.5, 0], + "scale": [0.68, 0.68, 0.68] + }, + "gui": { + "rotation": [22.5, -22.5, 0], + "translation": [0, 3.5, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "on_shelf": { + "scale": [1.87, 1.87, 1.87] + } + }, + "groups": [ + { + "name": "edges", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "top_edges", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5, 6, 7] + }, + { + "name": "bottom_edges", + "origin": [8, 8, 8], + "color": 0, + "children": [8, 9, 10, 11] + }, + { + "name": "faces", + "origin": [8, 8, 8], + "color": 0, + "children": [12, 13, 14, 15, 16] + } + ] } \ No newline at end of file diff --git a/src/generated/resources/data/lemonmates/recipe/lemonade_jug_glass.json b/src/main/resources/data/lemonmates/recipe/shaped/lemonade_jug_glass.json similarity index 70% rename from src/generated/resources/data/lemonmates/recipe/lemonade_jug_glass.json rename to src/main/resources/data/lemonmates/recipe/shaped/lemonade_jug_glass.json index e8baee9..7d871f2 100644 --- a/src/generated/resources/data/lemonmates/recipe/lemonade_jug_glass.json +++ b/src/main/resources/data/lemonmates/recipe/shaped/lemonade_jug_glass.json @@ -15,6 +15,11 @@ " B " ], "result": { + "components": { + "lemonmates:can_pour": false, + "lemonmates:jug_level": 0, + "lemonmates:fluid": "none" + }, "count": 1, "id": "lemonmates:lemonade_jug_glass" } diff --git a/src/generated/resources/data/lemonmates/recipe/lemonade_jug_terracotta.json b/src/main/resources/data/lemonmates/recipe/shaped/lemonade_jug_terracotta.json similarity index 66% rename from src/generated/resources/data/lemonmates/recipe/lemonade_jug_terracotta.json rename to src/main/resources/data/lemonmates/recipe/shaped/lemonade_jug_terracotta.json index 30de5d8..c412fa2 100644 --- a/src/generated/resources/data/lemonmates/recipe/lemonade_jug_terracotta.json +++ b/src/main/resources/data/lemonmates/recipe/shaped/lemonade_jug_terracotta.json @@ -12,6 +12,11 @@ " # " ], "result": { + "components": { + "lemonmates:can_pour": false, + "lemonmates:jug_level": 0, + "lemonmates:fluid": "none" + }, "count": 1, "id": "lemonmates:lemonade_jug_terracotta" }