diff --git a/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java b/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java index 6e780b0..091dd16 100644 --- a/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java +++ b/src/main/java/de/slpnetwork/brewcraft/item/ModCreativeModeTabs.java @@ -37,6 +37,16 @@ public class ModCreativeModeTabs { pOutput.accept(ModItems.Milling_Stone.get()); pOutput.accept(ModItems.Pressed_Iron.get()); pOutput.accept(ModItems.Pressure_Body.get()); + 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_Apple_Juice.get()); + pOutput.accept(ModItems.Glass_Of_Grape_Juice.get()); + pOutput.accept(ModItems.Glass_Of_Water.get()); + pOutput.accept(ModItems.Bottle_Of_Whine.get()); + pOutput.accept(ModItems.Bottle_Of_Corn_Beer.get()); + pOutput.accept(ModItems.Bottle_Of_Apple_Juice.get()); + pOutput.accept(ModItems.Bottle_Of_Grape_Juice.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 4036b3c..7be9215 100644 --- a/src/main/java/de/slpnetwork/brewcraft/item/ModItems.java +++ b/src/main/java/de/slpnetwork/brewcraft/item/ModItems.java @@ -28,7 +28,16 @@ public class ModItems { public static final RegistryObject Milling_Stone = ITEMS.register("milling_stone", () -> new Item(new Item.Properties())); 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_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 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_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())); /*** * 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 1922933..ad5c24d 100644 --- a/src/main/resources/assets/brewcraft/lang/en_us.json +++ b/src/main/resources/assets/brewcraft/lang/en_us.json @@ -10,10 +10,20 @@ "item.brewcraft.malt": "Malt", "item.brewcraft.heater_body": "Heater Body", "item.brewcraft.heater_element": "Heater Element", - "item.brewcraft.heater_element": "Mashine Body", + "item.brewcraft.mashine_body": "Mashine Body", "item.brewcraft.milling_stone": "Milling Stone", "item.brewcraft.pressed_iron": "Pressed Iron", "item.brewcraft.pressure_body": "Pressure Body", + "item.brewcraft.bottle_of_corn_beer": "Bottle of Corn Beer", + "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.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": "Glass", "creativetab.brewcraft_tab": "Brewcraft" } \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_apple_juice.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_apple_juice.json new file mode 100644 index 0000000..618f56c --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_apple_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_apple_juice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_corn_beer.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_corn_beer.json new file mode 100644 index 0000000..20f78c9 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_corn_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_corn_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_grape_juice.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_grape_juice.json new file mode 100644 index 0000000..d35eca4 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_grape_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_grape_juice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/bottle_of_whine.json b/src/main/resources/assets/brewcraft/models/item/bottle_of_whine.json new file mode 100644 index 0000000..e461377 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/bottle_of_whine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/bottle_of_whine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass.json b/src/main/resources/assets/brewcraft/models/item/glass.json new file mode 100644 index 0000000..324a3bf --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_apple_juice.json b/src/main/resources/assets/brewcraft/models/item/glass_of_apple_juice.json new file mode 100644 index 0000000..b497a67 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_apple_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_apple_juice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_corn_beer.json b/src/main/resources/assets/brewcraft/models/item/glass_of_corn_beer.json new file mode 100644 index 0000000..ef6daa7 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_corn_beer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_corn_beer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_grape_juice.json b/src/main/resources/assets/brewcraft/models/item/glass_of_grape_juice.json new file mode 100644 index 0000000..9401a52 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_grape_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_grape_juice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_water.json b/src/main/resources/assets/brewcraft/models/item/glass_of_water.json new file mode 100644 index 0000000..c0f4c07 --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_water.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_water" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/models/item/glass_of_whine.json b/src/main/resources/assets/brewcraft/models/item/glass_of_whine.json new file mode 100644 index 0000000..b1f586c --- /dev/null +++ b/src/main/resources/assets/brewcraft/models/item/glass_of_whine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "brewcraft:item/glass_of_whine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/brewcraft/textures/item/bottle_of_apple_juice.png b/src/main/resources/assets/brewcraft/textures/item/bottle_of_apple_juice.png new file mode 100644 index 0000000..48c1002 Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/bottle_of_apple_juice.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/bottle_of_corn_beer.png b/src/main/resources/assets/brewcraft/textures/item/bottle_of_corn_beer.png new file mode 100644 index 0000000..7b0db00 Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/bottle_of_corn_beer.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/bottle_of_grape_juice.png b/src/main/resources/assets/brewcraft/textures/item/bottle_of_grape_juice.png new file mode 100644 index 0000000..cba9681 Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/bottle_of_grape_juice.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/bottle_of_whine.png b/src/main/resources/assets/brewcraft/textures/item/bottle_of_whine.png new file mode 100644 index 0000000..074f55d Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/bottle_of_whine.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass.png b/src/main/resources/assets/brewcraft/textures/item/glass.png new file mode 100644 index 0000000..79665d2 Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_apple_juice.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_apple_juice.png new file mode 100644 index 0000000..48e6d2e Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_apple_juice.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_corn_beer.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_corn_beer.png new file mode 100644 index 0000000..9e03997 Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_corn_beer.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_grape_juice.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_grape_juice.png new file mode 100644 index 0000000..1c25cdb Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_grape_juice.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_water.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_water.png new file mode 100644 index 0000000..e68e658 Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_water.png differ diff --git a/src/main/resources/assets/brewcraft/textures/item/glass_of_whine.png b/src/main/resources/assets/brewcraft/textures/item/glass_of_whine.png new file mode 100644 index 0000000..412a3dd Binary files /dev/null and b/src/main/resources/assets/brewcraft/textures/item/glass_of_whine.png differ diff --git a/tex/apple_juice.psd b/tex/apple_juice.psd new file mode 100644 index 0000000..78b075c Binary files /dev/null and b/tex/apple_juice.psd differ diff --git a/tex/corn_beer.psd b/tex/corn_beer.psd new file mode 100644 index 0000000..73ecb93 Binary files /dev/null and b/tex/corn_beer.psd differ diff --git a/tex/glass.psd b/tex/glass.psd new file mode 100644 index 0000000..e7c343a Binary files /dev/null and b/tex/glass.psd differ diff --git a/tex/glass_of_apple_juice.psd b/tex/glass_of_apple_juice.psd new file mode 100644 index 0000000..3c9af69 Binary files /dev/null and b/tex/glass_of_apple_juice.psd differ diff --git a/tex/glass_of_corn_beer.psd b/tex/glass_of_corn_beer.psd new file mode 100644 index 0000000..27f93a6 Binary files /dev/null and b/tex/glass_of_corn_beer.psd differ diff --git a/tex/glass_of_grape_juice.psd b/tex/glass_of_grape_juice.psd new file mode 100644 index 0000000..2ff193c Binary files /dev/null and b/tex/glass_of_grape_juice.psd differ diff --git a/tex/glass_of_water.psd b/tex/glass_of_water.psd new file mode 100644 index 0000000..716edb5 Binary files /dev/null and b/tex/glass_of_water.psd differ diff --git a/tex/glass_of_whine.psd b/tex/glass_of_whine.psd new file mode 100644 index 0000000..5878158 Binary files /dev/null and b/tex/glass_of_whine.psd differ diff --git a/tex/grape_juice.psd b/tex/grape_juice.psd new file mode 100644 index 0000000..6a72edc Binary files /dev/null and b/tex/grape_juice.psd differ diff --git a/tex/whine.psd b/tex/whine.psd new file mode 100644 index 0000000..b5a5a9b Binary files /dev/null and b/tex/whine.psd differ