From a3a75bb8ee073d1c4996c3f5044b945c0e4b7a87 Mon Sep 17 00:00:00 2001 From: Torrie Fischer Date: Sun, 18 Sep 2022 15:22:52 +0200 Subject: [PATCH] items: cheaper recipe, plus custom model data for future resource pack work --- .woodpecker.yml | 15 +++++++++++++++ .../us/camin/regions/RegionPostItemWatcher.java | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..0b1e784 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,15 @@ +pipeline: + build: + image: maven:3-openjdk-18-slim + commands: + - mvn package + release: + image: plugins/gitea-release + settings: + api_key: + from_secret: GITEA_KEY + base_url: https://gitea.malloc.hackerbots.net/ + files: + - ./target/*.jar + when: + event: tag diff --git a/src/main/java/us/camin/regions/RegionPostItemWatcher.java b/src/main/java/us/camin/regions/RegionPostItemWatcher.java index d8bbe16..1c10e6c 100644 --- a/src/main/java/us/camin/regions/RegionPostItemWatcher.java +++ b/src/main/java/us/camin/regions/RegionPostItemWatcher.java @@ -60,13 +60,11 @@ public class RegionPostItemWatcher implements Listener { ShapedRecipe anchorRecipe = new ShapedRecipe(anchorKey, m_theAnchor); anchorRecipe.shape("DDD", "DGD", "DDD"); anchorRecipe.setIngredient('D', new RecipeChoice.ExactChoice(m_theChargeItem)); - anchorRecipe.setIngredient('G', Material.LANTERN); + anchorRecipe.setIngredient('G', Material.SOUL_LANTERN); NamespacedKey compassKey = new NamespacedKey(m_plugin, "region_post_compass"); ShapedRecipe compassRecipe = new ShapedRecipe(compassKey, m_theCompass); // Uses four fewer charges, slightly cheaper. - // TODO: Maybe we just want this to be glowstone instead of effectively 4 - // ghast tears? compassRecipe.shape(" D ", " G ", " "); compassRecipe.setIngredient('D', new RecipeChoice.ExactChoice(m_theChargeItem)); compassRecipe.setIngredient('G', Material.COMPASS); @@ -96,6 +94,7 @@ public class RegionPostItemWatcher implements Listener { meta.setLore(lore); meta.addEnchant(Enchantment.SOUL_SPEED, 1, true); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + meta.setCustomModelData(93199); stack.setItemMeta(meta); return stack; } @@ -109,6 +108,7 @@ public class RegionPostItemWatcher implements Listener { meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); meta.addEnchant(Enchantment.SOUL_SPEED, 1, true); meta.setDisplayName("Region Post Charge"); + meta.setCustomModelData(93197); stack.setItemMeta(meta); return stack; } @@ -122,6 +122,7 @@ public class RegionPostItemWatcher implements Listener { meta.addEnchant(Enchantment.SOUL_SPEED, 1, true); meta.setLore(lore); meta.setDisplayName("Region Post Anchor"); + meta.setCustomModelData(93198); stack.setItemMeta(meta); return stack; }