diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java index 7b7f57040..0d478d317 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java @@ -161,6 +161,12 @@ public class ToolCrafting{ new ItemStack(InitItems.itemSwordObsidian), new ItemStack(InitItems.itemShovelObsidian), new ItemStack(InitItems.itemHoeObsidian))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.quartzPaxel), + new ItemStack(InitItems.itemAxeQuartz), + new ItemStack(InitItems.itemPickaxeQuartz), + new ItemStack(InitItems.itemSwordQuartz), + new ItemStack(InitItems.itemShovelQuartz), + new ItemStack(InitItems.itemHoeQuartz))); } } diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index 3550d7b85..db470dec2 100644 --- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -95,6 +95,7 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.itemGrowthRing); add(InitItems.itemMagnetRing); + add(InitItems.itemWaterRemovalRing); add(InitItems.itemPhantomConnector); add(InitItems.itemBucketCanolaOil); @@ -128,6 +129,7 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.diamondPaxel); add(InitItems.emeraldPaxel); add(InitItems.obsidianPaxel); + add(InitItems.quartzPaxel); InitForeignPaxels.addToCreativeTab(); add(InitItems.itemPickaxeQuartz); diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java index 1368f2ffd..c912fc913 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java @@ -87,6 +87,7 @@ public class InitItems{ public static Item goldPaxel; public static Item emeraldPaxel; public static Item obsidianPaxel; + public static Item quartzPaxel; public static Item itemDrill; public static Item itemDrillUpgradeSpeed; @@ -272,6 +273,7 @@ public class InitItems{ diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.EMERALD, "gemDiamond", "diamondPaxel", EnumRarity.epic); emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "emeraldPaxel", EnumRarity.epic); obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "obsidianPaxel", EnumRarity.epic); - ItemUtil.registerItems(new Item[]{woodenPaxel, stonePaxel, ironPaxel, goldPaxel, diamondPaxel, emeraldPaxel, obsidianPaxel}); + quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "quartzPaxel", EnumRarity.rare); + ItemUtil.registerItems(new Item[]{woodenPaxel, stonePaxel, ironPaxel, goldPaxel, diamondPaxel, emeraldPaxel, obsidianPaxel, quartzPaxel}); } } diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemWaterRemovalRing.png b/src/main/resources/assets/actuallyadditions/textures/items/itemWaterRemovalRing.png new file mode 100644 index 000000000..be56c7ce3 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemWaterRemovalRing.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png new file mode 100644 index 000000000..6e5e35def Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png differ