From 460b62f32e9a36a075c3d65a97be5594a740eb95 Mon Sep 17 00:00:00 2001 From: glowredman Date: Sat, 5 Feb 2022 01:09:35 +0100 Subject: [PATCH] UNLIMITED BALANCE!!!! https: //github.com/SpitefulFox/Avaritia/commit/ed0741f20c2606eaba3835f713ee5780d7a8cd89 Co-Authored-By: SpitefulFox <6055143+SpitefulFox@users.noreply.github.com> --- .../java/fox/spiteful/avaritia/Config.java | 2 ++ .../spiteful/avaritia/crafting/Grinder.java | 8 ++++++ .../spiteful/avaritia/items/ItemResource.java | 7 +++-- .../avaritia/items/ItemSingularity.java | 27 +++++++++++++++--- .../resources/assets/avaritia/lang/en_US.lang | 4 +++ .../textures/items/resource_starfuel.png | Bin 0 -> 401 bytes 6 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/avaritia/textures/items/resource_starfuel.png diff --git a/src/main/java/fox/spiteful/avaritia/Config.java b/src/main/java/fox/spiteful/avaritia/Config.java index 51ee145..597b107 100644 --- a/src/main/java/fox/spiteful/avaritia/Config.java +++ b/src/main/java/fox/spiteful/avaritia/Config.java @@ -51,6 +51,7 @@ public class Config { public static boolean steel = true; public static boolean nickel = true; public static boolean enderium = true; + public static boolean ultimateBalance = true; public static int modifier = 0; public static int multiplier = 0; @@ -107,6 +108,7 @@ public class Config { steel = conf.get("materials", "Steel", true).getBoolean(true); enderium = conf.get("materials", "Enderium", true).getBoolean(true); darksteel = conf.get("compatibility", "DarkSteel", true).getBoolean(true); + ultimateBalance = conf.get("materials", "Clay", true).getBoolean(true); modifier = conf.get("balance!", "Cost Modifier", 0, "Added to the existing modifier to make prices more expensive or cheaper. Can be negative.").getInt(0); multiplier = conf.get("balance!", "Cost Multiplier", 0, "Added to the existing multiplier to make prices more expensive or cheaper. Can be negative.").getInt(0); diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 6ece807..0d9d700 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -1,5 +1,6 @@ package fox.spiteful.avaritia.crafting; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.Config; import fox.spiteful.avaritia.blocks.LudicrousBlocks; @@ -48,6 +49,8 @@ public class Grinder { GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 9, 4), "C", 'C', new ItemStack(LudicrousBlocks.resource_block, 1, 0)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.resource_block, 1, 1), "CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 6)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 9, 6), "C", 'C', new ItemStack(LudicrousBlocks.resource_block, 1, 1)); + + GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 13, 8), "CIC", "ICI", "CIC", 'C', new ItemStack(Blocks.coal_block, 1), 'I', new ItemStack(LudicrousItems.resource, 1, 1)); ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousBlocks.neutron_collector, 1), "IIQQQQQII", @@ -323,5 +326,10 @@ public class Grinder { if(Config.darksteel && !OreDictionary.getOres("blockDarkSteel").isEmpty()){ catalyst.getInput().add(OreDictionary.getOres("blockDarkSteel")); } + + if(Config.ultimateBalance && (Loader.isModLoaded("Botania") || Loader.isModLoaded("Mekanism"))) { + catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 11)); + CompressorManager.addRecipe(new ItemStack(LudicrousItems.singularity, 1, 11), 150, new ItemStack(Items.clay_ball, 1)); + } } } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index 139cdd9..464aab6 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -24,7 +24,7 @@ import java.util.List; public class ItemResource extends Item implements IHaloRenderItem { private static final String[] types = new String[]{"diamond_lattice", "crystal_matrix_ingot", "neutron_pile", - "neutron_nugget", "neutronium_ingot", "infinity_catalyst", "infinity_ingot", "record_fragment"}; + "neutron_nugget", "neutronium_ingot", "infinity_catalyst", "infinity_ingot", "record_fragment", "starfuel"}; @SideOnly(Side.CLIENT) public IIcon[] icons; @@ -56,7 +56,7 @@ public class ItemResource extends Item implements IHaloRenderItem { public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean wut) { int meta = item.getItemDamage(); - if (meta != 0) { + if (meta != 0 && meta != 8) { tooltip.add(EnumChatFormatting.DARK_GRAY +""+ EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip."+types[meta]+".desc")); } } @@ -91,6 +91,7 @@ public class ItemResource extends Item implements IHaloRenderItem { return EnumRarity.uncommon; case 1: case 4: + case 8: return EnumRarity.rare; case 5: return EnumRarity.epic; @@ -105,7 +106,7 @@ public class ItemResource extends Item implements IHaloRenderItem { @SideOnly(Side.CLIENT) public boolean drawHalo(ItemStack stack) { int meta = stack.getItemDamage(); - return (meta >= 2 && meta <= 6); + return (meta >= 2 && meta <= 6) || meta == 8; } @Override diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java index 64c6a23..a7e1f06 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java @@ -3,25 +3,28 @@ package fox.spiteful.avaritia.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.LudicrousText; import fox.spiteful.avaritia.render.IHaloRenderItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; import java.util.List; public class ItemSingularity extends Item implements IHaloRenderItem { public static final String[] types = new String[]{"iron", "gold", "lapis", "redstone", "quartz", "copper", - "tin", "lead", "silver", "nickel", "enderium"}; + "tin", "lead", "silver", "nickel", "enderium", "clay"}; public static final int[] colors = new int[]{0xBFBFBF, 0xE8EF23, 0x5a82e2, 0xDF0000, 0xeeebe6, 0xE47200, - 0xA5C7DE, 0x444072, 0xF9F9F9, 0xDEE187, 0x47736d}; + 0xA5C7DE, 0x444072, 0xF9F9F9, 0xDEE187, 0x47736d, 0x8890AD}; public static final int[] colors2 = new int[]{0x7F7F7F, 0xdba213, 0x224baf, 0x900000, 0x94867d, 0x89511A, - 0x9BA9B2, 0x3E3D4E, 0xD5D5D5, 0xC4C698, 0x1a3732}; + 0x9BA9B2, 0x3E3D4E, 0xD5D5D5, 0xC4C698, 0x1a3732, 0x666B7F}; public static IIcon background; public static IIcon foreground; @@ -80,9 +83,23 @@ public class ItemSingularity extends Item implements IHaloRenderItem { @Override public EnumRarity getRarity(ItemStack stack) { + if(stack.getItemDamage() == 10) + return LudicrousItems.cosmic; return EnumRarity.uncommon; } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean wut) { + + int meta = item.getItemDamage(); + if (meta == 10) { + //tooltip.add(EnumChatFormatting.DARK_GRAY +""+ EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.claybalance.desc")); + tooltip.add(LudicrousText.makeFabulous(StatCollector.translateToLocal("tooltip.claybalance.desc"))); + } + } + + @Override @SideOnly(Side.CLIENT) public boolean drawHalo(ItemStack stack) { @@ -98,7 +115,9 @@ public class ItemSingularity extends Item implements IHaloRenderItem { @Override @SideOnly(Side.CLIENT) public int getHaloSize(ItemStack stack) { - return 4; + if(stack.getItemDamage() == 10) + return 8; + return 4; } @Override diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index ccf06d9..c4651e1 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -8,6 +8,7 @@ item.avaritia_resource.neutronium_ingot.name=Cosmic Neutronium Ingot item.avaritia_resource.infinity_catalyst.name=Infinity Catalyst item.avaritia_resource.infinity_ingot.name=Infinity Ingot item.avaritia_resource.record_fragment.name=Record Fragment +item.avaritia_resource.starfuel.name=Star Fuel item.singularity_iron.name=Iron Singularity item.singularity_gold.name=Golden Singularity item.singularity_lapis.name=Lapis Singularity @@ -19,6 +20,7 @@ item.singularity_lead.name=Leaden Singularity item.singularity_silver.name=Silver Singularity item.singularity_nickel.name=Nickel Singularity item.singularity_enderium.name=Enderium Singularity +item.singularity_clay.name=Clay Singularity item.infinity_pickaxe.name=World Breaker item.infinity_sword.name=Sword of the Cosmos item.infinity_shovel.name=Planet Eater @@ -71,12 +73,14 @@ tooltip.neutronium_ingot.desc=The dense heart of a star in convenient ingot form tooltip.infinity_catalyst.desc=One is all and all is one. tooltip.infinity_ingot.desc=The fury of the universe in the palm of your hand. tooltip.record_fragment.desc=One likes to believe in the freedom of music~ +tooltip.starfuel.desc=The light of the cosmos in a convenient chunk of earth tooltip.skullfire_sword.desc=Beheads skeletons and scorches them black. tooltip.matter_cluster.desc=Use to deconstruct. tooltip.matter_cluster.desc2=Hold SHIFT for contents. tooltip.matter_cluster.counter=items tooltip.morvinabox.desc=Instant housing tooltip.morvinabox.subdesc=In Canada, Morvy comes in bags. +tooltip.claybalance.desc=UNLIMITED BALANCE!!!! # # Achievements achievement.avaritia:crystal_matrix=The First Seal diff --git a/src/main/resources/assets/avaritia/textures/items/resource_starfuel.png b/src/main/resources/assets/avaritia/textures/items/resource_starfuel.png new file mode 100644 index 0000000000000000000000000000000000000000..1d789d21d28433899bd94d924e9da7e5cb06586b GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONP_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM z&(QM9wM{8NQyD#7978Ppmri(@b;v=awbpvInOzpLo8eqi3TdVZ0vO^@AgF@(%GqhUWU=$z!;DICnF ze!XroTFa-p+H{&ip-`fOp}9oxvYX4UY(Dy0x6@!jOVOCUHTTce z%e0-nzfkwj<>%U-N*q7_$xW!sH2Sb5;&axXTnW9r@{deYOn1x6+~iLk#o_- z^wSJaDn5rYavl5C%yoGu!_4{BM&ylrX1l}j?$!CoaQqcIJ rAorE2MfpqXL4O&6-lEU{WQ5hbEZ1_Kx{-GT7-9^bu6{1-oD!M