Skip to content

Commit 5b74679

Browse files
TombenpotterTombenpotter
committed
Release version 1.1.0
1 parent eecf00c commit 5b74679

File tree

13 files changed

+75
-15
lines changed

13 files changed

+75
-15
lines changed

‎Changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Version 1.10:
2+
Added the textures for the Soul Corruption stuff. Also added a utils class, so that I can easily access itemstacks.
3+
14
Version 1.1.0-Pre4:
25
The worst Soul Corruption effect removes a bit of corruption every time it happens. That is to say, a 1/5000 chance.
36
Added a new effect, illusion.

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717

1818
apply plugin: 'forge'
1919

20-
version = "1.7.10-1.1.0-Pre4"
20+
version = "1.7.10-1.1.0"
2121
group= "" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2222
archivesBaseName = "Sanguimancy"
2323

‎src/main/java/tombenpotter/sanguimancy/Sanguimancy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void load(FMLInitializationEvent event) {
6161
FMLCommonHandler.instance().bus().register(new EventHandler());
6262
MinecraftForge.EVENT_BUS.register(new EventHandler());
6363
PacketHandler.registerPackets();
64-
RitualRegistry.addToWoSBlacklist();
64+
// RitualRegistry.addToWoSBlacklist();
6565
}
6666

6767
@Mod.EventHandler

‎src/main/java/tombenpotter/sanguimancy/blocks/ItemBlockIllusion.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
package tombenpotter.sanguimancy.blocks;
22

3+
import cpw.mods.fml.relauncher.Side;
4+
import cpw.mods.fml.relauncher.SideOnly;
35
import net.minecraft.block.Block;
6+
import net.minecraft.entity.player.EntityPlayer;
47
import net.minecraft.item.ItemBlock;
58
import net.minecraft.item.ItemStack;
9+
import net.minecraft.util.StatCollector;
10+
11+
import java.util.List;
612

713
public class ItemBlockIllusion extends ItemBlock {
814

@@ -89,4 +95,10 @@ public String getUnlocalizedName(ItemStack stack) {
8995
public int getMetadata(int par1) {
9096
return par1;
9197
}
98+
99+
@SideOnly(Side.CLIENT)
100+
@Override
101+
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean p_77624_4_) {
102+
list.add(StatCollector.translateToLocal("info.Sanguimancy.tooltip.illusion"));
103+
}
92104
}

‎src/main/java/tombenpotter/sanguimancy/items/ItemSoulCorruptionTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ public String getUnlocalizedName(ItemStack itemstack) {
5757

5858
@SideOnly(Side.CLIENT)
5959
public void registerIcons(IIconRegister ri) {
60+
this.icon[0] = ri.registerIcon(Sanguimancy.texturePath + ":AddSoulCorruption");
61+
this.icon[1] = ri.registerIcon(Sanguimancy.texturePath + ":RemoveSoulCorruption");
62+
this.icon[2] = ri.registerIcon(Sanguimancy.texturePath + ":NegateSoulCorruption");
63+
this.icon[3] = ri.registerIcon(Sanguimancy.texturePath + ":SoulCorruptionReader");
6064
}
6165

6266
@SideOnly(Side.CLIENT)

‎src/main/java/tombenpotter/sanguimancy/registry/BlocksRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ public static void registerBlocks() {
2424
GameRegistry.registerBlock(sacrificeTransfer, "BlockSacrificeTransfer").setBlockName(Sanguimancy.modid + ".sacrificeTransfer");
2525

2626
illusion = new BlockIllusion(Material.iron);
27-
GameRegistry.registerBlock(illusion, ItemBlockIllusion.class, "BlockIllusion").setBlockName(Sanguimancy.modid + ".illusion").setLightLevel(1.5F);
27+
GameRegistry.registerBlock(illusion, ItemBlockIllusion.class, "BlockIllusion").setBlockName(Sanguimancy.modid + ".illusion").setLightLevel(1F);
2828
}
2929
}

‎src/main/java/tombenpotter/sanguimancy/registry/RecipesRegistry.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@
88
import net.minecraft.init.Blocks;
99
import net.minecraft.init.Items;
1010
import net.minecraft.item.ItemStack;
11+
import tombenpotter.sanguimancy.util.SanguimancyItemStacks;
1112

