Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions src/main/java/net/doppelr/lemonmates/LemonMates.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -56,51 +59,55 @@ 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);
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);

}
}
Expand Down
85 changes: 85 additions & 0 deletions src/main/java/net/doppelr/lemonmates/item/ModCreativeModeTabs.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
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<CreativeModeTab> CREATIVE_MODE_TAB =
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LemonMates.MOD_ID);

public static final Supplier<CreativeModeTab> 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.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);
output.accept(ModItems.BOTTLE_CITRON_LEMONADE);
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_LEMONADE_LABEL);

// Orange
output.accept(ModItems.BOTTLE_ORANGE_LABEL);
output.accept(ModItems.BOTTLE_ORANGE_LEMONADE);
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_LEMONADE_LABEL);

// Raspberry
output.accept(ModItems.BOTTLE_RASPBERRY_LABEL);
output.accept(ModItems.BOTTLE_RASPBERRY_LEMONADE);
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_LEMONADE_LABEL);

// Summer Mix
output.accept(ModItems.BOTTLE_SUMMERMIX_LABEL);
output.accept(ModItems.BOTTLE_SUMMERMIX_LEMONADE);
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_LEMONADE_LABEL);

// Watermelon
output.accept(ModItems.BOTTLE_WATERMELON_LABEL);
output.accept(ModItems.BOTTLE_WATERMELON_LEMONADE);
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_LEMONADE_LABEL);
})
.build()
);

