Merge pull request #2 from MEGATREX4/patchouli-craft-test

Patchouli craft test
MEGATREX4 · Aug 8, 2024 · e71313d · e71313d
2 parents 1fe6736 + 02a7a0f
commit e71313d
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 14 deletions.
diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java b/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java
@@ -4,8 +4,8 @@
 import com.megatrex4.ukrainian_dlight.block.FoodJarBlocks;
 import com.megatrex4.ukrainian_dlight.block.ModBlocks;
 import com.megatrex4.ukrainian_dlight.block.entity.ModBlockEntities;
+//import com.megatrex4.ukrainian_dlight.compat.patchouli.CustomBrewingRecipeProcessor;
 import com.megatrex4.ukrainian_dlight.config.ModConfig;
-//import com.megatrex4.ukrainian_dlight.config.UkrainianDelightConfig;
 import com.megatrex4.ukrainian_dlight.initialize.Initialise;
 import com.megatrex4.ukrainian_dlight.item.ModItemGroups;
 import com.megatrex4.ukrainian_dlight.item.ModItems;
@@ -15,8 +15,9 @@
 import com.megatrex4.ukrainian_dlight.screen.ModScreenHandlers;
 import com.megatrex4.ukrainian_dlight.screen.ModScreens;
 import net.fabricmc.api.ModInitializer;
-
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.damage.DamageType;
+import net.minecraft.item.ItemStack;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.MutableText;
@@ -28,8 +29,7 @@
 public class UkrainianDelight implements ModInitializer {
 	public static final String MOD_ID = "ukrainian_delight";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
-	public static final RegistryKey<DamageType> GLASS_DAMAGE = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, new Identifier("ukrainian_delight", "glass_damage"));
-
+	public static final RegistryKey<DamageType> GLASS_DAMAGE = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, new Identifier(MOD_ID, "glass_damage"));
 
 	public static Identifier id(String id) {
 		return new Identifier(MOD_ID, id);
@@ -39,12 +39,8 @@ public static MutableText i18n(String key, Object... args) {
 		return Text.translatable(MOD_ID + "." + key, args);
 	}
 
-
 	@Override
 	public void onInitialize() {
-
-		RegistryKey<DamageType> GLASS_DAMAGE;
-
 		FoodJarBlocks.registerFoodBlocks();
 		DrinkBottleBlock.registerDrinkBlock();
 		ModBlocks.registerModBlocks();
@@ -65,4 +61,4 @@ public void onInitialize() {
 	public static void saveConfig() {
 		ModConfig.saveConfig();
 	}
-}
+}
diff --git a/src/main/resources/assets/ukrainian_delight/lang/en_us.json b/src/main/resources/assets/ukrainian_delight/lang/en_us.json
@@ -92,5 +92,9 @@
   "ukrainian_delight.category.general": "General Settings",
   "ukrainian_delight.option.brewing_keg_capacity": "Brewing Keg Capacity",
   "tooltip.ukrainian_delight.brewing_keg_capacity": "%s",
-  "tooltip.ukrainian_delight.brewing_keg_amount": "%s"
+  "tooltip.ukrainian_delight.brewing_keg_amount": "%s",
+
+  "_comment10": "guide",
+  "patchouli.ukrainian_delight.guide_name": "Mum's recipes",
+  "patchouli.ukrainian_delight.landing_text": "Welcome to the Ukrainian Delight Mod Guide!"
 }
diff --git a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json
@@ -69,6 +69,10 @@
 
   "ukrainian_delight.tooltip.light_drink": "Легкий напій",
   "ukrainian_delight.tooltip.mid_drink": "Середній напій",
-  "ukrainian_delight.tooltip.strong_drink": "Міцний напій"
+  "ukrainian_delight.tooltip.strong_drink": "Міцний напій",
+
+  "_comment10": "guide",
+  "patchouli.ukrainian_delight.guide_name": "Мамині рецепти",
+  "patchouli.ukrainian_delight.landing_text": "Ласкаво просимо до Посібника по модифікації Ukrainian Delight!"
 
 }
