diff --git a/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java b/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java index dc663df..19b28c3 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java +++ b/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java @@ -45,7 +45,15 @@ public class ExtremeShapedRecipeHandler extends ShapedRecipeHandler { continue; } - PositionedStack stack = new PositionedStack(items[y * width + x], 3 + x * 18, 3 + y * 18); + int ex = 3 + x * 18; + int wy = 3 + y * 18; + if(wy == 129){ + if(ex == 3 || ex == 129) + ex -= 1; + else if(ex == 21 || ex == 147) + ex += 1; + } + PositionedStack stack = new PositionedStack(items[y * width + x], ex, wy); stack.setMaxSize(1); this.ingredients.add(stack); } diff --git a/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapelessRecipeHandler.java b/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapelessRecipeHandler.java index c130f92..0048ed4 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapelessRecipeHandler.java +++ b/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapelessRecipeHandler.java @@ -45,7 +45,15 @@ public class ExtremeShapelessRecipeHandler extends ShapelessRecipeHandler{ public void setIngredients(List items) { ingredients.clear(); for (int ingred = 0; ingred < items.size(); ingred++) { - PositionedStack stack = new PositionedStack(items.get(ingred), 3 + (ingred % 9) * 18, 3 + (ingred / 9) * 18); + int ex = 3 + (ingred % 9) * 18; + int wy = 3 + (ingred / 9) * 18; + if(wy == 129){ + if(ex == 3 || ex == 129) + ex -= 1; + else if(ex == 21 || ex == 147) + ex += 1; + } + PositionedStack stack = new PositionedStack(items.get(ingred), ex, wy); stack.setMaxSize(1); ingredients.add(stack); } diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 38e0b0d..b4d1659 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -41,6 +41,58 @@ public class Grinder { 'Q', new ItemStack(Blocks.quartz_block, 1), 'R', new ItemStack(Blocks.redstone_block, 1)}); - ExtremeCraftingManager.getInstance().addShapelessRecipe(new ItemStack(LudicrousItems.resource, 1, 5), new Object[]{new ItemStack(LudicrousBlocks.crystal_matrix, 1), new ItemStack(LudicrousBlocks.resource_block, 1, 0), new ItemStack(Blocks.dragon_egg)}); + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.singularity, 1, 0), new Object[]{ + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIINIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + 'I', new ItemStack(Blocks.iron_block, 1), + 'N', new ItemStack(LudicrousBlocks.resource_block, 1, 0)}); + + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.singularity, 1, 1), new Object[]{ + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIINIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + 'I', new ItemStack(Blocks.gold_block, 1), + 'N', new ItemStack(LudicrousBlocks.resource_block, 1, 0)}); + + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.singularity, 1, 2), new Object[]{ + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIINIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + "IIIIIIIII", + 'I', new ItemStack(Blocks.lapis_block, 1), + 'N', new ItemStack(LudicrousBlocks.resource_block, 1, 0)}); + + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.resource, 1, 6), new Object[]{ + "NNNNNNNNN", + "NCXXCXXCN", + "NXCCXCCXN", + "NCXXCXXCN", + "NNNNNNNNN", + 'X', new ItemStack(LudicrousItems.resource, 1, 1), + 'N', new ItemStack(LudicrousItems.resource, 1, 4), + 'C', new ItemStack(LudicrousItems.resource, 1, 5)}); + + ExtremeCraftingManager.getInstance().addShapelessRecipe(new ItemStack(LudicrousItems.resource, 1, 5), new Object[]{ + new ItemStack(LudicrousBlocks.crystal_matrix, 1), new ItemStack(LudicrousBlocks.resource_block, 1, 0), + new ItemStack(LudicrousItems.singularity, 1, 0), new ItemStack(LudicrousItems.singularity, 1, 1), + new ItemStack(LudicrousItems.singularity, 1, 2)}); } } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index 9d16563..73513e7 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -14,7 +14,7 @@ import java.util.List; public class ItemResource extends Item { private static final String[] types = new String[]{"diamond_lattice", "crystal_matrix_ingot", "neutron_pile", - "neutron_nugget", "neutronium_ingot", "infinity_catalyst"}; + "neutron_nugget", "neutronium_ingot", "infinity_catalyst", "infinity_ingot"}; @SideOnly(Side.CLIENT) public IIcon[] icons; diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java new file mode 100644 index 0000000..ceb86ab --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java @@ -0,0 +1,43 @@ +package fox.spiteful.avaritia.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +import java.util.List; + +public class ItemSingularity extends Item { + + public static final String[] types = new String[]{"iron", "gold", "lapis"}; + public static final int[] colors = new int[]{0xFFFFFF, 0xFFFF00, 0x0000FF}; + + public ItemSingularity(){ + this.setHasSubtypes(true); + this.setMaxDamage(0); + this.setUnlocalizedName("avaritia_singularity"); + this.setTextureName("avaritia:singularity"); + } + + @SideOnly(Side.CLIENT) + @Override + public int getColorFromItemStack(ItemStack itemstack, int renderpass) { + return colors[itemstack.getItemDamage() % colors.length]; + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + int i = MathHelper.clamp_int(stack.getItemDamage(), 0, types.length); + return "item.singularity_" + types[i]; + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int j = 0; j < types.length; ++j) { + list.add(new ItemStack(item, 1, j)); + } + } +} diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index 3611c49..47e00cf 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -6,9 +6,12 @@ import net.minecraft.item.Item; public class LudicrousItems { public static Item resource; + public static Item singularity; public static void grind(){ resource = new ItemResource(); GameRegistry.registerItem(resource, "Resource"); + singularity = new ItemSingularity(); + GameRegistry.registerItem(singularity, "Singularity"); } } diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index b1536e6..58eaff6 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -6,6 +6,10 @@ item.avaritia_resource.neutron_pile.name=Pile of Neutrons item.avaritia_resource.neutron_nugget.name=Neutronium Nugget item.avaritia_resource.neutronium_ingot.name=Neutronium Ingot item.avaritia_resource.infinity_catalyst.name=Infinity Catalyst +item.avaritia_resource.infinity_ingot.name=Infinity Ingot +item.singularity_iron.name=Iron Singularity +item.singularity_gold.name=Golden Singularity +item.singularity_lapis.name=Lapis Singularity # # Blocks tile.compressed_workbench.name=Compressed Crafting Table diff --git a/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png b/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png new file mode 100644 index 0000000..9b94897 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/resource_infinity_ingot.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/singularity.png b/src/main/resources/assets/avaritia/textures/items/singularity.png new file mode 100644 index 0000000..5841177 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/singularity.png differ