Balance wand caps & remove Shadow Metal Ore

This commit is contained in:
John Yorke committed 2020-12-14 13:44:44 -04:00
1 parent d1d0e33182
commit 74f25360b7
8 files changed
+19 -46

No files matched your search

+2
View File
@@ -149,6 +149,8 @@ Changes:
- Improved the Flyte Charm's glide feature.
- Changed vis costs for foci.
- Removed Block of Shadow Metal
- Vis discount for the Shadow Metal Caps, Cloth Caps, Crimson-stained Caps, and Shadow-imbued Caps were changed to 35%, 3%, 7%, and 9% respectively.
- Removed Shadow Metal Ore
Additions:
- Re-added the old particles when walking with the Boots of the Voidwalker. Not as invasive as the original.
@@ -1,17 +0,0 @@
package taintedmagic.common.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import taintedmagic.common.TaintedMagic;
public class BlockShadowOre extends Block
{
public BlockShadowOre ()
{
super(Material.rock);
this.setCreativeTab(TaintedMagic.tabTM);
this.setBlockTextureName("taintedmagic:BlockShadowOre");
this.setBlockName("BlockShadowOre");
this.setHardness(5.0F);
}
}
@@ -4,7 +4,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import taintedmagic.common.blocks.BlockLumos;
import taintedmagic.common.blocks.BlockNightshadeBush;
import taintedmagic.common.blocks.BlockShadowOre;
import taintedmagic.common.blocks.BlockWarpwoodLeaves;
import taintedmagic.common.blocks.BlockWarpwoodLog;
import taintedmagic.common.blocks.BlockWarpwoodPlanks;
@@ -13,8 +12,6 @@ import taintedmagic.common.blocks.tile.TileLumos;
public class BlockRegistry
{
public static Block BlockShadowOre;
public static Block BlockWarpwoodLog;
public static Block BlockWarpwoodLeaves;
public static Block BlockWarpwoodSapling;
@@ -25,9 +22,6 @@ public class BlockRegistry
public static void initBlocks ()
{
BlockShadowOre = new BlockShadowOre();
GameRegistry.registerBlock(BlockShadowOre, "BlockShadowOre");
BlockWarpwoodLog = new BlockWarpwoodLog();
GameRegistry.registerBlock(BlockWarpwoodLog, "BlockWarpwoodLog");
@@ -199,16 +199,16 @@ public class ItemRegistry
ItemWandCap = new ItemWandCap();
GameRegistry.registerItem(ItemWandCap, "ItemWandCap");
WAND_CAP_SHADOWMETAL = new WandCap("shadowmetal", 0.70F, new ItemStack(ItemWandCap, 1, 0), 12);
WAND_CAP_SHADOWMETAL = new WandCap("shadowmetal", 0.65F, new ItemStack(ItemWandCap, 1, 0), 12);
WAND_CAP_SHADOWMETAL.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_SHADOWMETAL.png"));
WAND_CAP_CLOTH = new WandCap("cloth", 0.95F, new ItemStack(ItemWandCap, 1, 1), 3);
WAND_CAP_CLOTH = new WandCap("cloth", 0.97F, new ItemStack(ItemWandCap, 1, 1), 2);
WAND_CAP_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_CLOTH.png"));
WAND_CAP_CRIMSON_CLOTH = new WandCap("crimsoncloth", 0.85F, new ItemStack(ItemWandCap, 1, 2), 5);
WAND_CAP_CRIMSON_CLOTH = new WandCap("crimsoncloth", 0.93F, new ItemStack(ItemWandCap, 1, 2), 3);
WAND_CAP_CRIMSON_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png"));
WAND_CAP_SHADOW_CLOTH = new WandCap("shadowcloth", 0.90F, new ItemStack(ItemWandCap, 1, 3), 3);
WAND_CAP_SHADOW_CLOTH = new WandCap("shadowcloth", 0.91F, new ItemStack(ItemWandCap, 1, 3), 4);
WAND_CAP_SHADOW_CLOTH.setTexture(new ResourceLocation("taintedmagic:textures/models/ModelWAND_CAP_SHADOW_CLOTH.png"));
// Foci
@@ -7,7 +7,6 @@ public class OreDictRegistry
{
public static void initOreDict ()
{
OreDictionary.registerOre("oreShadow", new ItemStack(BlockRegistry.BlockShadowOre));
OreDictionary.registerOre("logWood", new ItemStack(BlockRegistry.BlockWarpwoodLog));
OreDictionary.registerOre("treeSapling", new ItemStack(BlockRegistry.BlockWarpwoodSapling));
OreDictionary.registerOre("ingotShadow", new ItemStack(ItemRegistry.ItemMaterial));
@@ -49,22 +49,22 @@ public class RecipeRegistry
// Shadow Metal Axe
ResearchRegistry.recipes.put("ItemShadowmetalAxe",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalAxe), "AA", "BA", "B ", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalAxe), " AA", " BA", " B ", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
// Shadow Metal Spade
ResearchRegistry.recipes.put("ItemShadowmetalSpade",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSpade), "A", "B", "B", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSpade), " A ", " B ", " B ", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
// Shadow Metal Hoe
ResearchRegistry.recipes.put("ItemShadowmetalHoe",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalHoe), "AA", "B ", "B ", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalHoe), " AA", " B ", " B ", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
// Shadow Metal Sword
ResearchRegistry.recipes.put("ItemShadowmetalSword",
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSword), "A", "A", "B", 'A',
GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemShadowmetalSword), " A ", " A ", " B ", 'A',
new ItemStack(ItemRegistry.ItemMaterial), 'B', new ItemStack(Items.stick)));
}
@@ -73,8 +73,6 @@ public class RecipeRegistry
*/
public static void initSmelting ()
{
// Shadow Metal Ingot
GameRegistry.addSmelting(BlockRegistry.BlockShadowOre, new ItemStack(ItemRegistry.ItemMaterial), 2.0F);
}
/**
@@ -598,8 +596,7 @@ public class RecipeRegistry
// Shadow-imbued Cloth
ResearchRegistry.recipes.put("ItemMaterial:1",
ThaumcraftApi.addArcaneCraftingRecipe("SHADOWCLOTH", new ItemStack(ItemRegistry.ItemMaterial, 1, 1),
new AspectList().add(Aspect.ORDER, 1).add(Aspect.WATER, 1).add(Aspect.EARTH, 1).add(Aspect.AIR, 1)
.add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1),
new AspectList().add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10),
" A ", "ABA", " A ", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 8), 'B',
new ItemStack(ConfigItems.itemResource, 1, 7)));
@@ -691,11 +688,11 @@ public class RecipeRegistry
ThaumcraftApi.addCrucibleRecipe("UNBALANCEDSHARDS", new ItemStack(ItemRegistry.ItemMaterial, 1, 4),
new ItemStack(ConfigItems.itemShard, 1, 6), new AspectList().merge(Aspect.TAINT, 4)));
// Shadow Ore
ResearchRegistry.recipes.put("BlockShadowOre",
ThaumcraftApi.addCrucibleRecipe("SHADOWMETAL", new ItemStack(BlockRegistry.BlockShadowOre),
new ItemStack(Blocks.stone),
new AspectList().merge(Aspect.DARKNESS, 2).merge(Aspect.METAL, 5).merge(Aspect.MAGIC, 1)));
// Shadow Metal Ingot
ResearchRegistry.recipes.put("ItemMaterial:0",
ThaumcraftApi.addCrucibleRecipe("SHADOWMETAL", new ItemStack(ItemRegistry.ItemMaterial, 1, 0),
new ItemStack(Items.iron_ingot),
new AspectList().merge(Aspect.DARKNESS, 3).merge(Aspect.METAL, 7).merge(Aspect.MAGIC, 2)));
// Vishroom with Brown Mushroom
ResearchRegistry.recipes.put("Vishroom_brown",
@@ -51,9 +51,8 @@ public class ResearchRegistry
r = new TMResearchItem("SHADOWMETAL",
new AspectList().add(Aspect.METAL, 1).add(Aspect.DARKNESS, 1).add(Aspect.MAGIC, 1), 0, 1,
new ItemStack(BlockRegistry.BlockShadowOre), 0, 1);
r.setPages(new ResearchPage("1"), cruciblePage("BlockShadowOre"),
new ResearchPage(new ItemStack(BlockRegistry.BlockShadowOre)), recipePage("ItemShadowmetalPick"),
new ItemStack(ItemRegistry.ItemMaterial), 0, 1);
r.setPages(new ResearchPage("1"), cruciblePage("ItemMaterial:0"), recipePage("ItemShadowmetalPick"),
recipePage("ItemShadowmetalSpade"), recipePage("ItemShadowmetalAxe"), recipePage("ItemShadowmetalHoe"),
recipePage("ItemShadowmetalSword"));
r.setParents("TAINTEDMAGIC").setConcealed().registerResearchItem();
@@ -228,8 +227,7 @@ public class ResearchRegistry
new AspectList().add(Aspect.MAGIC, 16).add(Aspect.CLOTH, 8).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 8), -3, 5,
new ItemStack(ItemRegistry.ItemWandCap, 1, 3), 0, 1);
r.setPages(new ResearchPage("1"), arcanePage("ItemWandCap:3"));
r.setParentsHidden("CAP_cloth", "CAP_thaumium").setSecondary().setConcealed().setParents("SHADOWCLOTH")
.registerResearchItem();
r.setParentsHidden("CAP_cloth").setSecondary().setConcealed().setParents("SHADOWCLOTH").registerResearchItem();
r = new TMResearchItem("PRIMALBLADE", new AspectList().add(Aspect.MAGIC, 1).add(Aspect.ELDRITCH, 1)
.add(Aspect.WEAPON, 1).add(Aspect.VOID, 1).add(Aspect.AURA, 1), 11, -3,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 495 B