diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java index 71445834..f7b18a66 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java @@ -8,6 +8,7 @@ public final class ModBlocks { public static final Block ANCIENT_LOG = new BlockAncientLog(); public static final Block ANCIENT_BARK = new BlockImpl("ancient_bark", Material.WOOD).setSoundType(SoundType.WOOD).setHardness(2F); + public static final Block ANCIENT_PLANKS = new BlockImpl("ancient_planks", Material.WOOD).setSoundType(SoundType.WOOD).setHardness(2F); public static final Block ANCIENT_LEAVES = new BlockAncientLeaves(); public static final Block ANCIENT_SAPLING = new BlockAncientSapling(); public static final Block NATURE_ALTAR = new BlockNatureAltar(); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index dff6c1b0..11941843 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -13,6 +13,7 @@ public final class ModItems { public static final Item GOLD_FIBER = new ItemGoldFiber(); public static final Item GOLD_LEAF = new ItemImpl("gold_leaf"); public static final Item INFUSED_IRON = new ItemImpl("infused_iron"); + public static final Item ANCIENT_STICK = new ItemImpl("ancient_stick"); public static final Item.ToolMaterial TOOL_MATERIAL_INFUSED_IRON = EnumHelper.addToolMaterial(NaturesAura.MOD_ID.toUpperCase(Locale.ROOT) + "_INFUSED_IRON", 3, 300, 6.25F, 2.25F, 16); diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java index 5e2d7af8..0c7fc5f6 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java @@ -34,8 +34,9 @@ public class ItemShovelNA extends ItemSpade implements IModItem, IModelProvider EnumActionResult result = EnumActionResult.PASS; if (this == ModItems.INFUSED_SHOVEL) { ItemStack stack = player.getHeldItem(hand); - for (int x = -1; x <= 1; x++) { - for (int y = -1; y <= 1; y++) { + int range = player.isSneaking() ? 0 : 1; + for (int x = -range; x <= range; x++) { + for (int y = -range; y <= range; y++) { BlockPos actualPos = pos.add(x, 0, y); if (player.canPlayerEdit(actualPos.offset(facing), facing, stack)) { if (facing != EnumFacing.DOWN diff --git a/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json b/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json new file mode 100644 index 00000000..5fe35ed4 --- /dev/null +++ b/src/main/resources/assets/naturesaura/blockstates/ancient_planks.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "naturesaura:blocks/ancient_planks" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index 52a40b91..f5bd9c24 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -9,6 +9,7 @@ tile.naturesaura.decayed_leaves.name=Decayed Leaves tile.naturesaura.golden_leaves.name=Golden Leaves tile.naturesaura.gold_powder.name=Gold Powder tile.naturesaura.wood_stand.name=Wooden Stand +tile.naturesaura.ancient_planks.name=Ancient Planks item.naturesaura.eye.name=Environmental Eye item.naturesaura.gold_fiber.name=Brilliant Fiber @@ -19,6 +20,7 @@ item.naturesaura.infused_iron_axe.name=Botanist's Handaxe item.naturesaura.infused_iron_shovel.name=Botanist's Shovel item.naturesaura.infused_iron_sword.name=Botanist's Blade item.naturesaura.infused_iron_hoe.name=Botanist's Hoe +item.naturesaura.ancient_stick.name=Ancient Wood Rod container.naturesaura.tree_ritual.name=Tree Infusion container.naturesaura.altar.name=Natural Altar diff --git a/src/main/resources/assets/naturesaura/models/item/ancient_stick.json b/src/main/resources/assets/naturesaura/models/item/ancient_stick.json new file mode 100644 index 00000000..63f7b2c8 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/ancient_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/ancient_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/ancient_planks.json b/src/main/resources/assets/naturesaura/recipes/ancient_planks.json new file mode 100644 index 00000000..8c7dc2b4 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/ancient_planks.json @@ -0,0 +1,15 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "W" + ], + "key": { + "W": { + "item": "naturesaura:ancient_log" + } + }, + "result": { + "item": "naturesaura:ancient_planks", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/ancient_planks_from_bark.json b/src/main/resources/assets/naturesaura/recipes/ancient_planks_from_bark.json new file mode 100644 index 00000000..b9c1e7a2 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/ancient_planks_from_bark.json @@ -0,0 +1,15 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "W" + ], + "key": { + "W": { + "item": "naturesaura:ancient_bark" + } + }, + "result": { + "item": "naturesaura:ancient_planks", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/ancient_stick.json b/src/main/resources/assets/naturesaura/recipes/ancient_stick.json new file mode 100644 index 00000000..1ac4da65 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/ancient_stick.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "W", + "W" + ], + "key": { + "W": { + "item": "naturesaura:ancient_planks" + } + }, + "result": { + "item": "naturesaura:ancient_stick", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_axe.json b/src/main/resources/assets/naturesaura/recipes/infused_axe.json new file mode 100644 index 00000000..c3b9d7ee --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_axe.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "AA", + "AS", + " S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_hoe.json b/src/main/resources/assets/naturesaura/recipes/infused_hoe.json new file mode 100644 index 00000000..395ca4ff --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "AA", + " S", + " S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_pickaxe.json b/src/main/resources/assets/naturesaura/recipes/infused_pickaxe.json new file mode 100644 index 00000000..82e05f8e --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "AAA", + " S ", + " S " + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_shovel.json b/src/main/resources/assets/naturesaura/recipes/infused_shovel.json new file mode 100644 index 00000000..2593d760 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "A", + "S", + "S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/infused_sword.json b/src/main/resources/assets/naturesaura/recipes/infused_sword.json new file mode 100644 index 00000000..d425be44 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/infused_sword.json @@ -0,0 +1,19 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "A", + "A", + "S" + ], + "key": { + "A": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:ancient_stick" + } + }, + "result": { + "item": "naturesaura:infused_iron_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/textures/blocks/ancient_planks.png b/src/main/resources/assets/naturesaura/textures/blocks/ancient_planks.png new file mode 100644 index 00000000..955d632d Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/blocks/ancient_planks.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/ancient_stick.png b/src/main/resources/assets/naturesaura/textures/items/ancient_stick.png new file mode 100644 index 00000000..1d7d963c Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/ancient_stick.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_axe.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_axe.png index 33cb340b..d8c75f28 100644 Binary files a/src/main/resources/assets/naturesaura/textures/items/infused_iron_axe.png and b/src/main/resources/assets/naturesaura/textures/items/infused_iron_axe.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_hoe.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_hoe.png index f2c4a359..47fc12da 100644 Binary files a/src/main/resources/assets/naturesaura/textures/items/infused_iron_hoe.png and b/src/main/resources/assets/naturesaura/textures/items/infused_iron_hoe.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png index ba67f9b0..07ff2ca0 100644 Binary files a/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png and b/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_shovel.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_shovel.png index 9ada57d2..4f77b312 100644 Binary files a/src/main/resources/assets/naturesaura/textures/items/infused_iron_shovel.png and b/src/main/resources/assets/naturesaura/textures/items/infused_iron_shovel.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_sword.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_sword.png index b2d5e407..4e3b6f56 100644 Binary files a/src/main/resources/assets/naturesaura/textures/items/infused_iron_sword.png and b/src/main/resources/assets/naturesaura/textures/items/infused_iron_sword.png differ