public static void register(IEventBus eventBus) {
CREATIVE_MODE_TAB.register(eventBus);
}
}
85 changes: 44 additions & 41 deletions src/main/java/net/doppelr/lemonmates/item/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,91 +15,94 @@ public class ModItems {
public static final DeferredItem<Item> BOTTLE_CAP = ITEMS.register("bottle_cap",
() -> new Item(new Item.Properties()));

// Labels
public static final DeferredItem<Item> CITRON_LEMONADE_LABEL = ITEMS.register("citron_lemonade_label",
// Labels Basic
public static final DeferredItem<Item> LABEL_EMPTY = ITEMS.register("label_empty",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> ORANGE_LEMONADE_LABEL = ITEMS.register("orange_lemonade_label",
public static final DeferredItem<Item> LABEL_TEXT = ITEMS.register("label_text",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> RASPBERRY_LEMONADE_LABEL = ITEMS.register("raspberry_lemonade_label",
public static final DeferredItem<Item> LABEL_TEXT_COMPANY = ITEMS.register("label_text_company",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> SUMMER_MIX_LABEL = ITEMS.register("summer_mix_label",

// Labels Lemonades
public static final DeferredItem<Item> LABEL_CITRON_LEMONADE = ITEMS.register("label_citron_lemonade",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> LABEL_ORANGE_LEMONADE = ITEMS.register("label_orange_lemonade",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> LABEL_RASPBERRY_LEMONADE = ITEMS.register("label_raspberry_lemonade",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> WATERMELON_LEMONADE_LABEL = ITEMS.register("watermelon_lemonade_label",
public static final DeferredItem<Item> LABEL_SUMMER_MIX = ITEMS.register("label_summer_mix",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> LABEL_WATERMELON_LEMONADE = ITEMS.register("label_watermelon_lemonade",
() -> new Item(new Item.Properties()));

// Citron
public static final DeferredItem<Item> BOTTLE_CITRON_LABEL = ITEMS.register("bottle_citron_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_CITRON_LEMONADE = ITEMS.register("bottle_citron_lemonade",
() -> new Item(new Item.Properties()));

public static final DeferredItem<Item> BOTTLE_CITRON_LABEL_CAP = ITEMS.register("bottle_citron_label_cap",
public static final DeferredItem<Item> BOTTLE_CITRON_LEMONADE_CAP = ITEMS.register("bottle_citron_lemonade_cap",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_CITRON_LABEL_LEMONADE_CAP = ITEMS.register("bottle_citron_label_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_CITRON_LEMONADE_CAP_LABEL = ITEMS.register("bottle_citron_lemonade_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_CITRON_LEMONADE_CAP = ITEMS.register("bottle_citron_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_CITRON_CAP_LABEL = ITEMS.register("bottle_citron_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_CITRON_LABEL = ITEMS.register("bottle_citron_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_CITRON_LABEL_LEMONADE = ITEMS.register("bottle_citron_label_lemonade",
public static final DeferredItem<Item> BOTTLE_CITRON_LEMONADE_LABEL = ITEMS.register("bottle_citron_lemonade_label",
() -> new Item(new Item.Properties()));

// Orange
public static final DeferredItem<Item> BOTTLE_ORANGE_LABEL = ITEMS.register("bottle_orange_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_ORANGE_LEMONADE = ITEMS.register("bottle_orange_lemonade",
() -> new Item(new Item.Properties()));

public static final DeferredItem<Item> BOTTLE_ORANGE_LABEL_CAP = ITEMS.register("bottle_orange_label_cap",
public static final DeferredItem<Item> BOTTLE_ORANGE_LEMONADE_CAP = ITEMS.register("bottle_orange_lemonade_cap",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_ORANGE_LABEL_LEMONADE_CAP = ITEMS.register("bottle_orange_label_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_ORANGE_LEMONADE_CAP_LABEL = ITEMS.register("bottle_orange_lemonade_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_ORANGE_LEMONADE_CAP = ITEMS.register("bottle_orange_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_ORANGE_CAP_LABEL = ITEMS.register("bottle_orange_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_ORANGE_LABEL = ITEMS.register("bottle_orange_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_ORANGE_LABEL_LEMONADE = ITEMS.register("bottle_orange_label_lemonade",
public static final DeferredItem<Item> BOTTLE_ORANGE_LEMONADE_LABEL = ITEMS.register("bottle_orange_lemonade_label",
() -> new Item(new Item.Properties()));

// Raspberry
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LABEL = ITEMS.register("bottle_raspberry_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LEMONADE = ITEMS.register("bottle_raspberry_lemonade",
() -> new Item(new Item.Properties()));

public static final DeferredItem<Item> BOTTLE_RASPBERRY_LABEL_CAP = ITEMS.register("bottle_raspberry_label_cap",
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LEMONADE_CAP = ITEMS.register("bottle_raspberry_lemonade_cap",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LABEL_LEMONADE_CAP = ITEMS.register("bottle_raspberry_label_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_RASPBERRY_CAP_LABEL = ITEMS.register("bottle_raspberry_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LEMONADE_CAP = ITEMS.register("bottle_raspberry_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LEMONADE_CAP_LABEL = ITEMS.register("bottle_raspberry_lemonade_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LABEL = ITEMS.register("bottle_raspberry_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LABEL_LEMONADE = ITEMS.register("bottle_raspberry_label_lemonade",
public static final DeferredItem<Item> BOTTLE_RASPBERRY_LEMONADE_LABEL = ITEMS.register("bottle_raspberry_lemonade_label",
() -> new Item(new Item.Properties()));

// Summer Mix
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LABEL = ITEMS.register("bottle_summermix_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LEMONADE = ITEMS.register("bottle_summermix_lemonade",
() -> new Item(new Item.Properties()));

public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LABEL_CAP = ITEMS.register("bottle_summermix_label_cap",
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LEMONADE_CAP = ITEMS.register("bottle_summermix_lemonade_cap",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LABEL_LEMONADE_CAP = ITEMS.register("bottle_summermix_label_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LEMONADE_CAP_LABEL = ITEMS.register("bottle_summermix_lemonade_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LEMONADE_CAP = ITEMS.register("bottle_summermix_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_CAP_LABEL = ITEMS.register("bottle_summermix_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LABEL_LEMONADE = ITEMS.register("bottle_summermix_label_lemonade",
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LABEL = ITEMS.register("bottle_summermix_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_SUMMERMIX_LEMONADE_LABEL = ITEMS.register("bottle_summermix_lemonade_label",
() -> new Item(new Item.Properties()));

// Watermelon
public static final DeferredItem<Item> BOTTLE_WATERMELON_LABEL = ITEMS.register("bottle_watermelon_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_WATERMELON_LEMONADE = ITEMS.register("bottle_watermelon_lemonade",
() -> new Item(new Item.Properties()));

public static final DeferredItem<Item> BOTTLE_WATERMELON_LABEL_CAP = ITEMS.register("bottle_watermelon_label_cap",
public static final DeferredItem<Item> BOTTLE_WATERMELON_LEMONADE_CAP = ITEMS.register("bottle_watermelon_lemonade_cap",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_WATERMELON_LABEL_LEMONADE_CAP = ITEMS.register("bottle_watermelon_label_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_WATERMELON_CAP_LABEL = ITEMS.register("bottle_watermelon_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_WATERMELON_LEMONADE_CAP = ITEMS.register("bottle_watermelon_lemonade_cap",
public static final DeferredItem<Item> BOTTLE_WATERMELON_LEMONADE_CAP_LABEL = ITEMS.register("bottle_watermelon_lemonade_cap_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_WATERMELON_LABEL = ITEMS.register("bottle_watermelon_label",
() -> new Item(new Item.Properties()));
public static final DeferredItem<Item> BOTTLE_WATERMELON_LABEL_LEMONADE = ITEMS.register("bottle_watermelon_label_lemonade",
public static final DeferredItem<Item> BOTTLE_WATERMELON_LEMONADE_LABEL = ITEMS.register("bottle_watermelon_lemonade_label",
() -> new Item(new Item.Properties()));

public static void register(IEventBus eventBus) {
Expand Down
Loading