items: cheaper recipe, plus custom model data for future resource pack work
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed

This commit is contained in:
Torrie Fischer 2022-09-18 15:22:52 +02:00
parent 61f4dc90dc
commit a3a75bb8ee
2 changed files with 19 additions and 3 deletions

15
.woodpecker.yml Normal file
View File

@ -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

View File

@ -60,13 +60,11 @@ public class RegionPostItemWatcher implements Listener {
ShapedRecipe anchorRecipe = new ShapedRecipe(anchorKey, m_theAnchor); ShapedRecipe anchorRecipe = new ShapedRecipe(anchorKey, m_theAnchor);
anchorRecipe.shape("DDD", "DGD", "DDD"); anchorRecipe.shape("DDD", "DGD", "DDD");
anchorRecipe.setIngredient('D', new RecipeChoice.ExactChoice(m_theChargeItem)); 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"); NamespacedKey compassKey = new NamespacedKey(m_plugin, "region_post_compass");
ShapedRecipe compassRecipe = new ShapedRecipe(compassKey, m_theCompass); ShapedRecipe compassRecipe = new ShapedRecipe(compassKey, m_theCompass);
// Uses four fewer charges, slightly cheaper. // 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.shape(" D ", " G ", " ");
compassRecipe.setIngredient('D', new RecipeChoice.ExactChoice(m_theChargeItem)); compassRecipe.setIngredient('D', new RecipeChoice.ExactChoice(m_theChargeItem));
compassRecipe.setIngredient('G', Material.COMPASS); compassRecipe.setIngredient('G', Material.COMPASS);
@ -96,6 +94,7 @@ public class RegionPostItemWatcher implements Listener {
meta.setLore(lore); meta.setLore(lore);
meta.addEnchant(Enchantment.SOUL_SPEED, 1, true); meta.addEnchant(Enchantment.SOUL_SPEED, 1, true);
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
meta.setCustomModelData(93199);
stack.setItemMeta(meta); stack.setItemMeta(meta);
return stack; return stack;
} }
@ -109,6 +108,7 @@ public class RegionPostItemWatcher implements Listener {
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
meta.addEnchant(Enchantment.SOUL_SPEED, 1, true); meta.addEnchant(Enchantment.SOUL_SPEED, 1, true);
meta.setDisplayName("Region Post Charge"); meta.setDisplayName("Region Post Charge");
meta.setCustomModelData(93197);
stack.setItemMeta(meta); stack.setItemMeta(meta);
return stack; return stack;
} }
@ -122,6 +122,7 @@ public class RegionPostItemWatcher implements Listener {
meta.addEnchant(Enchantment.SOUL_SPEED, 1, true); meta.addEnchant(Enchantment.SOUL_SPEED, 1, true);
meta.setLore(lore); meta.setLore(lore);
meta.setDisplayName("Region Post Anchor"); meta.setDisplayName("Region Post Anchor");
meta.setCustomModelData(93198);
stack.setItemMeta(meta); stack.setItemMeta(meta);
return stack; return stack;
} }