From 8c616633dde6e6434ed26421764e5892f7ac57fc Mon Sep 17 00:00:00 2001 From: Guddi Date: Fri, 15 Aug 2025 00:51:03 +0200 Subject: [PATCH 1/8] added creative tab with all current items --- .../net/doppelr/lemonmates/LemonMates.java | 3 + .../lemonmates/item/ModCreativeModeTabs.java | 81 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java diff --git a/src/main/java/net/doppelr/lemonmates/LemonMates.java b/src/main/java/net/doppelr/lemonmates/LemonMates.java index bad8606..f91485b 100644 --- a/src/main/java/net/doppelr/lemonmates/LemonMates.java +++ b/src/main/java/net/doppelr/lemonmates/LemonMates.java @@ -1,5 +1,6 @@ package net.doppelr.lemonmates; +import net.doppelr.lemonmates.item.ModCreativeModeTabs; import net.doppelr.lemonmates.item.ModItems; import net.minecraft.world.item.CreativeModeTabs; import org.slf4j.Logger; @@ -35,6 +36,8 @@ public LemonMates(IEventBus modEventBus, ModContainer modContainer) { // Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like onServerStarting() below. NeoForge.EVENT_BUS.register(this); + ModCreativeModeTabs.register(modEventBus); + ModItems.register(modEventBus); // Register the item to a creative tab diff --git a/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java b/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java new file mode 100644 index 0000000..c627f80 --- /dev/null +++ b/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java @@ -0,0 +1,81 @@ +package net.doppelr.lemonmates.item; + +import net.doppelr.lemonmates.LemonMates; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.ItemStack; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Supplier; + +public class ModCreativeModeTabs { + public static final DeferredRegister CREATIVE_MODE_TAB = + DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LemonMates.MOD_ID); + + public static final Supplier LEMONMATES_TAB = CREATIVE_MODE_TAB.register("lemonmates_tab", + () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup." + LemonMates.MOD_ID + ".lemonmates")) + .withTabsBefore(CreativeModeTabs.SPAWN_EGGS) + .icon(() -> new ItemStack(ModItems.BOTTLE_CAP.get())) + .displayItems((params, output) -> { + // Bottle, Cap + output.accept(ModItems.BOTTLE_CAP); + output.accept(ModItems.BOTTLE_EMPTY); + + // Labels + output.accept(ModItems.CITRON_LEMONADE_LABEL); + output.accept(ModItems.ORANGE_LEMONADE_LABEL); + output.accept(ModItems.RASPBERRY_LEMONADE_LABEL); + output.accept(ModItems.SUMMER_MIX_LABEL); + output.accept(ModItems.WATERMELON_LEMONADE_LABEL); + + // Citron + output.accept(ModItems.BOTTLE_CITRON_LABEL); + output.accept(ModItems.BOTTLE_CITRON_LEMONADE); + output.accept(ModItems.BOTTLE_CITRON_LABEL_CAP); + output.accept(ModItems.BOTTLE_CITRON_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_CITRON_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_CITRON_LABEL_LEMONADE); + + // Orange + output.accept(ModItems.BOTTLE_ORANGE_LABEL); + output.accept(ModItems.BOTTLE_ORANGE_LEMONADE); + output.accept(ModItems.BOTTLE_ORANGE_LABEL_CAP); + output.accept(ModItems.BOTTLE_ORANGE_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_ORANGE_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_ORANGE_LABEL_LEMONADE); + + // Raspberry + output.accept(ModItems.BOTTLE_RASPBERRY_LABEL); + output.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE); + output.accept(ModItems.BOTTLE_RASPBERRY_LABEL_CAP); + output.accept(ModItems.BOTTLE_RASPBERRY_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_RASPBERRY_LABEL_LEMONADE); + + // Summer Mix + output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL); + output.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE); + output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_CAP); + output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_LEMONADE); + + // Watermelon + output.accept(ModItems.BOTTLE_WATERMELON_LABEL); + output.accept(ModItems.BOTTLE_WATERMELON_LEMONADE); + output.accept(ModItems.BOTTLE_WATERMELON_LABEL_CAP); + output.accept(ModItems.BOTTLE_WATERMELON_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_WATERMELON_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_WATERMELON_LABEL_LEMONADE); + }) + .build() + ); + + public static void register(IEventBus eventBus) { + CREATIVE_MODE_TAB.register(eventBus); + } +} From 8ef7f38abc02c25889e76505e53a9b95a587f97d Mon Sep 17 00:00:00 2001 From: Guddi Date: Fri, 15 Aug 2025 00:56:29 +0200 Subject: [PATCH 2/8] added CreativeModeTab name --- src/main/resources/assets/lemonmates/lang/en_US.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/assets/lemonmates/lang/en_US.json b/src/main/resources/assets/lemonmates/lang/en_US.json index 554f129..1d153cb 100644 --- a/src/main/resources/assets/lemonmates/lang/en_US.json +++ b/src/main/resources/assets/lemonmates/lang/en_US.json @@ -1,4 +1,6 @@ { + "itemGroup.lemonmates.lemonmates": "Lemonmates", + "item.lemonmates.bottle_cap": "Bottle Cap", "item.lemonmates.bottle_empty": "Empty Bottle", From 7390412900ebd7b112ff13fd588bb64d0d673e68 Mon Sep 17 00:00:00 2001 From: Guddi Date: Fri, 15 Aug 2025 01:32:09 +0200 Subject: [PATCH 3/8] changed bottle items names --- .../net/doppelr/lemonmates/LemonMates.java | 30 ++++----- .../lemonmates/item/ModCreativeModeTabs.java | 30 ++++----- .../net/doppelr/lemonmates/item/ModItems.java | 65 +++++++++---------- .../assets/lemonmates/lang/en_US.json | 30 ++++----- ..._cap.json => bottle_citron_cap_label.json} | 0 ... => bottle_citron_lemonade_cap_label.json} | 0 ...json => bottle_citron_lemonade_label.json} | 0 ..._cap.json => bottle_orange_cap_label.json} | 0 ... => bottle_orange_lemonade_cap_label.json} | 0 ...json => bottle_orange_lemonade_label.json} | 0 ...p.json => bottle_raspberry_cap_label.json} | 0 ... bottle_raspberry_lemonade_cap_label.json} | 0 ...n => bottle_raspberry_lemonade_label.json} | 0 ...p.json => bottle_summermix_cap_label.json} | 0 ... bottle_summermix_lemonade_cap_label.json} | 0 ...n => bottle_summermix_lemonade_label.json} | 0 ....json => bottle_watermelon_cap_label.json} | 0 ...bottle_watermelon_lemonade_cap_label.json} | 0 ... => bottle_watermelon_lemonade_label.json} | 0 19 files changed, 75 insertions(+), 80 deletions(-) rename src/main/resources/assets/lemonmates/models/item/{bottle_citron_label_cap.json => bottle_citron_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_citron_label_lemonade_cap.json => bottle_citron_lemonade_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_citron_label_lemonade.json => bottle_citron_lemonade_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_orange_label_cap.json => bottle_orange_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_orange_label_lemonade_cap.json => bottle_orange_lemonade_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_orange_label_lemonade.json => bottle_orange_lemonade_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_raspberry_label_cap.json => bottle_raspberry_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_raspberry_label_lemonade_cap.json => bottle_raspberry_lemonade_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_raspberry_label_lemonade.json => bottle_raspberry_lemonade_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_summermix_label_cap.json => bottle_summermix_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_summermix_label_lemonade_cap.json => bottle_summermix_lemonade_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_summermix_label_lemonade.json => bottle_summermix_lemonade_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_watermelon_label_cap.json => bottle_watermelon_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_watermelon_label_lemonade_cap.json => bottle_watermelon_lemonade_cap_label.json} (100%) rename src/main/resources/assets/lemonmates/models/item/{bottle_watermelon_label_lemonade.json => bottle_watermelon_lemonade_label.json} (100%) diff --git a/src/main/java/net/doppelr/lemonmates/LemonMates.java b/src/main/java/net/doppelr/lemonmates/LemonMates.java index f91485b..afd016b 100644 --- a/src/main/java/net/doppelr/lemonmates/LemonMates.java +++ b/src/main/java/net/doppelr/lemonmates/LemonMates.java @@ -68,42 +68,42 @@ private void addCreative(BuildCreativeModeTabContentsEvent event) { // Citron event.accept(ModItems.BOTTLE_CITRON_LABEL); event.accept(ModItems.BOTTLE_CITRON_LEMONADE); - event.accept(ModItems.BOTTLE_CITRON_LABEL_CAP); - event.accept(ModItems.BOTTLE_CITRON_LABEL_LEMONADE_CAP); + event.accept(ModItems.BOTTLE_CITRON_CAP_LABEL); + event.accept(ModItems.BOTTLE_CITRON_LEMONADE_CAP_LABEL); event.accept(ModItems.BOTTLE_CITRON_LEMONADE_CAP); - event.accept(ModItems.BOTTLE_CITRON_LABEL_LEMONADE); + event.accept(ModItems.BOTTLE_CITRON_LEMONADE_LABEL); // Orange event.accept(ModItems.BOTTLE_ORANGE_LABEL); event.accept(ModItems.BOTTLE_ORANGE_LEMONADE); - event.accept(ModItems.BOTTLE_ORANGE_LABEL_CAP); - event.accept(ModItems.BOTTLE_ORANGE_LABEL_LEMONADE_CAP); + event.accept(ModItems.BOTTLE_ORANGE_CAP_LABEL); + event.accept(ModItems.BOTTLE_ORANGE_LEMONADE_CAP_LABEL); event.accept(ModItems.BOTTLE_ORANGE_LEMONADE_CAP); - event.accept(ModItems.BOTTLE_ORANGE_LABEL_LEMONADE); + event.accept(ModItems.BOTTLE_ORANGE_LEMONADE_LABEL); // Raspberry event.accept(ModItems.BOTTLE_RASPBERRY_LABEL); event.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE); - event.accept(ModItems.BOTTLE_RASPBERRY_LABEL_CAP); - event.accept(ModItems.BOTTLE_RASPBERRY_LABEL_LEMONADE_CAP); + event.accept(ModItems.BOTTLE_RASPBERRY_CAP_LABEL); + event.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE_CAP_LABEL); event.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE_CAP); - event.accept(ModItems.BOTTLE_RASPBERRY_LABEL_LEMONADE); + event.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE_LABEL); // Summer Mix event.accept(ModItems.BOTTLE_SUMMERMIX_LABEL); event.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE); - event.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_CAP); - event.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_LEMONADE_CAP); + event.accept(ModItems.BOTTLE_SUMMERMIX_CAP_LABEL); + event.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE_CAP_LABEL); event.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE_CAP); - event.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_LEMONADE); + event.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE_LABEL); // Watermelon event.accept(ModItems.BOTTLE_WATERMELON_LABEL); event.accept(ModItems.BOTTLE_WATERMELON_LEMONADE); - event.accept(ModItems.BOTTLE_WATERMELON_LABEL_CAP); - event.accept(ModItems.BOTTLE_WATERMELON_LABEL_LEMONADE_CAP); + event.accept(ModItems.BOTTLE_WATERMELON_CAP_LABEL); + event.accept(ModItems.BOTTLE_WATERMELON_LEMONADE_CAP_LABEL); event.accept(ModItems.BOTTLE_WATERMELON_LEMONADE_CAP); - event.accept(ModItems.BOTTLE_WATERMELON_LABEL_LEMONADE); + event.accept(ModItems.BOTTLE_WATERMELON_LEMONADE_LABEL); } } diff --git a/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java b/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java index c627f80..3a1c172 100644 --- a/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java +++ b/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java @@ -35,42 +35,42 @@ public class ModCreativeModeTabs { // Citron output.accept(ModItems.BOTTLE_CITRON_LABEL); output.accept(ModItems.BOTTLE_CITRON_LEMONADE); - output.accept(ModItems.BOTTLE_CITRON_LABEL_CAP); - output.accept(ModItems.BOTTLE_CITRON_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_CITRON_CAP_LABEL); + output.accept(ModItems.BOTTLE_CITRON_LEMONADE_CAP_LABEL); output.accept(ModItems.BOTTLE_CITRON_LEMONADE_CAP); - output.accept(ModItems.BOTTLE_CITRON_LABEL_LEMONADE); + output.accept(ModItems.BOTTLE_CITRON_LEMONADE_LABEL); // Orange output.accept(ModItems.BOTTLE_ORANGE_LABEL); output.accept(ModItems.BOTTLE_ORANGE_LEMONADE); - output.accept(ModItems.BOTTLE_ORANGE_LABEL_CAP); - output.accept(ModItems.BOTTLE_ORANGE_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_ORANGE_CAP_LABEL); + output.accept(ModItems.BOTTLE_ORANGE_LEMONADE_CAP_LABEL); output.accept(ModItems.BOTTLE_ORANGE_LEMONADE_CAP); - output.accept(ModItems.BOTTLE_ORANGE_LABEL_LEMONADE); + output.accept(ModItems.BOTTLE_ORANGE_LEMONADE_LABEL); // Raspberry output.accept(ModItems.BOTTLE_RASPBERRY_LABEL); output.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE); - output.accept(ModItems.BOTTLE_RASPBERRY_LABEL_CAP); - output.accept(ModItems.BOTTLE_RASPBERRY_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_RASPBERRY_CAP_LABEL); + output.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE_CAP_LABEL); output.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE_CAP); - output.accept(ModItems.BOTTLE_RASPBERRY_LABEL_LEMONADE); + output.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE_LABEL); // Summer Mix output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL); output.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE); - output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_CAP); - output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_SUMMERMIX_CAP_LABEL); + output.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE_CAP_LABEL); output.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE_CAP); - output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL_LEMONADE); + output.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE_LABEL); // Watermelon output.accept(ModItems.BOTTLE_WATERMELON_LABEL); output.accept(ModItems.BOTTLE_WATERMELON_LEMONADE); - output.accept(ModItems.BOTTLE_WATERMELON_LABEL_CAP); - output.accept(ModItems.BOTTLE_WATERMELON_LABEL_LEMONADE_CAP); + output.accept(ModItems.BOTTLE_WATERMELON_CAP_LABEL); + output.accept(ModItems.BOTTLE_WATERMELON_LEMONADE_CAP_LABEL); output.accept(ModItems.BOTTLE_WATERMELON_LEMONADE_CAP); - output.accept(ModItems.BOTTLE_WATERMELON_LABEL_LEMONADE); + output.accept(ModItems.BOTTLE_WATERMELON_LEMONADE_LABEL); }) .build() ); diff --git a/src/main/java/net/doppelr/lemonmates/item/ModItems.java b/src/main/java/net/doppelr/lemonmates/item/ModItems.java index d52106c..983ea98 100644 --- a/src/main/java/net/doppelr/lemonmates/item/ModItems.java +++ b/src/main/java/net/doppelr/lemonmates/item/ModItems.java @@ -28,78 +28,73 @@ public class ModItems { () -> new Item(new Item.Properties())); // Citron - public static final DeferredItem BOTTLE_CITRON_LABEL = ITEMS.register("bottle_citron_label", - () -> new Item(new Item.Properties())); public static final DeferredItem BOTTLE_CITRON_LEMONADE = ITEMS.register("bottle_citron_lemonade", () -> new Item(new Item.Properties())); - - public static final DeferredItem BOTTLE_CITRON_LABEL_CAP = ITEMS.register("bottle_citron_label_cap", + public static final DeferredItem BOTTLE_CITRON_LEMONADE_CAP = ITEMS.register("bottle_citron_lemonade_cap", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_CITRON_LABEL_LEMONADE_CAP = ITEMS.register("bottle_citron_label_lemonade_cap", + public static final DeferredItem BOTTLE_CITRON_LEMONADE_CAP_LABEL = ITEMS.register("bottle_citron_lemonade_cap_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_CITRON_LEMONADE_CAP = ITEMS.register("bottle_citron_lemonade_cap", + public static final DeferredItem BOTTLE_CITRON_CAP_LABEL = ITEMS.register("bottle_citron_cap_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_CITRON_LABEL_LEMONADE = ITEMS.register("bottle_citron_label_lemonade", + public static final DeferredItem BOTTLE_CITRON_LABEL = ITEMS.register("bottle_citron_label", + () -> new Item(new Item.Properties())); + public static final DeferredItem BOTTLE_CITRON_LEMONADE_LABEL = ITEMS.register("bottle_citron_lemonade_label", () -> new Item(new Item.Properties())); // Orange - public static final DeferredItem BOTTLE_ORANGE_LABEL = ITEMS.register("bottle_orange_label", - () -> new Item(new Item.Properties())); public static final DeferredItem BOTTLE_ORANGE_LEMONADE = ITEMS.register("bottle_orange_lemonade", () -> new Item(new Item.Properties())); - - public static final DeferredItem BOTTLE_ORANGE_LABEL_CAP = ITEMS.register("bottle_orange_label_cap", + public static final DeferredItem BOTTLE_ORANGE_LEMONADE_CAP = ITEMS.register("bottle_orange_lemonade_cap", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_ORANGE_LABEL_LEMONADE_CAP = ITEMS.register("bottle_orange_label_lemonade_cap", + public static final DeferredItem BOTTLE_ORANGE_LEMONADE_CAP_LABEL = ITEMS.register("bottle_orange_lemonade_cap_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_ORANGE_LEMONADE_CAP = ITEMS.register("bottle_orange_lemonade_cap", + public static final DeferredItem BOTTLE_ORANGE_CAP_LABEL = ITEMS.register("bottle_orange_cap_label", + () -> new Item(new Item.Properties())); + public static final DeferredItem BOTTLE_ORANGE_LABEL = ITEMS.register("bottle_orange_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_ORANGE_LABEL_LEMONADE = ITEMS.register("bottle_orange_label_lemonade", + public static final DeferredItem BOTTLE_ORANGE_LEMONADE_LABEL = ITEMS.register("bottle_orange_lemonade_label", () -> new Item(new Item.Properties())); // Raspberry - public static final DeferredItem BOTTLE_RASPBERRY_LABEL = ITEMS.register("bottle_raspberry_label", - () -> new Item(new Item.Properties())); public static final DeferredItem BOTTLE_RASPBERRY_LEMONADE = ITEMS.register("bottle_raspberry_lemonade", () -> new Item(new Item.Properties())); - - public static final DeferredItem BOTTLE_RASPBERRY_LABEL_CAP = ITEMS.register("bottle_raspberry_label_cap", + public static final DeferredItem BOTTLE_RASPBERRY_LEMONADE_CAP = ITEMS.register("bottle_raspberry_lemonade_cap", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_RASPBERRY_LABEL_LEMONADE_CAP = ITEMS.register("bottle_raspberry_label_lemonade_cap", + public static final DeferredItem BOTTLE_RASPBERRY_CAP_LABEL = ITEMS.register("bottle_raspberry_cap_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_RASPBERRY_LEMONADE_CAP = ITEMS.register("bottle_raspberry_lemonade_cap", + public static final DeferredItem BOTTLE_RASPBERRY_LEMONADE_CAP_LABEL = ITEMS.register("bottle_raspberry_lemonade_cap_label", + () -> new Item(new Item.Properties())); + public static final DeferredItem BOTTLE_RASPBERRY_LABEL = ITEMS.register("bottle_raspberry_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_RASPBERRY_LABEL_LEMONADE = ITEMS.register("bottle_raspberry_label_lemonade", + public static final DeferredItem BOTTLE_RASPBERRY_LEMONADE_LABEL = ITEMS.register("bottle_raspberry_lemonade_label", () -> new Item(new Item.Properties())); // Summer Mix - public static final DeferredItem BOTTLE_SUMMERMIX_LABEL = ITEMS.register("bottle_summermix_label", - () -> new Item(new Item.Properties())); public static final DeferredItem BOTTLE_SUMMERMIX_LEMONADE = ITEMS.register("bottle_summermix_lemonade", () -> new Item(new Item.Properties())); - - public static final DeferredItem BOTTLE_SUMMERMIX_LABEL_CAP = ITEMS.register("bottle_summermix_label_cap", + public static final DeferredItem BOTTLE_SUMMERMIX_LEMONADE_CAP = ITEMS.register("bottle_summermix_lemonade_cap", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_SUMMERMIX_LABEL_LEMONADE_CAP = ITEMS.register("bottle_summermix_label_lemonade_cap", + public static final DeferredItem BOTTLE_SUMMERMIX_LEMONADE_CAP_LABEL = ITEMS.register("bottle_summermix_lemonade_cap_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_SUMMERMIX_LEMONADE_CAP = ITEMS.register("bottle_summermix_lemonade_cap", + public static final DeferredItem BOTTLE_SUMMERMIX_CAP_LABEL = ITEMS.register("bottle_summermix_cap_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_SUMMERMIX_LABEL_LEMONADE = ITEMS.register("bottle_summermix_label_lemonade", + public static final DeferredItem BOTTLE_SUMMERMIX_LABEL = ITEMS.register("bottle_summermix_label", + () -> new Item(new Item.Properties())); + public static final DeferredItem BOTTLE_SUMMERMIX_LEMONADE_LABEL = ITEMS.register("bottle_summermix_lemonade_label", () -> new Item(new Item.Properties())); // Watermelon - public static final DeferredItem BOTTLE_WATERMELON_LABEL = ITEMS.register("bottle_watermelon_label", - () -> new Item(new Item.Properties())); public static final DeferredItem BOTTLE_WATERMELON_LEMONADE = ITEMS.register("bottle_watermelon_lemonade", () -> new Item(new Item.Properties())); - - public static final DeferredItem BOTTLE_WATERMELON_LABEL_CAP = ITEMS.register("bottle_watermelon_label_cap", + public static final DeferredItem BOTTLE_WATERMELON_LEMONADE_CAP = ITEMS.register("bottle_watermelon_lemonade_cap", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_WATERMELON_LABEL_LEMONADE_CAP = ITEMS.register("bottle_watermelon_label_lemonade_cap", + public static final DeferredItem BOTTLE_WATERMELON_CAP_LABEL = ITEMS.register("bottle_watermelon_cap_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_WATERMELON_LEMONADE_CAP = ITEMS.register("bottle_watermelon_lemonade_cap", + public static final DeferredItem BOTTLE_WATERMELON_LEMONADE_CAP_LABEL = ITEMS.register("bottle_watermelon_lemonade_cap_label", + () -> new Item(new Item.Properties())); + public static final DeferredItem BOTTLE_WATERMELON_LABEL = ITEMS.register("bottle_watermelon_label", () -> new Item(new Item.Properties())); - public static final DeferredItem BOTTLE_WATERMELON_LABEL_LEMONADE = ITEMS.register("bottle_watermelon_label_lemonade", + public static final DeferredItem BOTTLE_WATERMELON_LEMONADE_LABEL = ITEMS.register("bottle_watermelon_lemonade_label", () -> new Item(new Item.Properties())); public static void register(IEventBus eventBus) { diff --git a/src/main/resources/assets/lemonmates/lang/en_US.json b/src/main/resources/assets/lemonmates/lang/en_US.json index 1d153cb..3ce404f 100644 --- a/src/main/resources/assets/lemonmates/lang/en_US.json +++ b/src/main/resources/assets/lemonmates/lang/en_US.json @@ -12,36 +12,36 @@ "item.lemonmates.bottle_citron_label": "Bottle with Citron Lemonade Label", "item.lemonmates.bottle_citron_lemonade": "Bottle with Citron Lemonade", - "item.lemonmates.bottle_citron_label_cap": "Capped Bottle with Citron Label", - "item.lemonmates.bottle_citron_label_lemonade_cap": "Citron Lemonade", + "item.lemonmates.bottle_citron_cap_label": "Capped Bottle with Citron Label", + "item.lemonmates.bottle_citron_lemonade_cap_label": "Citron Lemonade", "item.lemonmates.bottle_citron_lemonade_cap": "Capped Bottle with Citron Lemonade", - "item.lemonmates.bottle_citron_label_lemonade": "Labeled Bottle with Citron Lemonade", + "item.lemonmates.bottle_citron_lemonade_label": "Labeled Bottle with Citron Lemonade", "item.lemonmates.bottle_orange_label": "Bottle with Orange Lemonade Label", "item.lemonmates.bottle_orange_lemonade": "Bottle with Orange Lemonade", - "item.lemonmates.bottle_orange_label_cap": "Capped Bottle with Orange Label", - "item.lemonmates.bottle_orange_label_lemonade_cap": "Orange Lemonade", + "item.lemonmates.bottle_orange_cap_label": "Capped Bottle with Orange Label", + "item.lemonmates.bottle_orange_lemonade_cap_label": "Orange Lemonade", "item.lemonmates.bottle_orange_lemonade_cap": "Capped Bottle with Orange Lemonade", - "item.lemonmates.bottle_orange_label_lemonade": "Labeled Bottle with Orange Lemonade", + "item.lemonmates.bottle_orange_lemonade_label": "Labeled Bottle with Orange Lemonade", "item.lemonmates.bottle_raspberry_label": "Bottle with Raspberry Lemonade Label", "item.lemonmates.bottle_raspberry_lemonade": "Bottle with Raspberry Lemonade", - "item.lemonmates.bottle_raspberry_label_cap": "Capped Bottle with Raspberry Label", - "item.lemonmates.bottle_raspberry_label_lemonade_cap": "Raspberry Lemonade", + "item.lemonmates.bottle_raspberry_cap_label": "Capped Bottle with Raspberry Label", + "item.lemonmates.bottle_raspberry_lemonade_cap_label": "Raspberry Lemonade", "item.lemonmates.bottle_raspberry_lemonade_cap": "Capped Bottle with Raspberry Lemonade", - "item.lemonmates.bottle_raspberry_label_lemonade": "Labeled Bottle with Raspberry Lemonade", + "item.lemonmates.bottle_raspberry_lemonade_label": "Labeled Bottle with Raspberry Lemonade", "item.lemonmates.bottle_summermix_label": "Bottle with Summer-Mix Lemonade Label", "item.lemonmates.bottle_summermix_lemonade": "Bottle with Summer-Mix Lemonade", - "item.lemonmates.bottle_summermix_label_cap": "Capped Bottle with Summer-Mix Label", - "item.lemonmates.bottle_summermix_label_lemonade_cap": "Summer-Mix Lemonade", + "item.lemonmates.bottle_summermix_cap_label": "Capped Bottle with Summer-Mix Label", + "item.lemonmates.bottle_summermix_lemonade_cap_label": "Summer-Mix Lemonade", "item.lemonmates.bottle_summermix_lemonade_cap": "Capped Bottle with Summer-Mix Lemonade", - "item.lemonmates.bottle_summermix_label_lemonade": "Labeled Bottle with Summer-Mix Lemonade", + "item.lemonmates.bottle_summermix_lemonade_label": "Labeled Bottle with Summer-Mix Lemonade", "item.lemonmates.bottle_watermelon_label": "Bottle with Watermelon Lemonade Label", "item.lemonmates.bottle_watermelon_lemonade": "Bottle with Watermelon Lemonade", - "item.lemonmates.bottle_watermelon_label_cap": "Capped Bottle with Watermelon Label", - "item.lemonmates.bottle_watermelon_label_lemonade_cap": "Watermelon Lemonade", + "item.lemonmates.bottle_watermelon_cap_label": "Capped Bottle with Watermelon Label", + "item.lemonmates.bottle_watermelon_lemonade_cap_label": "Watermelon Lemonade", "item.lemonmates.bottle_watermelon_lemonade_cap": "Capped Bottle with Watermelon Lemonade", - "item.lemonmates.bottle_watermelon_label_lemonade": "Labeled Bottle with Watermelon Lemonade" + "item.lemonmates.bottle_watermelon_lemonade_label": "Labeled Bottle with Watermelon Lemonade" } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_label_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_citron_label_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_citron_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_label_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_citron_label_lemonade_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_label_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_citron_label_lemonade.json rename to src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_label_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_orange_label_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_orange_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_label_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_orange_label_lemonade_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_label_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_orange_label_lemonade.json rename to src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_raspberry_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label_lemonade_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label_lemonade.json rename to src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_label_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_summermix_label_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_summermix_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_label_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_summermix_label_lemonade_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_label_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_summermix_label_lemonade.json rename to src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_watermelon_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label_lemonade_cap.json rename to src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap_label.json diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_label.json similarity index 100% rename from src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label_lemonade.json rename to src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_label.json From ff5d4454a3664481acf7ab144b9b9d0e61f1faef Mon Sep 17 00:00:00 2001 From: Guddi Date: Fri, 15 Aug 2025 02:31:16 +0200 Subject: [PATCH 4/8] changed bottle texture models to use layers changed all the models .json files added new texture files --- .../models/item/bottle_citron_cap_label.json | 5 ++++- .../models/item/bottle_citron_label.json | 5 ++++- .../models/item/bottle_citron_lemonade.json | 3 ++- .../models/item/bottle_citron_lemonade_cap.json | 3 ++- .../item/bottle_citron_lemonade_cap_label.json | 6 +++++- .../item/bottle_citron_lemonade_label.json | 6 +++++- .../models/item/bottle_orange_cap_label.json | 5 ++++- .../models/item/bottle_orange_label.json | 5 ++++- .../models/item/bottle_orange_lemonade.json | 3 ++- .../models/item/bottle_orange_lemonade_cap.json | 3 ++- .../item/bottle_orange_lemonade_cap_label.json | 6 +++++- .../item/bottle_orange_lemonade_label.json | 6 +++++- .../models/item/bottle_raspberry_cap_label.json | 5 ++++- .../models/item/bottle_raspberry_label.json | 5 ++++- .../models/item/bottle_raspberry_lemonade.json | 3 ++- .../item/bottle_raspberry_lemonade_cap.json | 3 ++- .../bottle_raspberry_lemonade_cap_label.json | 6 +++++- .../item/bottle_raspberry_lemonade_label.json | 6 +++++- .../models/item/bottle_summermix_cap_label.json | 5 ++++- .../models/item/bottle_summermix_label.json | 5 ++++- .../models/item/bottle_summermix_lemonade.json | 3 ++- .../item/bottle_summermix_lemonade_cap.json | 3 ++- .../bottle_summermix_lemonade_cap_label.json | 6 +++++- .../item/bottle_summermix_lemonade_label.json | 6 +++++- .../item/bottle_watermelon_cap_label.json | 5 ++++- .../models/item/bottle_watermelon_label.json | 5 ++++- .../models/item/bottle_watermelon_lemonade.json | 3 ++- .../item/bottle_watermelon_lemonade_cap.json | 3 ++- .../bottle_watermelon_lemonade_cap_label.json | 6 +++++- .../item/bottle_watermelon_lemonade_label.json | 6 +++++- .../textures/item/bottle_cap_layer.png | Bin 0 -> 367 bytes .../textures/item/bottle_citron_label_cap.png | Bin 610 -> 0 bytes .../item/bottle_citron_label_lemonade_cap.png | Bin 667 -> 0 bytes ...melon_label_cap.png => bottle_empty_cap.png} | Bin 602 -> 514 bytes .../textures/item/bottle_fluid/citron.png | Bin 0 -> 445 bytes .../textures/item/bottle_fluid/orange.png | Bin 0 -> 453 bytes .../textures/item/bottle_fluid/raspberry.png | Bin 0 -> 451 bytes .../textures/item/bottle_fluid/summermix.png | Bin 0 -> 445 bytes .../textures/item/bottle_fluid/watermelon.png | Bin 0 -> 560 bytes .../textures/item/bottle_orange_label_cap.png | Bin 613 -> 0 bytes .../item/bottle_orange_label_lemonade_cap.png | Bin 685 -> 0 bytes .../item/bottle_raspberry_label_cap.png | Bin 605 -> 0 bytes .../bottle_raspberry_label_lemonade_cap.png | Bin 699 -> 0 bytes .../item/bottle_summermix_label_cap.png | Bin 612 -> 0 bytes .../bottle_summermix_label_lemonade_cap.png | Bin 681 -> 0 bytes .../bottle_watermelon_label_lemonade_cap.png | Bin 718 -> 0 bytes .../textures/item/citron_lemonade_label.png | Bin 471 -> 0 bytes .../textures/item/label/bottle_empty.png | Bin 0 -> 425 bytes .../lemonmates/textures/item/label/citron.png | Bin 0 -> 379 bytes .../lemonmates/textures/item/label/company.png | Bin 0 -> 367 bytes .../lemonmates/textures/item/label/orange.png | Bin 0 -> 385 bytes .../textures/item/label/raspberry.png | Bin 0 -> 367 bytes .../textures/item/label/summermix.png | Bin 0 -> 377 bytes .../textures/item/label/watermelon.png | Bin 0 -> 369 bytes .../textures/item/orange_lemonade_label.png | Bin 485 -> 0 bytes .../textures/item/raspberry_lemonade_label.png | Bin 470 -> 0 bytes .../textures/item/summer_mix_label.png | Bin 476 -> 0 bytes .../textures/item/watermelon_lemonade_label.png | Bin 475 -> 0 bytes 58 files changed, 110 insertions(+), 30 deletions(-) create mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_cap_layer.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_citron_label_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_citron_label_lemonade_cap.png rename src/main/resources/assets/lemonmates/textures/item/{bottle_watermelon_label_cap.png => bottle_empty_cap.png} (54%) create mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_fluid/citron.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_fluid/orange.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_fluid/raspberry.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_fluid/summermix.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_fluid/watermelon.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_orange_label_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_orange_label_lemonade_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_raspberry_label_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_raspberry_label_lemonade_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_summermix_label_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_summermix_label_lemonade_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/bottle_watermelon_label_lemonade_cap.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/citron_lemonade_label.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/bottle_empty.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/citron.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/company.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/orange.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/raspberry.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/summermix.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/watermelon.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/orange_lemonade_label.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/raspberry_lemonade_label.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/summer_mix_label.png delete mode 100644 src/main/resources/assets/lemonmates/textures/item/watermelon_lemonade_label.png diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_cap_label.json index 3480ea4..2e7fa03 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_cap_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_citron_label_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/citron" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_label.json index 8e396b6..752306b 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_citron_label" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/citron" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json index 49b08f9..fa5c511 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_citron_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/citron" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json index 63eef3c..059b9ad 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_citron_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/citron" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap_label.json index e7b1135..6c487b0 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_citron_label_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/citron", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/citron" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_label.json index f8a9534..9224c57 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_citron_label_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/citron", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/citron" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_cap_label.json index 828f1d1..255b7ee 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_cap_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_orange_label_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/orange" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_label.json index 0e6b090..379586d 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_orange_label" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/orange" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json index 71fc687..4cfe578 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_orange_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/orange" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json index 1d4d0c1..a0eef38 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_orange_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/orange" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap_label.json index b226b02..8f5e47c 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_orange_label_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/orange", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/orange" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_label.json index 5a8362e..1c062e9 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_orange_label_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/orange", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/orange" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_cap_label.json index 0249882..ff45e0f 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_cap_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_raspberry_label_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/raspberry" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label.json index f1d45c7..64a4b85 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_raspberry_label" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/raspberry" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json index c6c2520..e968a44 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_raspberry_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/raspberry" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json index 47a7190..c8c6af9 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_raspberry_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/raspberry" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap_label.json index 5eb6f13..d16ca50 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_raspberry_label_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/raspberry", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/raspberry" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_label.json index ef18704..7625627 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_raspberry_label_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/citron", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/raspberry" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_cap_label.json index 3bf752a..41943d0 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_cap_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_summermix_label_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/summermix" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_label.json index 08f48c0..993d4e5 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_summermix_label" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/summermix" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json index 9fdedd6..f5864da 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_summermix_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/summermix" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json index 225eaab..df7c44b 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_summermix_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/summermix" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap_label.json index c1cd0b8..ca7aa19 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_summermix_label_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/summermix", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/summermix" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_label.json index ca5e26b..1cc4227 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_summermix_label_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/summermix", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/summermix" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_cap_label.json index 0abd184..fc83f10 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_cap_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_watermelon_label_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/watermelon" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label.json index 9f1510f..5150d61 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_label.json @@ -1,6 +1,9 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_watermelon_label" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/label/bottle_empty", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/watermelon" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json index d643a53..ff05575 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_watermelon_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/watermelon" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json index b257964..e121b63 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json @@ -1,6 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_watermelon_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/watermelon" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap_label.json index fe2b34b..ae26ceb 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_watermelon_label_lemonade_cap" + "layer0": "lemonmates:item/bottle_empty_cap", + "layer1": "lemonmates:item/bottle_fluid/watermelon", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/watermelon" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_label.json index ed100f0..d40b8ef 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_label.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_label.json @@ -1,6 +1,10 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_watermelon_label_lemonade" + "layer0": "lemonmates:item/bottle_empty", + "layer1": "lemonmates:item/bottle_fluid/watermelon", + "layer2": "lemonmates:item/label/bottle_empty", + "layer3": "lemonmates:item/label/company", + "layer4": "lemonmates:item/label/watermelon" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_cap_layer.png b/src/main/resources/assets/lemonmates/textures/item/bottle_cap_layer.png new file mode 100644 index 0000000000000000000000000000000000000000..6063689037a61ab5ebc0928ec7f42d49fadbdb67 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU||j;!wY5vjbEak-;h(%fGeY^`@A_>l|LZl%MS7Y74LTT^ ZnHf~=nJ1}Ko^J)|@^tlcS?83{1OTl#LjnK* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_citron_label_cap.png b/src/main/resources/assets/lemonmates/textures/item/bottle_citron_label_cap.png deleted file mode 100644 index 0b9e004a04eb9e60e47dd24e9299af4c4e0d7ccc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU{?+!!wY5vjbnDxW?myOn{9@SQ9{!ti38UIS_DrW;VzJ3U_Np0Lby=l zrVk7$%NJKOM<*m%2(Rem_Nd+ae|N*f`5(C1mTebGC{%xWljnPUZ7OTkTmA?Jt_{D6 zFRh&MU*YU&Zfgk%7fFdlm(?4Nem*lTVa0I)2Fv2}{PAqF`|Bn8{!UC35EM(RI9f2( zvBzS8*{k8vkGcU7b6K{e9!x#0#v$y9P@b-SF6*2UngC`pw;KQe diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_citron_label_lemonade_cap.png b/src/main/resources/assets/lemonmates/textures/item/bottle_citron_label_lemonade_cap.png deleted file mode 100644 index 0627ae12760975826c17e512d02ac72d62819cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU||j;!wY5vjb{9V6|<$t}#bd!RoFUxnh zrI-aWEJ^(Q)4b<|RAbE}p3KN<<~0Jd*=EQXCA3^BU(ETP91QfOLzaLtu}zk1{ilKEvO0 ztV{OY`yYGYgZ~d!=F8EX8+J_olGFBk{k~1Vq`Lkvayu}#F)A3m3^`Lj;n~wxSstE6 zJUka)3Lkh>ndWV9C7GjPQQmp}c(&R7^%8x5CngFAiltQ?Etu-q<2bwVd$2C^1y+r! z4QxsthU(XCH>CZ&|N3BCBhNuLpnHBzet7owcAjecn~g8K*EI6D|A;)0Sorat^a?GO z17aQjcShtdbdlFF6MOUT@P-{1`1XrCY~xUHl|Q2}LBg!zA(KFZ>do2xag9F>8uF}} afq=nPY-)JW-l9dI5cYKSb6Mw<&;$TAQOODb diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_watermelon_label_cap.png b/src/main/resources/assets/lemonmates/textures/item/bottle_empty_cap.png similarity index 54% rename from src/main/resources/assets/lemonmates/textures/item/bottle_watermelon_label_cap.png rename to src/main/resources/assets/lemonmates/textures/item/bottle_empty_cap.png index 1f77e17e4cbf1799e26a4769fc411ab299f1392b..7b6da55023007730f5003bee57d17f81cd3b5513 100644 GIT binary patch delta 125 zcmV-@0D}M81cC&xI{^X!v6DRkS8j6wH%ue4H$a;2zxv7w<>Cj}0uY<+SOGqT*bF8q z5U~La1AzX7vLH6DdhTUwvf- zdhHKb01B}BbJD4p{~*oF3p*GXL>U;O(x9Dc6}HUt~M76$)8{)YjW3qUUV^hdacp(a=Z ztGD3*7V_vZ00Oc7hcLu2ym0Z}8!%05Lc*#DmSk@}dIjdgz~VwXH1!M&06chlB|&o8 Qg8%>k07*qoM6N<$f|Dy+%K!iX diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/citron.png b/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/citron.png new file mode 100644 index 0000000000000000000000000000000000000000..06b05307f0ff088272a3201b0caff24ed52ce503 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-ov)7L9y>jgMwWC0R*e7n9Aax}{e!>6$|7UQ}TKNUY=PdAuEM{Qf ziw0rF{zEnqKtYKT*NBqf{Irtt#G+J&fW*wa5n999M?Mpgz!Aj=DgrJ-z)t2G#z!QxCnwjm=E*cVYic4j*ZSUd~J27!e+j0`V; zo`cb7mNEdPCa^QG096_o85=MzfS3xhk#zyYq$xl)2rvQ7Wdf@Vva|rQpt=kV3_!Ai zrNS%G~10G|-o|LYk3PiFW(kKz9;pb*0vE|Cf##aa^N7yKUx7=CZ#0~y3w;1OBO zz`z#`!i@cgY$AYy5+$w?CBgY=CFO}lsSE*$nRz98ey$-3rh0~YmN|L1?0{;vrABzB zd3tIwaDa?ukYZ$IU<9(ffLI#J2Dw~=kr^z`1Y{dBGJ$;(1!QNovw+33fNT(0n8V2M z0_Z^)jbEalo5xln7k&nTUgNgC)|JkpTZZDa4o!QZtspw2S`-FyDQLKs? zx7(SH@J0ux@7Hf;2;G^xw#TbBdSB9Q-z%q89-Z7Vc_+i|Wz0d!pLcErneXZ9=d#Wz Gp$Pyl$7oXk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/raspberry.png b/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/raspberry.png new file mode 100644 index 0000000000000000000000000000000000000000..aea54b74f55885a7b839e387d992e470a2628c7d GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o3{mBJK7}2khG!%!fnws#+1x;iwIs+d_&*RZ{NBa~GKjOlBeIx* zfiD__8T${}L;wXPN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hhabMkK40o80vjqptK z^weVD02#|5#mLIQ2xNHyu{4woa=8X0GgzDn$TnnT0{bKi$j)qM0gGn=*&whmhmqk0 z(1S1<%~A%S)C6`07NAN4BVz-`1rSp~HnJ{&m^1~*1_36ZxlCY{L6#Ok7F3s^fdNQX z@U(L4)gU%MAk)p$#W6%9c&%SF-vI-TM-Ts=k6EmD^VXOA8i6K8mz*Ex88kPhZcHi8 zJG!i6yP%nsp<7tWvL~uVQ=D$+{7YP&YN%M7F7KlAJcl{gZ$ZjRkm;VTelF{r5}E)c CNMtqu literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/summermix.png b/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/summermix.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1f653f99579d53faace1555c678850731d07ed GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-os~0-2o{znHz6dC=S@#bkNL@*gU-19`{}~*#R(=8UISV`@iy0XB zqCuFk|By`tP*9@8HKHUqKdq!Zu_%=xATcwqM9AC&ooa@ zEd~xChm}E!k(B{tz84TnL)jo#YcMi{#hHL?Lq;aBFQS0#%yt&AcovWi0t<5(8D0QA z2cyv}WdKS|U}sjH>LQ-Ev`U;>)U1XdYjX#r$Gbr~8MfMf+v zE4N+^V)FwsT|8YJLo|Zd`g#g6C~z?S`9Gh#_>|T0M#py6j}PuMtArTcRG+fx-h>mX zlbcr^>HJW1q0dWwx6s{(lkYx^{Ce|dg}a#&Tc#FMXVUA1ydbkZUHx3vIVCg!0M+?t ASpWb4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/watermelon.png b/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/watermelon.png new file mode 100644 index 0000000000000000000000000000000000000000..4ec2262aa45d90ddb406fc6e06ca4bba4395e353 GIT binary patch literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}N0G|-o0#WW8jz(tfkpB=|N;@SZkMnJUO$D#6z)!M9$5w?vftn!RC_1m7A7UZ9cADQ-`IlvGKOU+{li zfI&ow;TBL8XMsm#F#`i%Gzc^HAF_!63QCl?MwA5SrRIOG-LeC!*_ImNnda%K#lQjNurf$7vNA9NSzbUa4P}EuLxYhSEY1XE8!|G1LnjKz z&TMA^i)R7ZAh0Wkk>Ld}&|oy0r3^r+3G56kK$QkY#s-WFAf|$BWL*F;X$p`H0!%=2 znZPQ8EG>X6s4hbT1CZ?D*BPHqU(nkOWX5~CIEH8hukG>XYfunj4h;Os@hSM>KXK7t z7h1D-XQ)lyvZm(K{Di|6A7={eUE`$1s-iXD}xjxD+42tpt($7 zl|hykKo(S&p@9KNR?OIDZ`r$qE?}^Tc)B=-SokL|(2P(%_`7}^%l~?f=_UnFUzYE1 zOEC*%Sd#epr+Lo_sm7W|JeiTz%xeT@v(1n(N@%(yao~DDi{Pmv+yzn$%qQ+$2p4MH z^noE|`QmEk=!7H-;T4_S9<_V_?{0WF{{uJMvh6|%h3YSF@_di4O=Ycm%OAnOwc%Is zrIj=OE1W&eZ7m_;A}O)xvUgKfdkH&wdGs3Rj7+w%LYzl6IU@ z_!QpV_&r$H?LiW+iy>PsTU+^d2?@LXjM?YreiraaX1;Ogf&Gd91`0|#JlA-*y8ZjJ zC9;}KH&jXUB`EgGF)Ik%uIF&(Im|8oelO$YBWfyZx)MCUJzE@}V8^4Qx5YX5`~e1r Xe9yX-iXD}xjxD+42tpt($7 zl|hykKo(S&p@9KNR?OIDZ`r$qE?}_4c)B=-SokL|(2P(%_`7}^%l~?f=_UnFUzYE1 zOEC*%Sd#epr+Lo_sm7W|JeiTz%xeT@v(1n(N@%*I@!-Ez+kZQE7m0uVX+QXrnm^jG zt#c-HiVH#UfooDVm_c0EyUjMz%%JaV^-oRk*REBPA&+}*y?)^d`3(#r2@(uUll_kV zVb6?jO!QBxIj zI6!z!<0AIej0;Q{*cLdjA7$ZSNLGILSh4MBYuS&z1s~-ME;&j$zGPS;Ifcz3kgF?7 shv6`*0)zJ^bNRhYpA#AGmazc=!*`wbCxIf9v_N6*>FVdQ&MBb@0JJF0=>Px# diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_raspberry_label_cap.png b/src/main/resources/assets/lemonmates/textures/item/bottle_raspberry_label_cap.png deleted file mode 100644 index 2eaadb877c0ec71d2ca56ce52934d9f6958b1892..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sCtK$!7v+bngUphSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo@GwnEjyr^ZK)BSX`Y^13>-iXD}xjxD+42tpt($7 zl|hykKo(S&p@9KNR?OIDZ`r$qE?}_mc)B=-SokL|(2P(%_`7}^%l~?f=_UnFUzYE1 zOEC*%Sd#epr+Lo_sm7W|JeiTz%xeT@v(1n(N@%(yao~DDi{Pmv+yzn$%qQ+$2p4MH z^noE|`QmEk=!7H-;T4_S9<_V_?{0WF{{uJMvh6|%h3YSF@_di4O=Ycm%OAnOwc%Is zrIj=OE1W&eZ7m_;A}O)xvUgKYqtqr9+2!)=R82>M+bO{!q8- zC`ZhiMvkB}&&%Y`{7bEAd)WJrdxPQ)hBiirdZRs+zo$LCtmkSl|Lq#i<`b@*8@l!G zRWpkn=1x%T*Ht|FP5zL;;R41pVoAb6VXhlgsy|=UHjrl%6Th`^WqJYw!$JM31AeXB Q%s^q}>FVdQ&MBb@0Qiow82|tP diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_raspberry_label_lemonade_cap.png b/src/main/resources/assets/lemonmates/textures/item/bottle_raspberry_label_lemonade_cap.png deleted file mode 100644 index b0aa606f6f6deb89372e868b8d9af3ed7ecc8ab7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 699 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU||j;!wY5vjb{9V6|<$t}#bd!RoFUxnh zrI-aWEJ^(Q)4b<|RAbE}p3KN<<~0Jd*=EQXB{W^qP;d_U`CqbHxUI^r^}n?X??H(p zZC;BR*08Y{d@zjI#BKDW$kV99px8j>|Ic|3RjrMi_f6smVP#5?Uqu{v-kM?=@1_qTOeE8i!YoBA8j_PO1v^;aR}W0yj}lJnqXpLTR2a+jTmAZ7O`h5G>LrPd6#{2z2yAFipBq#ayZNy5*aSc=gGgfFZIV3Z^1L^*4c*? ziUOJ5Eb9J#ui@wf#xU`i&vxfNTzkqPu{v^o(uR%yPAzy=JN4nS#o+;>96;SC#6Hfi zKN!gF#l2v~oX_7y53{xT2Z*j<$ksV9NoQAYH}~5MSB!z-&OdWvvA{!CF;EP6y85}S Ib4q9e0Lxq1*Z=?k diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_summermix_label_cap.png b/src/main/resources/assets/lemonmates/textures/item/bottle_summermix_label_cap.png deleted file mode 100644 index bd8539c6580148d1784d4ea4ba1af8f99e9119b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU{?+!!wY5vjbnDxW?myOn{9@SQ9{!ti38UIS_DrW;VzJ3U_Np0Lby=l zrVk7$%NJKOM<*m%2(Rem_Nd+ae|N*f`5(C1mTebGC{%xWljnPUZ7OTkTmA?Jt_{D6 zFRh&MU*YU&Zfgk%7fFdlm(?4Nem*lTVa0I)2Fv2}{PAptY`Jab`S*=FIJk{n^6XD+ zxN~`4&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU{?+!!wY5vjbnDxW?myOn{9@SQ9{e50)`-w6?-N&KKw7*!LXQb!e1ee zZsRrkU!M;UUema!ozrVE(}c7MZft=Z@+%}$I`&QCXz6D$;9<~a%5Gzt@HXN4p0ogw z$88;oj5&G__IMI2iqJL^G)kG rkfXzpt#e?K&aU2W?zb1N7z0E3Z9~`bI-T76pz!u|^>bP0l+XkKQp(dV diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_watermelon_label_lemonade_cap.png b/src/main/resources/assets/lemonmates/textures/item/bottle_watermelon_label_lemonade_cap.png deleted file mode 100644 index 165a589d36c3b511e388fcddfd195f338424e847..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 718 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sCtL70*MV8vmephSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo@GwnEjyr^ZK)BSX`Y^13>-iXD}xjxD+42tpt($7 zl|hykKo(S&p@9KN)~WQCzQTs^7+|o}db&7o(e zuMdCqnUhwSa2?2MFj7`N{QA4Rq+IRaV;^R>wmMFIXy42v@LIdmAyk2(jZwk%l1~qh z{(PI%9X}s3AI?t`W6NBygGE5QtFZa10<)V2FT2D3V#by0zt@W!{1L7@c;JiJlBtac zJ*&(P{|%3itmSq6*TA}f;V^^1j1sM9_8y-<9pYnS3uJ41@r5(tqs?YjiC2a!4uRXB zx9i_Y6HH8O3+D-!JR-40vcmqV5kqXlBKB;BCXr~?xhVz=Ns_;FdD`!1H}M{1+t7Nj zegZJfJY$;BZD+eKaRui!hl_`qmIfYBe*cxnGb)QG-o7r);_C;)!@*@`Y+(z2JpN?T z!KBjgu(kX9J%b1XW5YXpD%&4k=nm(xZNS%G}H0G|-oWq0!@or;-o*99nG?svvK`AlbL=b3X3S8vDxMWS@u>wy$kNswRg ze;8ocbVlbqP?WR4BeIx*f$tCqGm2_>H2?)AN?apKg7ec#$`gxH83GbB^GfvmTtgI0 z^$hhabMkK40o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7#oWCn{f0ojI(Okm$d z0oj@DEMW00AR7cel`%5B0D2lmqgl!Tl$yZKzyefhU}S8-xBy}*$VS!$5R;|=*&x6K zG?xjiGRV>b$b#xJG%x_kYAb$Mw{cNS%G|>0G|-oNvC2a+;v%YHyn999M?Mpgz!Aj=DgrJ-z)t2G#z!Qvoy8!|G1eGvs@XSTC|#j}8H5Li5!f#C&E z5sXH&lmRF;ft`T`sM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FsRj zxGB*;_aI24fv1aOh(>U7f*Uil_JIQ@7?K@5+|*`pw6J`dAu;oSPX~jrasY=j>m~*v d1(gG5co-VbFdf*ZwD=Ur98Xt2mvv4FO#sR@Spxt7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/label/citron.png b/src/main/resources/assets/lemonmates/textures/item/label/citron.png new file mode 100644 index 0000000000000000000000000000000000000000..70a35e9fe50d72d4caba75c28732dcd79cde7a62 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU||j;!wY5vjbEak-;h!wQx;UYr+4#B4Kj)bhjKWinG0chi me&EYh>7xIgra380Y-|jz+MESx#cPv6CV0B~xvX&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYR;8PhR!wY5vjbq*%_=#WBRfKUsoxal^9%cix|=|NO-G|H3&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYR;8PhR!wY5vjbq}agI#WBRfKUsoxaY8}!f77i0|I4HPwigvLscH0b r-n*NW@Z%5L85T*lv>qm%hDJt)Q-8Quzi3P;0GZ?I>gTe~DWM4fm!?hH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/label/raspberry.png b/src/main/resources/assets/lemonmates/textures/item/label/raspberry.png new file mode 100644 index 0000000000000000000000000000000000000000..eee8b23bf16b44e083cdf28d8e12dd8956fa2a8d GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU||j;!wY5vjbEak-;h!wQx;SA*Gb_`z|A{5M{d_ZQxi&De Zu`vWRvvxdHS-BUa%hT1*Wt~$(699=qLXiLf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/label/summermix.png b/src/main/resources/assets/lemonmates/textures/item/label/summermix.png new file mode 100644 index 0000000000000000000000000000000000000000..93369bfe68246e3a45648aee39f133bc0e2233d0 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDYL71`skWB&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYRU||j;!wY5vjbEak-;h!wQx;WuQ!~bBOf6g&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&oU?PmK{*dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J&4Mt|LI1`X<$jAhCT@;X= z+0FtM&jPYR;8PhR!wY5vjbq*%ez#WBRfKUsoxal(vdW2067`5g;C%)IkI;9+0` bql5&*mCGD+LJX$90qOH}^>bP0l+XkKwa7-T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lemonmates/textures/item/orange_lemonade_label.png b/src/main/resources/assets/lemonmates/textures/item/orange_lemonade_label.png deleted file mode 100644 index 3c39e79a56177391b83f19f1b2306f056f379432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}@0G|-oWq0!@or;-o*99nG?svvK`AlbL=l>eD|D9GV9u!P^;QBucD8ukW zYx`{=#aj~O7yKUyFxb9OY6D7e7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3w{ ziJ5sNdVa1U3Z{C7dX_nPx9oswwxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jpoX)rQ_ z#X){EWMl&SGz!ShY-a(BgB=OvFP_Z6@B*j^Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>cktTM>b0?2~uGBhv%$;JlUl<1#(5Twz=)5S4FBlu{KqfmnZ2lLGk zNA3Uh>n|kh%bh)-INL|Z{4d*?2?C{ya*W(&K4!Ti9n$k?SGws!X})hqcuwwdNS%G}H0G|-oWq0!@or;-o*99nG?svvK`AlbL=K=xi8Xg^>2H2?)AN?apKg7ec#$`gxH83GbB^GfvmTtgI0 z^$hhabMkK40o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7#oWCn{f0ojI(Okm$d z0oj@DEMW00AR7cel`%5B0D2lmqgl!Tl$yZKzyefhU}S8-xBy}*$VS!$5R;|=*&x6K zG?xjiGRV>b$b#xJG%x_kYAb$Mw{cNS%G}T0G|-oWq0!@or;-o*99nG?svvK`AlbL=l>}N|NCA3KS=-z1{+%522$K5 zL4Lvi;ef%*pYan=n6tnmvY3H^?+^$xifVW@00kvVTq8`;S*_rJuVDT&<8w5U;F*3XWdK^ZhS;_#En!wJ$0#s>WWNg5=0Aec0M%D!olcoUK zAixAPmkF#g$kGDHg6c9fFaXJFD}GnEabgE4cK38~4ABTa+T+OAV8FprzO8H8fBT3H z+v99@DXLie1mykX^|&!ZD%ezV@u@;4LEcwAt?P^y_A=a^bveu=fNS%G}T0G|-oWq0!@or;-o*99nG?svvK`AlbL=NTE*Lo%wtXL5mpOw;}f0V(d1 zAiv=MaKPZ@&-e)_%vsF9Z$&ir= z?87J^JF}eyES?2qgTUg+3=A)TieNOFr3^r+3G56kK$QkY#s-WFAf|$BWL*F;X$p`H z0!%=2nZPQ8EG>X6s4hbT1CVTNz)gw%xd%ZS-8@|!Lo|Yq_G}b9V8Fw~sJ?0OUv|D7 zC6kS;RzCPC{A7K5BF6*2UngB4AcZmQ1 From 66c156060852cfde28dd9b5c8f8d49151e56f9cf Mon Sep 17 00:00:00 2001 From: Guddi Date: Fri, 15 Aug 2025 02:48:59 +0200 Subject: [PATCH 5/8] added label items --- .../net/doppelr/lemonmates/LemonMates.java | 14 +++++++----- .../lemonmates/item/ModCreativeModeTabs.java | 14 +++++++----- .../net/doppelr/lemonmates/item/ModItems.java | 20 ++++++++++++------ .../models/item/citron_lemonade_label.json | 6 ------ .../models/item/label_citron_lemonade.json | 9 ++++++++ ...summer_mix_label.json => label_empty.json} | 2 +- .../models/item/label_orange_lemonade.json | 9 ++++++++ .../models/item/label_raspberry_lemonade.json | 9 ++++++++ .../models/item/label_summer_mix.json | 9 ++++++++ .../lemonmates/models/item/label_text.json | 7 ++++++ .../models/item/label_text_company.json | 8 +++++++ .../item/label_watermelon_lemonade.json | 9 ++++++++ .../models/item/orange_lemonade_label.json | 6 ------ .../models/item/raspberry_lemonade_label.json | 6 ------ .../item/watermelon_lemonade_label.json | 6 ------ .../lemonmates/textures/item/label/empty.png | Bin 0 -> 438 bytes .../lemonmates/textures/item/label/text.png | Bin 0 -> 374 bytes 17 files changed, 93 insertions(+), 41 deletions(-) delete mode 100644 src/main/resources/assets/lemonmates/models/item/citron_lemonade_label.json create mode 100644 src/main/resources/assets/lemonmates/models/item/label_citron_lemonade.json rename src/main/resources/assets/lemonmates/models/item/{summer_mix_label.json => label_empty.json} (56%) create mode 100644 src/main/resources/assets/lemonmates/models/item/label_orange_lemonade.json create mode 100644 src/main/resources/assets/lemonmates/models/item/label_raspberry_lemonade.json create mode 100644 src/main/resources/assets/lemonmates/models/item/label_summer_mix.json create mode 100644 src/main/resources/assets/lemonmates/models/item/label_text.json create mode 100644 src/main/resources/assets/lemonmates/models/item/label_text_company.json create mode 100644 src/main/resources/assets/lemonmates/models/item/label_watermelon_lemonade.json delete mode 100644 src/main/resources/assets/lemonmates/models/item/orange_lemonade_label.json delete mode 100644 src/main/resources/assets/lemonmates/models/item/raspberry_lemonade_label.json delete mode 100644 src/main/resources/assets/lemonmates/models/item/watermelon_lemonade_label.json create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/empty.png create mode 100644 src/main/resources/assets/lemonmates/textures/item/label/text.png diff --git a/src/main/java/net/doppelr/lemonmates/LemonMates.java b/src/main/java/net/doppelr/lemonmates/LemonMates.java index afd016b..719102b 100644 --- a/src/main/java/net/doppelr/lemonmates/LemonMates.java +++ b/src/main/java/net/doppelr/lemonmates/LemonMates.java @@ -59,11 +59,15 @@ private void addCreative(BuildCreativeModeTabContentsEvent event) { event.accept(ModItems.BOTTLE_EMPTY); // Labels - event.accept(ModItems.CITRON_LEMONADE_LABEL); - event.accept(ModItems.ORANGE_LEMONADE_LABEL); - event.accept(ModItems.RASPBERRY_LEMONADE_LABEL); - event.accept(ModItems.SUMMER_MIX_LABEL); - event.accept(ModItems.WATERMELON_LEMONADE_LABEL); + event.accept(ModItems.LABEL_EMPTY); + event.accept(ModItems.LABEL_TEXT); + event.accept(ModItems.LABEL_TEXT_COMPANY); + + event.accept(ModItems.LABEL_CITRON_LEMONADE); + event.accept(ModItems.LABEL_ORANGE_LEMONADE); + event.accept(ModItems.LABEL_RASPBERRY_LEMONADE); + event.accept(ModItems.LABEL_SUMMER_MIX); + event.accept(ModItems.LABEL_WATERMELON_LEMONADE); // Citron event.accept(ModItems.BOTTLE_CITRON_LABEL); diff --git a/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java b/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java index 3a1c172..3ba721f 100644 --- a/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java +++ b/src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java @@ -26,11 +26,15 @@ public class ModCreativeModeTabs { output.accept(ModItems.BOTTLE_EMPTY); // Labels - output.accept(ModItems.CITRON_LEMONADE_LABEL); - output.accept(ModItems.ORANGE_LEMONADE_LABEL); - output.accept(ModItems.RASPBERRY_LEMONADE_LABEL); - output.accept(ModItems.SUMMER_MIX_LABEL); - output.accept(ModItems.WATERMELON_LEMONADE_LABEL); + output.accept(ModItems.LABEL_EMPTY); + output.accept(ModItems.LABEL_TEXT); + output.accept(ModItems.LABEL_TEXT_COMPANY); + + output.accept(ModItems.LABEL_CITRON_LEMONADE); + output.accept(ModItems.LABEL_ORANGE_LEMONADE); + output.accept(ModItems.LABEL_RASPBERRY_LEMONADE); + output.accept(ModItems.LABEL_SUMMER_MIX); + output.accept(ModItems.LABEL_WATERMELON_LEMONADE); // Citron output.accept(ModItems.BOTTLE_CITRON_LABEL); diff --git a/src/main/java/net/doppelr/lemonmates/item/ModItems.java b/src/main/java/net/doppelr/lemonmates/item/ModItems.java index 983ea98..71ed56e 100644 --- a/src/main/java/net/doppelr/lemonmates/item/ModItems.java +++ b/src/main/java/net/doppelr/lemonmates/item/ModItems.java @@ -15,16 +15,24 @@ public class ModItems { public static final DeferredItem BOTTLE_CAP = ITEMS.register("bottle_cap", () -> new Item(new Item.Properties())); - // Labels - public static final DeferredItem CITRON_LEMONADE_LABEL = ITEMS.register("citron_lemonade_label", + // Labels Basic + public static final DeferredItem LABEL_EMPTY = ITEMS.register("label_empty", () -> new Item(new Item.Properties())); - public static final DeferredItem ORANGE_LEMONADE_LABEL = ITEMS.register("orange_lemonade_label", + public static final DeferredItem LABEL_TEXT = ITEMS.register("label_text", () -> new Item(new Item.Properties())); - public static final DeferredItem RASPBERRY_LEMONADE_LABEL = ITEMS.register("raspberry_lemonade_label", + public static final DeferredItem LABEL_TEXT_COMPANY = ITEMS.register("label_text_company", () -> new Item(new Item.Properties())); - public static final DeferredItem SUMMER_MIX_LABEL = ITEMS.register("summer_mix_label", + + // Labels Lemonades + public static final DeferredItem LABEL_CITRON_LEMONADE = ITEMS.register("label_citron_lemonade", + () -> new Item(new Item.Properties())); + public static final DeferredItem LABEL_ORANGE_LEMONADE = ITEMS.register("label_orange_lemonade", + () -> new Item(new Item.Properties())); + public static final DeferredItem LABEL_RASPBERRY_LEMONADE = ITEMS.register("label_raspberry_lemonade", + () -> new Item(new Item.Properties())); + public static final DeferredItem LABEL_SUMMER_MIX = ITEMS.register("label_summer_mix", () -> new Item(new Item.Properties())); - public static final DeferredItem WATERMELON_LEMONADE_LABEL = ITEMS.register("watermelon_lemonade_label", + public static final DeferredItem LABEL_WATERMELON_LEMONADE = ITEMS.register("label_watermelon_lemonade", () -> new Item(new Item.Properties())); // Citron diff --git a/src/main/resources/assets/lemonmates/models/item/citron_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/citron_lemonade_label.json deleted file mode 100644 index 14e67f7..0000000 --- a/src/main/resources/assets/lemonmates/models/item/citron_lemonade_label.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "lemonmates:item/citron_lemonade_label" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/label_citron_lemonade.json b/src/main/resources/assets/lemonmates/models/item/label_citron_lemonade.json new file mode 100644 index 0000000..7a99abb --- /dev/null +++ b/src/main/resources/assets/lemonmates/models/item/label_citron_lemonade.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lemonmates:item/label/empty", + "layer1": "lemonmates:item/label/text", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/citron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/summer_mix_label.json b/src/main/resources/assets/lemonmates/models/item/label_empty.json similarity index 56% rename from src/main/resources/assets/lemonmates/models/item/summer_mix_label.json rename to src/main/resources/assets/lemonmates/models/item/label_empty.json index e94655d..375982b 100644 --- a/src/main/resources/assets/lemonmates/models/item/summer_mix_label.json +++ b/src/main/resources/assets/lemonmates/models/item/label_empty.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/summer_mix_label" + "layer0": "lemonmates:item/label/empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/label_orange_lemonade.json b/src/main/resources/assets/lemonmates/models/item/label_orange_lemonade.json new file mode 100644 index 0000000..a54d314 --- /dev/null +++ b/src/main/resources/assets/lemonmates/models/item/label_orange_lemonade.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lemonmates:item/label/empty", + "layer1": "lemonmates:item/label/text", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/label_raspberry_lemonade.json b/src/main/resources/assets/lemonmates/models/item/label_raspberry_lemonade.json new file mode 100644 index 0000000..3f21da2 --- /dev/null +++ b/src/main/resources/assets/lemonmates/models/item/label_raspberry_lemonade.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lemonmates:item/label/empty", + "layer1": "lemonmates:item/label/text", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/raspberry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/label_summer_mix.json b/src/main/resources/assets/lemonmates/models/item/label_summer_mix.json new file mode 100644 index 0000000..a6ac3a1 --- /dev/null +++ b/src/main/resources/assets/lemonmates/models/item/label_summer_mix.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lemonmates:item/label/empty", + "layer1": "lemonmates:item/label/text", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/summermix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/label_text.json b/src/main/resources/assets/lemonmates/models/item/label_text.json new file mode 100644 index 0000000..c354ff7 --- /dev/null +++ b/src/main/resources/assets/lemonmates/models/item/label_text.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lemonmates:item/label/empty", + "layer1": "lemonmates:item/label/text" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/label_text_company.json b/src/main/resources/assets/lemonmates/models/item/label_text_company.json new file mode 100644 index 0000000..e568afa --- /dev/null +++ b/src/main/resources/assets/lemonmates/models/item/label_text_company.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lemonmates:item/label/empty", + "layer1": "lemonmates:item/label/text", + "layer2": "lemonmates:item/label/company" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/label_watermelon_lemonade.json b/src/main/resources/assets/lemonmates/models/item/label_watermelon_lemonade.json new file mode 100644 index 0000000..602bd59 --- /dev/null +++ b/src/main/resources/assets/lemonmates/models/item/label_watermelon_lemonade.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lemonmates:item/label/empty", + "layer1": "lemonmates:item/label/text", + "layer2": "lemonmates:item/label/company", + "layer3": "lemonmates:item/label/watermelon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/orange_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/orange_lemonade_label.json deleted file mode 100644 index 0c5a072..0000000 --- a/src/main/resources/assets/lemonmates/models/item/orange_lemonade_label.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "lemonmates:item/orange_lemonade_label" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/raspberry_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/raspberry_lemonade_label.json deleted file mode 100644 index 273619b..0000000 --- a/src/main/resources/assets/lemonmates/models/item/raspberry_lemonade_label.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "lemonmates:item/raspberry_lemonade_label" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/watermelon_lemonade_label.json b/src/main/resources/assets/lemonmates/models/item/watermelon_lemonade_label.json deleted file mode 100644 index b0e7002..0000000 --- a/src/main/resources/assets/lemonmates/models/item/watermelon_lemonade_label.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "lemonmates:item/watermelon_lemonade_label" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/textures/item/label/empty.png b/src/main/resources/assets/lemonmates/textures/item/label/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..2cd043a68006eb7a049821a12465f0ccea699101 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-oWq0!@or;-o*99nWm4PPn999M?Mpgz!Aj=DgrJ-z)t2G#z!QxCnwjm=E*cVYic4j*ZSRCXg5V%>!$nXN_ zIT(#*DFaYy0y_f>P^E#9u>s=(h^ZhOSr{&804!_N zaZkjd$_&W1^>lFz(Fi`;Z79T`z;Srir~mf1Up;%Ias1#?mb0PvnK-2dRTe_cqOB&8lW<{C&*~f)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7 zdX_nPx9oswwxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;aB>!N_{ z%yt&AcovWi0yoPT8D20WXf#V1fKn6K8CZZS4UCKp7#BcH1=+~D0AkV_r~4&Ye5=zoW#drAi7% gLvHOzSi!``#xRkUCtb*UxeQ3Nr>mdKI;Vst0Ld;$K>z>% literal 0 HcmV?d00001 From 8810b14ffd7fa7f690884303c9166834541d3b1e Mon Sep 17 00:00:00 2001 From: Guddi Date: Fri, 15 Aug 2025 02:58:22 +0200 Subject: [PATCH 6/8] changed layers for bottles without label --- .../assets/lemonmates/models/item/bottle_citron_lemonade.json | 4 ++-- .../lemonmates/models/item/bottle_citron_lemonade_cap.json | 4 ++-- .../assets/lemonmates/models/item/bottle_orange_lemonade.json | 4 ++-- .../lemonmates/models/item/bottle_orange_lemonade_cap.json | 4 ++-- .../lemonmates/models/item/bottle_raspberry_lemonade.json | 4 ++-- .../lemonmates/models/item/bottle_raspberry_lemonade_cap.json | 4 ++-- .../lemonmates/models/item/bottle_summermix_lemonade.json | 4 ++-- .../lemonmates/models/item/bottle_summermix_lemonade_cap.json | 4 ++-- .../lemonmates/models/item/bottle_watermelon_lemonade.json | 4 ++-- .../models/item/bottle_watermelon_lemonade_cap.json | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json index fa5c511..87753db 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty", - "layer1": "lemonmates:item/bottle_fluid/citron" + "layer0": "lemonmates:item/bottle_fluid/citron", + "layer1": "lemonmates:item/bottle_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json index 059b9ad..2d80e9c 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_citron_lemonade_cap.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty_cap", - "layer1": "lemonmates:item/bottle_fluid/citron" + "layer0": "lemonmates:item/bottle_fluid/citron", + "layer1": "lemonmates:item/bottle_empty_cap" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json index 4cfe578..b7f71f6 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty", - "layer1": "lemonmates:item/bottle_fluid/orange" + "layer0": "lemonmates:item/bottle_fluid/orange", + "layer1": "lemonmates:item/bottle_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json index a0eef38..2a042f2 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_orange_lemonade_cap.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty_cap", - "layer1": "lemonmates:item/bottle_fluid/orange" + "layer0": "lemonmates:item/bottle_fluid/orange", + "layer1": "lemonmates:item/bottle_empty_cap" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json index e968a44..02241ae 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty", - "layer1": "lemonmates:item/bottle_fluid/raspberry" + "layer0": "lemonmates:item/bottle_fluid/raspberry", + "layer1": "lemonmates:item/bottle_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json index c8c6af9..6f5c710 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_raspberry_lemonade_cap.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty_cap", - "layer1": "lemonmates:item/bottle_fluid/raspberry" + "layer0": "lemonmates:item/bottle_fluid/raspberry", + "layer1": "lemonmates:item/bottle_empty_cap" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json index f5864da..5c03c26 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty", - "layer1": "lemonmates:item/bottle_fluid/summermix" + "layer0": "lemonmates:item/bottle_fluid/summermix", + "layer1": "lemonmates:item/bottle_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json index df7c44b..5a9982e 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_summermix_lemonade_cap.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty_cap", - "layer1": "lemonmates:item/bottle_fluid/summermix" + "layer0": "lemonmates:item/bottle_fluid/summermix", + "layer1": "lemonmates:item/bottle_empty_cap" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json index ff05575..79ad9c0 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty", - "layer1": "lemonmates:item/bottle_fluid/watermelon" + "layer0": "lemonmates:item/bottle_fluid/watermelon", + "layer1": "lemonmates:item/bottle_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json index e121b63..1b6d442 100644 --- a/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json +++ b/src/main/resources/assets/lemonmates/models/item/bottle_watermelon_lemonade_cap.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "lemonmates:item/bottle_empty_cap", - "layer1": "lemonmates:item/bottle_fluid/watermelon" + "layer0": "lemonmates:item/bottle_fluid/watermelon", + "layer1": "lemonmates:item/bottle_empty_cap" } } \ No newline at end of file From 916727bb5e00f6570ab77ad41b8f9da382e7cec4 Mon Sep 17 00:00:00 2001 From: Guddi Date: Fri, 15 Aug 2025 03:00:52 +0200 Subject: [PATCH 7/8] updated bottle_fluid texture removed a pixel where the bottle is thinner --- .../textures/item/bottle_fluid/orange.png | Bin 453 -> 454 bytes .../textures/item/bottle_fluid/raspberry.png | Bin 451 -> 449 bytes .../textures/item/bottle_fluid/summermix.png | Bin 445 -> 447 bytes .../textures/item/bottle_fluid/watermelon.png | Bin 560 -> 558 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/orange.png b/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/orange.png index 1b60860b28416cd7ce88c6cc6c90120fa42b9534..63948e372e2903b406f1aadff25faf89faa47f51 100644 GIT binary patch delta 102 zcmV-s0Ga>A1I7ceXaQbHNkl07*qo IM6N<$g0?X#U;qFB delta 101 zcmV-r0Gj{C1H}WdXaQYFNklh2m%59|C{S#+oYb?13@zaa?F1Rkbv4+ z1tDnLhXTY6TT^GhFM|M8xoxeCN_|_tV%tsB%Ov8-xRbd6+ol6jBlEen00000NkvXX Hu0mjfE7~eB diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/raspberry.png b/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/raspberry.png index aea54b74f55885a7b839e387d992e470a2628c7d..55bb1ac7a177a5f7ac5e76a1a661da30ed25066d 100644 GIT binary patch delta 97 zcmV-n0G|KD1Hl8ZXaQM7Nkl>|JyYrtxt>BtZQo(5WHKS`wG$By>H`CF&{d-<00000NkvXXu0mjf DZ(t?M delta 99 zcmV-p0G$891H%KbXaQSBNklGL~Qua04cF$ zv1D^@#ioe25jHw8Mpk5|ePEI?Y delta 97 zcmV-n0G|K91HA*VWC2-3Nkl&)QhXwKA-vcC6GTA4T zvfhx$C6j}y#EI~7(2hzcyAs{ulilH2_1W2YM>Zk`X(|GVV(Xy|00000NkvXXu0mjf D>lZ1) diff --git a/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/watermelon.png b/src/main/resources/assets/lemonmates/textures/item/bottle_fluid/watermelon.png index 4ec2262aa45d90ddb406fc6e06ca4bba4395e353..56254e2a7d560f19f5849a57b9a08b9061ea5d64 100644 GIT binary patch delta 147 zcmV;E0BrxT1g-?INdXC=Yykl10{{S_lTra+eG$teh1F69P5=M^T}ebiR47xej7tuH zAQS^p@dL;o74Cmgr4L-Vwu@#mNz2M7{|PpX6Q2pu%eo0Efh5$fja9(*;rgNr(HBi< z^DH=!gb(!75dPHYrAMBleDaS@}FSCIPsYfy{tki1tg(2V|NYgAMROnA!J=R zAPHmZf&)qT&|ZNgVrs8I636L$xPT;biZNv%i8rO(?$j0 Date: Fri, 15 Aug 2025 03:15:02 +0200 Subject: [PATCH 8/8] added en_US names for labels --- src/main/resources/assets/lemonmates/lang/en_US.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/lemonmates/lang/en_US.json b/src/main/resources/assets/lemonmates/lang/en_US.json index 3ce404f..544c96c 100644 --- a/src/main/resources/assets/lemonmates/lang/en_US.json +++ b/src/main/resources/assets/lemonmates/lang/en_US.json @@ -4,11 +4,13 @@ "item.lemonmates.bottle_cap": "Bottle Cap", "item.lemonmates.bottle_empty": "Empty Bottle", - "item.lemonmates.citron_lemonade_label": "Citron Lemonade Label", - "item.lemonmates.orange_lemonade_label": "Orange Lemonade Label", - "item.lemonmates.raspberry_lemonade_label": "Raspberry Lemonade Label", - "item.lemonmates.summer_mix_label": "Summer-Mix Lemonade Label", - "item.lemonmates.watermelon_lemonade_label": "Watermelon Lemonade Label", + "item.lemonmates.label_empty": "Empty Label", + "item.lemonmates.label_text": "Label with Product Information", + "item.lemonmates.label_text_company": "Label with Text and Company logo", + "item.lemonmates.label_orange_lemonade": "Orange Lemonade Label", + "item.lemonmates.label_raspberry_lemonade": "Raspberry Lemonade Label", + "item.lemonmates.label_summer_mix": "Summer-Mix Lemonade Label", + "item.lemonmates.label_watermelon_lemonade": "Watermelon Lemonade Label", "item.lemonmates.bottle_citron_label": "Bottle with Citron Lemonade Label", "item.lemonmates.bottle_citron_lemonade": "Bottle with Citron Lemonade",