1213
public class RecipesRegistry {
1314

1415
public static void registerShapedRecipes() {
15-
GameRegistry.addShapedRecipe(new ItemStack(BlocksRegistry.altarEmitter), "XYX", "XZX", "XXX", 'X', Blocks.redstone_block, 'Y', Blocks.lever, 'Z', ModBlocks.blockAltar);
16-
GameRegistry.addShapedRecipe(new ItemStack(BlocksRegistry.sacrificeTransfer), "XAX", "YZY", "XYX", 'X', new ItemStack(ModItems.demonicSlate), 'A', new ItemStack(ModItems.lavaCrystal), 'Y', new ItemStack(Items.diamond), 'Z', new ItemStack(Blocks.heavy_weighted_pressure_plate));
16+
GameRegistry.addShapedRecipe(SanguimancyItemStacks.altarEmitter, "XYX", "XZX", "XXX", 'X', Blocks.redstone_block, 'Y', Blocks.lever, 'Z', ModBlocks.blockAltar);
17+
GameRegistry.addShapedRecipe(SanguimancyItemStacks.sacrificeTransferrer, "XAX", "YZY", "XYX", 'X', new ItemStack(ModItems.demonicSlate), 'A', new ItemStack(ModItems.lavaCrystal), 'Y', new ItemStack(Items.diamond), 'Z', new ItemStack(Blocks.heavy_weighted_pressure_plate));
18+
GameRegistry.addShapedRecipe(SanguimancyItemStacks.corruptionReader, "AXA", "ZYB", "AXA", 'X', Blocks.soul_sand, 'Y', new ItemStack(ModItems.divinationSigil), 'Z', new ItemStack(Items.skull, 1, 1), 'A', Blocks.nether_brick, 'B', Items.ender_eye);
1719
}
1820

1921
public static void registerAltarRecipes() {
20-
AltarRecipeRegistry.registerAltarRecipe(new ItemStack(BlocksRegistry.altarDiviner), new ItemStack(ModBlocks.blockAltar), 3, 3000, 10, 10, false);
21-
AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ItemsRegistry.playerSacrificer, 1, 1), new ItemStack(ItemsRegistry.playerSacrificer, 1, 0), 5, 30000, 10, 10, false);
22+
AltarRecipeRegistry.registerAltarRecipe(SanguimancyItemStacks.altarDiviner, new ItemStack(ModBlocks.blockAltar), 3, 3000, 10, 10, false);
23+
AltarRecipeRegistry.registerAltarRecipe(SanguimancyItemStacks.attunnedPlayerSacrificer, SanguimancyItemStacks.unattunedPlayerSacrificer, 5, 30000, 10, 10, false);
2224
}
2325

2426
public static void registerOrbRecipes() {
25-
GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ItemsRegistry.playerSacrificer, 1, 0), "XYX", "YOY", "XYX", 'X', new ItemStack(ModItems.demonicSlate), 'Y', new ItemStack(ModBlocks.emptySocket), 'O', new ItemStack(ModItems.archmageBloodOrb)));
27+
GameRegistry.addRecipe(new ShapedBloodOrbRecipe(SanguimancyItemStacks.unattunedPlayerSacrificer, "XYX", "YOY", "XYX", 'X', new ItemStack(ModItems.demonicSlate), 'Y', new ItemStack(ModBlocks.emptySocket), 'O', new ItemStack(ModItems.archmageBloodOrb)));
2628
}
27-
}
29+
}

