feat: change scroll recipes to use new items (closes #149)

oddlama · Aug 27, 2022 · a2ea256 · a2ea256
1 parent 1825bc6
commit a2ea256
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 37 deletions.
diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/DeathScroll.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/DeathScroll.java
@@ -36,13 +36,11 @@ public DeathScroll(Context<Trifles> context) {
 	@Override
 	public RecipeList default_recipes() {
 		return RecipeList.of(new ShapedRecipeDefinition("generic")
-			.shape("pip", "cbe", "plp")
-			.set_ingredient('b', Material.NETHERITE_SCRAP)
-			.set_ingredient('p', Material.MAP)
-			.set_ingredient('i', Material.CHORUS_FRUIT)
-			.set_ingredient('c', Material.RECOVERY_COMPASS)
+			.shape("aba", "epe")
+			.set_ingredient('p', "vane_trifles:papyrus_scroll")
 			.set_ingredient('e', Material.ENDER_PEARL)
-			.set_ingredient('l', Material.CLOCK)
+			.set_ingredient('a', Material.BONE)
+			.set_ingredient('b', Material.RECOVERY_COMPASS)
 			.result(key().toString()));
 	}
 

diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/HomeScroll.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/HomeScroll.java
@@ -22,13 +22,12 @@ public HomeScroll(Context<Trifles> context) {
 	@Override
 	public RecipeList default_recipes() {
 		return RecipeList.of(new ShapedRecipeDefinition("generic")
-			.shape("pip", "cbe", "plp")
-			.set_ingredient('b', Material.NETHERITE_SCRAP)
-			.set_ingredient('p', Material.MAP)
-			.set_ingredient('i', Tag.BEDS)
-			.set_ingredient('c', Material.COMPASS)
+			.shape("abc", "epe")
+			.set_ingredient('p', "vane_trifles:papyrus_scroll")
 			.set_ingredient('e', Material.ENDER_PEARL)
-			.set_ingredient('l', Material.CLOCK)
+			.set_ingredient('a', Material.CAMPFIRE)
+			.set_ingredient('b', Material.GOAT_HORN)
+			.set_ingredient('c', Tag.BEDS)
 			.result(key().toString()));
 	}
 

diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/LodestoneScroll.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/LodestoneScroll.java
@@ -47,13 +47,11 @@ public LodestoneScroll(Context<Trifles> context) {
 	@Override
 	public RecipeList default_recipes() {
 		return RecipeList.of(new ShapedRecipeDefinition("generic")
-			.shape("pip", "cbe", "plp")
-			.set_ingredient('b', Material.NETHERITE_SCRAP)
-			.set_ingredient('p', Material.MAP)
-			.set_ingredient('i', Material.CHORUS_FRUIT)
-			.set_ingredient('c', Material.NETHERITE_SCRAP)
+			.shape("aba", "epe")
+			.set_ingredient('p', "vane_trifles:papyrus_scroll")
 			.set_ingredient('e', Material.ENDER_PEARL)
-			.set_ingredient('l', Material.CLOCK)
+			.set_ingredient('a', Material.AMETHYST_SHARD)
+			.set_ingredient('b', Material.NETHERITE_INGOT)
 			.result(key().toString()));
 	}
 

diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/PapyrusScroll.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/PapyrusScroll.java
@@ -5,7 +5,7 @@
 import org.bukkit.Material;
 import org.oddlama.vane.annotation.item.VaneItem;
 import org.oddlama.vane.core.config.recipes.RecipeList;
-import org.oddlama.vane.core.config.recipes.ShapelessRecipeDefinition;
+import org.oddlama.vane.core.config.recipes.ShapedRecipeDefinition;
 import org.oddlama.vane.core.item.CustomItem;
 import org.oddlama.vane.core.item.api.InhibitBehavior;
 import org.oddlama.vane.core.module.Context;
@@ -19,11 +19,12 @@ public PapyrusScroll(Context<Trifles> context) {
 
 	@Override
 	public RecipeList default_recipes() {
-		return RecipeList.of(new ShapelessRecipeDefinition("generic")
-			.add_ingredient(Material.PAPER)
-			.add_ingredient(Material.PAPER)
-			.add_ingredient(Material.ECHO_SHARD)
-			.add_ingredient(Material.GLOW_INK_SAC)
+		return RecipeList.of(new ShapedRecipeDefinition("generic")
+			.shape("rpp", "pep", "ppg")
+			.set_ingredient('p', Material.PAPER)
+			.set_ingredient('r', Material.RABBIT_HIDE)
+			.set_ingredient('e', Material.ECHO_SHARD)
+			.set_ingredient('g', Material.GOLD_NUGGET)
 			.result(key().toString()));
 	}
 

diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/SpawnScroll.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/SpawnScroll.java
@@ -2,6 +2,7 @@
 
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Tag;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataType;
@@ -21,13 +22,11 @@ public SpawnScroll(Context<Trifles> context) {
 	@Override
 	public RecipeList default_recipes() {
 		return RecipeList.of(new ShapedRecipeDefinition("generic")
-			.shape("pip", "cbe", "plp")
-			.set_ingredient('b', Material.NETHERITE_SCRAP)
-			.set_ingredient('p', Material.MAP)
-			.set_ingredient('i', Material.CHORUS_FRUIT)
-			.set_ingredient('c', Material.OAK_SAPLING)
+			.shape("aba", "epe")
+			.set_ingredient('p', "vane_trifles:papyrus_scroll")
 			.set_ingredient('e', Material.ENDER_PEARL)
-			.set_ingredient('l', Material.EGG)
+			.set_ingredient('a', Material.WHEAT_SEEDS)
+			.set_ingredient('b', Tag.SAPLINGS)
 			.result(key().toString()));
 	}
 

diff --git a/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/UnstableScroll.java b/vane-trifles/src/main/java/org/oddlama/vane/trifles/items/UnstableScroll.java
@@ -31,13 +31,11 @@ public UnstableScroll(Context<Trifles> context) {
 	@Override
 	public RecipeList default_recipes() {
 		return RecipeList.of(new ShapedRecipeDefinition("generic")
-			.shape("pip", "cbe", "plp")
-			.set_ingredient('b', Material.NETHERITE_SCRAP)
-			.set_ingredient('p', Material.MAP)
-			.set_ingredient('i', Material.CHORUS_FRUIT)
-			.set_ingredient('c', Material.COMPASS)
-			.set_ingredient('e', Material.ENDER_PEARL)
-			.set_ingredient('l', Material.CLOCK)
+			.shape("aba", "epe")
+			.set_ingredient('p', "vane_trifles:papyrus_scroll")
+			.set_ingredient('e', Material.CHORUS_FRUIT)
+			.set_ingredient('a', Material.AMETHYST_SHARD)
+			.set_ingredient('b', Material.COMPASS)
 			.result(key().toString()));
 	}