diff --git a/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java b/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java index 091dd16..7ebfc79 100644 --- a/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java +++ b/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java @@ -40,13 +40,23 @@ public class ModCreativeModeTabs { pOutput.accept(ModItems.Glass.get()); pOutput.accept(ModItems.Glass_Of_Whine.get()); pOutput.accept(ModItems.Glass_Of_Corn_Beer.get()); + pOutput.accept(ModItems.Glass_Of_Hop_Beer.get()); + pOutput.accept(ModItems.Glass_Of_Yeast_Beer.get()); + pOutput.accept(ModItems.Glass_Of_Pils_Beer.get()); + pOutput.accept(ModItems.Glass_Of_Apple_Beer.get()); pOutput.accept(ModItems.Glass_Of_Apple_Juice.get()); pOutput.accept(ModItems.Glass_Of_Grape_Juice.get()); pOutput.accept(ModItems.Glass_Of_Water.get()); + pOutput.accept(ModItems.Glass_Of_Sake.get()); pOutput.accept(ModItems.Bottle_Of_Whine.get()); pOutput.accept(ModItems.Bottle_Of_Corn_Beer.get()); + pOutput.accept(ModItems.Bottle_Of_Hop_Beer.get()); + pOutput.accept(ModItems.Bottle_Of_Yeast_Beer.get()); + pOutput.accept(ModItems.Bottle_Of_Pils_Beer.get()); + pOutput.accept(ModItems.Bottle_Of_Apple_Beer.get()); pOutput.accept(ModItems.Bottle_Of_Apple_Juice.get()); pOutput.accept(ModItems.Bottle_Of_Grape_Juice.get()); + pOutput.accept(ModItems.Bottle_Of_Sake.get()); }) .build()); diff --git a/src/main/java/de/slpnetwork/brewcraft/item/ModItems.java b/src/main/java/de/slpnetwork/brewcraft/item/ModItems.java index 7be9215..bd652a7 100644 --- a/src/main/java/de/slpnetwork/brewcraft/item/ModItems.java +++ b/src/main/java/de/slpnetwork/brewcraft/item/ModItems.java @@ -29,15 +29,25 @@ public class ModItems { public static final RegistryObject Pressed_Iron = ITEMS.register("pressed_iron", () -> new Item(new Item.Properties())); public static final RegistryObject Pressure_Body = ITEMS.register("pressure_body", () -> new Item(new Item.Properties())); public static final RegistryObject Bottle_Of_Corn_Beer = ITEMS.register("bottle_of_corn_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Bottle_Of_Hop_Beer = ITEMS.register("bottle_of_hop_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Bottle_Of_Pils_Beer = ITEMS.register("bottle_of_pils_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Bottle_Of_Yeast_Beer = ITEMS.register("bottle_of_yeast_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Bottle_Of_Apple_Beer = ITEMS.register("bottle_of_apple_beer", () -> new Item(new Item.Properties())); public static final RegistryObject Bottle_Of_Whine = ITEMS.register("bottle_of_whine", () -> new Item(new Item.Properties())); public static final RegistryObject Bottle_Of_Grape_Juice = ITEMS.register("bottle_of_grape_juice", () -> new Item(new Item.Properties())); public static final RegistryObject Bottle_Of_Apple_Juice = ITEMS.register("bottle_of_apple_juice", () -> new Item(new Item.Properties())); + public static final RegistryObject Bottle_Of_Sake = ITEMS.register("bottle_of_sake", () -> new Item(new Item.Properties())); public static final RegistryObject Glass = ITEMS.register("glass", () -> new Item(new Item.Properties())); public static final RegistryObject Glass_Of_Corn_Beer = ITEMS.register("glass_of_corn_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Glass_Of_Hop_Beer = ITEMS.register("glass_of_hop_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Glass_Of_Yeast_Beer = ITEMS.register("glass_of_yeast_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Glass_Of_Apple_Beer = ITEMS.register("glass_of_apple_beer", () -> new Item(new Item.Properties())); + public static final RegistryObject Glass_Of_Pils_Beer = ITEMS.register("glass_of_pils_beer", () -> new Item(new Item.Properties())); public static final RegistryObject Glass_Of_Whine = ITEMS.register("glass_of_whine", () -> new Item(new Item.Properties())); public static final RegistryObject Glass_Of_Grape_Juice = ITEMS.register("glass_of_grape_juice", () -> new Item(new Item.Properties())); public static final RegistryObject Glass_Of_Apple_Juice = ITEMS.register("glass_of_apple_juice", () -> new Item(new Item.Properties())); public static final RegistryObject Glass_Of_Water = ITEMS.register("glass_of_water", () -> new Item(new Item.Properties())); + public static final RegistryObject Glass_Of_Sake = ITEMS.register("glass_of_sake", () -> new Item(new Item.Properties())); /*** * registers the deferredregister * @param eventBus the mods eventbus diff --git a/src/main/resources/assets/brewcraft/lang/en_us.json b/src/main/resources/assets/brewcraft/lang/en_us.json index ad5c24d..569715d 100644 --- a/src/main/resources/assets/brewcraft/lang/en_us.json +++ b/src/main/resources/assets/brewcraft/lang/en_us.json @@ -18,11 +18,18 @@ "item.brewcraft.bottle_of_whine": "Bottle of Whine", "item.brewcraft.bottle_of_apple_juice": "Bottle of Apple Juice", "item.brewcraft.bottle_of_grape_juice": "Bottle of Grape Juice", + "item.brewcraft.bottle_of_sake": "Bottle of Sake", + "item.brewcraft.bottle_of_yeast_beer": "Bottle of Yeast Beer", + "item.brewcraft.bottle_of_pils_beer": "Bottle of Pils Beer", "item.brewcraft.glass_of_corn_beer": "Glass of Corn Beer", "item.brewcraft.glass_of_whine": "Glass of Whine", "item.brewcraft.glass_of_apple_juice": "Glass of Apple Juice", "item.brewcraft.glass_of_grape_juice": "Glass of Grape Juice", "item.brewcraft.glass_of_water": "Glass of Water", + "item.brewcraft.glass_of_sake": "Glass of Sake", + "item.brewcraft.glass_of_yeast_beer": "Glass of Yeast Beer", + "item.brewcraft.glass_of_pils_beer": "Glass of Pils Beer", + "item.brewcraft.glass": "Glass", "creativetab.brewcraft_tab": "Brewcraft" diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_apple_beer.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_apple_beer.json new file mode 100644 index 0000000..e1da054 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_apple_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_apple_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_hop_beer.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_hop_beer.json new file mode 100644 index 0000000..423037e --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_hop_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_hop_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_pils_beer.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_pils_beer.json new file mode 100644 index 0000000..5fdfd32 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_pils_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_pils_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_sake.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_sake.json new file mode 100644 index 0000000..6cfe5a7 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_sake.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_sake" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_yeast_beer.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_yeast_beer.json new file mode 100644 index 0000000..7b97a9f --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_yeast_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_yeast_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_apple_beer.json b/src/main/resources/assets/brewcraft/models/item/glass_of_apple_beer.json new file mode 100644 index 0000000..e224708 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_apple_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_apple_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_hop_beer.json b/src/main/resources/assets/brewcraft/models/item/glass_of_hop_beer.json new file mode 100644 index 0000000..9eb05b9 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_hop_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_hop_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_pils_beer.json b/src/main/resources/assets/brewcraft/models/item/glass_of_pils_beer.json new file mode 100644 index 0000000..84ba193 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_pils_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_pils_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_sake.json b/src/main/resources/assets/brewcraft/models/item/glass_of_sake.json new file mode 100644 index 0000000..965a80e --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_sake.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_sake" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_yeast_beer.json b/src/main/resources/assets/brewcraft/models/item/glass_of_yeast_beer.json new file mode 100644 index 0000000..7330617 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_yeast_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_yeast_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/textures/item/bottle_of_hop_beer.png b/src/main/resources/assets/brewcraft/textures/item/bottle_of_hop_beer.png new file mode 100644 index 0000000..da5b138 Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/bottle_of_hop_beer.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/bottle_of_pils_beer.png b/src/main/resources/assets/brewcraft/textures/item/bottle_of_pils_beer.png new file mode 100644 index 0000000..eb8bdbc Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/bottle_of_pils_beer.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/bottle_of_sake.png b/src/main/resources/assets/brewcraft/textures/item/bottle_of_sake.png new file mode 100644 index 0000000..d4a2f0a Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/bottle_of_sake.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_hop_beer.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_hop_beer.png new file mode 100644 index 0000000..3dcc98e Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_hop_beer.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_pils_beer.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_pils_beer.png new file mode 100644 index 0000000..9f5b56b Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_pils_beer.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_sake.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_sake.png new file mode 100644 index 0000000..1a2e6ed Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_sake.png differ diff --git a/tex/bottle_of_hop_beer.psd b/tex/bottle_of_hop_beer.psd new file mode 100644 index 0000000..723d4b4 Binary files /dev/null and b/tex/bottle_of_hop_beer.psd differ diff --git a/tex/bottle_of_pils_beer.psd b/tex/bottle_of_pils_beer.psd new file mode 100644 index 0000000..c1ef17b Binary files /dev/null and b/tex/bottle_of_pils_beer.psd differ diff --git a/tex/bottle_of_sake.psd b/tex/bottle_of_sake.psd new file mode 100644 index 0000000..7ea0c1b Binary files /dev/null and b/tex/bottle_of_sake.psd differ diff --git a/tex/glass_of_hop_beer.psd b/tex/glass_of_hop_beer.psd new file mode 100644 index 0000000..adfdf07 Binary files /dev/null and b/tex/glass_of_hop_beer.psd differ diff --git a/tex/glass_of_pils_beer.psd b/tex/glass_of_pils_beer.psd new file mode 100644 index 0000000..7c67c06 Binary files /dev/null and b/tex/glass_of_pils_beer.psd differ diff --git a/tex/glass_of_sake.psd b/tex/glass_of_sake.psd new file mode 100644 index 0000000..ef9cd09 Binary files /dev/null and b/tex/glass_of_sake.psd differ