‎src/main/java/tombenpotter/sanguimancy/util/SanguimancyItemStacks.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package tombenpotter.sanguimancy.util;
2+
3+
import net.minecraft.item.ItemStack;
4+
import tombenpotter.sanguimancy.registry.BlocksRegistry;
5+
import tombenpotter.sanguimancy.registry.ItemsRegistry;
6+
7+
public class SanguimancyItemStacks {
8+
9+
// Items
10+
public static ItemStack unattunedPlayerSacrificer = new ItemStack(ItemsRegistry.playerSacrificer, 1, 0);
11+
public static ItemStack attunnedPlayerSacrificer = new ItemStack(ItemsRegistry.playerSacrificer, 1, 1);
12+
public static ItemStack focusedPlayerSacrificer = new ItemStack(ItemsRegistry.playerSacrificer, 1, 2);
13+
public static ItemStack addCorruption = new ItemStack(ItemsRegistry.soulCorruptionTest, 1, 0);
14+
public static ItemStack removeCorruption = new ItemStack(ItemsRegistry.soulCorruptionTest, 1, 1);
15+
public static ItemStack negateCorruption = new ItemStack(ItemsRegistry.soulCorruptionTest, 1, 2);
16+
public static ItemStack corruptionReader = new ItemStack(ItemsRegistry.soulCorruptionTest, 1, 3);
17+
18+
// Blocks
19+
public static ItemStack altarEmitter = new ItemStack(BlocksRegistry.altarEmitter);
20+
public static ItemStack altarDiviner = new ItemStack(BlocksRegistry.altarDiviner);
21+
public static ItemStack sacrificeTransferrer = new ItemStack(BlocksRegistry.sacrificeTransfer);
22+
public static ItemStack diamondOreIllusion = new ItemStack(BlocksRegistry.illusion, 1, 0);
23+
public static ItemStack diamondBlockIllusion = new ItemStack(BlocksRegistry.illusion, 1, 1);
24+
public static ItemStack glowstoneIllusion = new ItemStack(BlocksRegistry.illusion, 1, 2);
25+
public static ItemStack netherrackIllusion = new ItemStack(BlocksRegistry.illusion, 1, 3);
26+
public static ItemStack quartzOreIllusion = new ItemStack(BlocksRegistry.illusion, 1, 4);
27+
public static ItemStack endStoneIllusion = new ItemStack(BlocksRegistry.illusion, 1, 5);
28+
public static ItemStack pinkWoolIllusion = new ItemStack(BlocksRegistry.illusion, 1, 6);
29+
public static ItemStack lavaIllusion = new ItemStack(BlocksRegistry.illusion, 1, 7);
30+
public static ItemStack jackOLanternIllusion = new ItemStack(BlocksRegistry.illusion, 1, 8);
31+
public static ItemStack bedrockIllusion = new ItemStack(BlocksRegistry.illusion, 1, 9);
32+
public static ItemStack obsidianIllusion = new ItemStack(BlocksRegistry.illusion, 1, 10);
33+
public static ItemStack glassIllusion = new ItemStack(BlocksRegistry.illusion, 1, 11);
34+
public static ItemStack snowIllusion = new ItemStack(BlocksRegistry.illusion, 1, 12);
35+
public static ItemStack melonIllusion = new ItemStack(BlocksRegistry.illusion, 1, 13);
36+
public static ItemStack goldBlockIllusion = new ItemStack(BlocksRegistry.illusion, 1, 14);
37+
public static ItemStack clayIllusion = new ItemStack(BlocksRegistry.illusion, 1, 15);
38+
}

‎src/main/resources/assets/sanguimancy/lang/en_US.lang

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Blocks
22
tile.Sanguimancy.altarDiviner.name=Altar Diviner
33
tile.Sanguimancy.altarEmitter.name=Altar Emitter
4-
tile.Sanguimancy.sacrificeTransfer.name=Sacrifice Transferrer
4+
tile.Sanguimancy.sacrificeTransfer.name=Soul Transferrer
55
tile.Sanguimancy.illusion.diamond.ore.name=Diamond Ore
66
tile.Sanguimancy.illusion.diamond.block.name=Diamond Block
77
tile.Sanguimancy.illusion.glowstone.name=Glowstone
@@ -20,13 +20,13 @@ tile.Sanguimancy.illusion.gold.block.name=Gold Block
2020
tile.Sanguimancy.illusion.clay.name=Clay
2121

2222
#Items
23-
item.Sanguimancy.playerSacrificer.unattuned.name=Unattuned Player Sacrifice Stone
24-
item.Sanguimancy.playerSacrificer.attuned.name=Attuned Player Sacrifice Stone
25-
item.Sanguimancy.playerSacrificer.focused.name=Focused Player Sacrifice Stone
23+
item.Sanguimancy.playerSacrificer.unattuned.name=Unattuned Player Sacrificing Stone
24+
item.Sanguimancy.playerSacrificer.attuned.name=Attuned Player Sacrificing Stone
25+
item.Sanguimancy.playerSacrificer.focused.name=Focused Player Sacrificing Stone
2626
item.Sanguimancy.soulCorruption.add.name=Add Soul Corruption
2727
item.Sanguimancy.soulCorruption.remove.name=Remove Soul Corruption
2828
item.Sanguimancy.soulCorruption.negate.name=Negate Soul Corruption
29-
item.Sanguimancy.soulCorruption.reader.name=Read Corruption Level
29+
item.Sanguimancy.soulCorruption.reader.name=Soul Corruption Reader
3030

3131
#Creative Tab
3232
itemGroup.tabSanguimancy=Sanguimancy
@@ -50,4 +50,5 @@ info.Sanguimancy.tooltip.sacrifice.transfer=Do not have your dirty work done by
5050
info.Sanguimancy.tooltip.sacrifice.player.owner=Blood owner
5151
info.Sanguimancy.tooltip.sacrifice.player.stolen=LP stolen
5252
info.Sanguimancy.tooltip.sacrifice.player.thief=Thief name
53-
info.Sanguimancy.tooltip.creative.only=Creative Only
53+
info.Sanguimancy.tooltip.creative.only=Creative Only
54+
info.Sanguimancy.tooltip.illusion=The block is a lie.

‎src/main/resources/assets/sanguimancy/textures/items/AddSoulCorruption.png

3.26 KB
Loading

0 commit comments

Comments
 (0)