diff --git a/src/main/resources/assets/ukrainian_delight/models/item/ukrainian_guide.json b/src/main/resources/assets/ukrainian_delight/models/item/ukrainian_guide.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "ukrainian_delight:item/ukrainian_guide"
+  }
+}
diff --git a/...ts/ukrainian_delight/patchouli_books/ukrainian_guide/en_us/entries/brewing_keg_entry.json b/...ts/ukrainian_delight/patchouli_books/ukrainian_guide/en_us/entries/brewing_keg_entry.json
@@ -0,0 +1,22 @@
+{
+  "type": "patchouli:entry",
+  "name": "Brewing Keg",
+  "icon": "minecraft:writable_book",
+  "description": "Details on how to use the Brewing Keg.",
+  "category": "ukrainian_delight:test_category",
+  "pages": [
+    {
+      "type": "ukrainian_delight:brewing_keg",
+      "recipe": "ukrainian_delight:brewing/brewpotion",
+      "input0": "minecraft:sugar",
+      "input1": "minecraft:wheat",
+      "input2": "minecraft:wheat",
+      "input3": "minecraft:wheat",
+      "input4": "minecraft:wheat",
+      "input5": "minecraft:wheat",
+      "container": "minecraft:glass_bottle",
+      "output": "ukrainian_delight:wine_bottle",
+      "text": "This is how you use the BrewingKeg to create various beverages. $(br) The input items and container are required for the process, and the result will be displayed as the output item."
+    }
+  ]
+}
diff --git a/...assets/ukrainian_delight/patchouli_books/ukrainian_guide/en_us/templates/brewing_keg.json b/...assets/ukrainian_delight/patchouli_books/ukrainian_guide/en_us/templates/brewing_keg.json
@@ -0,0 +1,70 @@
+{
+  "components": [
+    {
+      "type": "patchouli:image",
+      "image": "ukrainian_delight:textures/gui/patchouli/brewing_keg.png",
+      "width": 256,
+      "height": 64,
+      "texture_height": 64,
+      "scale": 0.65,
+      "u": 40
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#input0",
+      "x": 20,
+      "y": 40
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#input1",
+      "x": 60,
+      "y": 40
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#input2",
+      "x": 100,
+      "y": 40
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#input3",
+      "x": 20,
+      "y": 80
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#input4",
+      "x": 60,
+      "y": 80
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#input5",
+      "x": 100,
+      "y": 80
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#container",
+      "x": 140,
+      "y": 60
+    },
+    {
+      "type": "patchouli:item",
+      "item": "#output",
+      "x": 180,
+      "y": 60
+    },
+    {
+      "type": "patchouli:separator",
+      "y": 100
+    },
+    {
+      "type": "patchouli:text",
+      "text": "#text",
+      "y": 110
+    }
+  ]
+}
diff --git a/src/main/resources/assets/ukrainian_delight/textures/gui/patchouli/brewing_keg.png b/src/main/resources/assets/ukrainian_delight/textures/gui/patchouli/brewing_keg.png
diff --git a/...ukrainian_delight/textures/item/guide.png → ...delight/textures/item/ukrainian_guide.png b/...ukrainian_delight/textures/item/guide.png → ...delight/textures/item/ukrainian_guide.png
diff --git a/src/main/resources/data/ukrainian_delight/patchouli_books/ukrainian_guide/book.json b/src/main/resources/data/ukrainian_delight/patchouli_books/ukrainian_guide/book.json
@@ -1,7 +1,10 @@
 {
-  "name": "Ukrainian Delight Guide",
-  "landing_text": "Welcome to the Ukrainian Delight Mod Guide!",
+  "name": "patchouli.ukrainian_delight.guide_name",
+  "landing_text": "patchouli.ukrainian_delight.landing_text",
   "version": 1,
   "creative_tab": "ukrainian_delight:ingredients_ukrainian_delight",
-  "use_resource_pack": true
+  "use_resource_pack": true,
+  "model": "ukrainian_delight:ukrainian_guide",
+  "show_progress": false,
+  "index_icon": "ukrainian_delight:ukrainian_guide"
 }
diff --git a/src/main/resources/data/ukrainian_delight/recipes/brewing/brewpotion.json b/src/main/resources/data/ukrainian_delight/recipes/brewing/brewpotion.json
@@ -10,6 +10,18 @@
     {
       "item": "minecraft:nether_wart"
     },
+    {
+      "item": "minecraft:carrot"
+    },
+    {
+      "item": "minecraft:carrot"
+    },
+    {
+      "item": "minecraft:carrot"
+    },
+    {
+      "item": "minecraft:carrot"
+    },
     {
       "item": "minecraft:carrot"
     }