lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed

Browse source
This commit is contained in:
Arcaratus 2015-07-31 12:11:44 -04:00
parent d528bdbbf8
commit 786cda06c2
4 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.gradle
View file

@ -51,9 +51,9 @@ repositories {
} }
dependencies { dependencies {
compile "codechicken:CodeChickenLib:" + config.mc_version + "-" + config.cclib_version + ":dev" // compile "codechicken:CodeChickenLib:" + config.mc_version + "-" + config.cclib_version + ":dev"
compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev" // compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev"
compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev" // compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev"
// compile name: 'MineTweaker3', version: config.minetweaker_version, ext: 'jar' // compile name: 'MineTweaker3', version: config.minetweaker_version, ext: 'jar'
// compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev" // compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev"
// compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf" // compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf"

4
build.properties
View file

@ -1,8 +1,8 @@
mod_name=BloodMagic mod_name=BloodMagic
forge_version=11.14.3.1499 forge_version=11.14.3.1499
cclib_version=1.1.2.133 cclib_version=1.1.2.133
ccc_version=1.0.5.36 ccc_version=1.0.5.34
nei_version=1.0.5.104 nei_version=1.0.5.82
//=Dependency Information //=Dependency Information
guideapi_version=1.0.1-20 guideapi_version=1.0.1-20
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic

3
src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
View file

@ -565,9 +565,6 @@ public class AlchemicalWizardry
{ {
int craftingConstant = OreDictionary.WILDCARD_VALUE; int craftingConstant = OreDictionary.WILDCARD_VALUE;
ModBlocks.init();
//blocks
proxy.registerRenderers(); proxy.registerRenderers();
proxy.registerEntities(); proxy.registerEntities();
proxy.registerEntityTrackers(); proxy.registerEntityTrackers();

29
src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java
View file

@ -107,13 +107,13 @@ public class ModBlocks
public static void init() public static void init()
{ {
/* blockAltar = (BlockAltar) registerBlock(new BlockAltar(), "altar"); blockAltar = (BlockAltar) registerBlock(new BlockAltar(), "altar");
bloodRune = (BlockBloodRune) registerBlock(new BlockBloodRune(), ItemBloodRuneBlock.class, "base_rune"); bloodRune = (BlockBloodRune) registerBlock(new BlockBloodRune(), ItemBloodRuneBlock.class, "base_rune");
speedRune = (BlockSpeedRune) registerBlock(new BlockSpeedRune(), "speed_rune"); speedRune = (BlockSpeedRune) registerBlock(new BlockSpeedRune(), "speed_rune");
efficiencyRune = (BlockEfficiencyRune) registerBlock(new BlockEfficiencyRune(), "efficiency_rune"); efficiencyRune = (BlockEfficiencyRune) registerBlock(new BlockEfficiencyRune(), "efficiency_rune");
runeOfSacrifice = (BlockRuneOfSacrifice) registerBlock(new BlockRuneOfSacrifice(), "sacrifice_rune"); runeOfSacrifice = (BlockRuneOfSacrifice) registerBlock(new BlockRuneOfSacrifice(), "sacrifice_rune");
runeOfSelfSacrifice = (BlockRuneOfSelfSacrifice) registerBlock(new BlockRuneOfSelfSacrifice(), "self_sacrifice_rune"); runeOfSelfSacrifice = (BlockRuneOfSelfSacrifice) registerBlock(new BlockRuneOfSelfSacrifice(), "self_sacrifice_rune");
*/ blockTeleposer = registerBlock(new BlockTeleposer(), "teleposer"); blockTeleposer = registerBlock(new BlockTeleposer(), "teleposer");
spectralBlock = registerBlock(new BlockSpectral(), "spectral_block"); spectralBlock = registerBlock(new BlockSpectral(), "spectral_block");
ritualStone = registerBlock(new BlockRitualStone(), "ritual_stone"); ritualStone = registerBlock(new BlockRitualStone(), "ritual_stone");
blockMasterStone = registerBlock(new BlockMasterStone(), "master_ritual_stone"); blockMasterStone = registerBlock(new BlockMasterStone(), "master_ritual_stone");
@ -155,26 +155,25 @@ public class ModBlocks
block.setUnlocalizedName(unlocalizedName); block.setUnlocalizedName(unlocalizedName);
// if (!) //creative tab blacklist // if (!) //creative tab blacklist
{ // {
block.setCreativeTab(AlchemicalWizardry.tabBloodMagic); block.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} // }
// blocksNotToBeRegistered.clear(); blocksNotToBeRegistered.clear();
// for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled) for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled)
{ {
// if (unlocName.equals(unlocalizedName)) if (unlocName.equals(unlocalizedName))
{ {
// blocksNotToBeRegistered.add(unlocName); blocksNotToBeRegistered.add(unlocName);
} }
} }
// if (!blocksNotToBeRegistered.contains(unlocalizedName)) if (!blocksNotToBeRegistered.contains(unlocalizedName))
{ {
// GameRegistry.registerBlock(block, unlocalizedName); GameRegistry.registerBlock(block, unlocalizedName);
} }
// BlockRenderer.registerBlock(block); // BlockRenderer.registerBlock(block);
GameRegistry.registerBlock(block, unlocalizedName);
return block; return block;
} }
@ -182,14 +181,14 @@ public class ModBlocks
{ {
block.setCreativeTab(AlchemicalWizardry.tabBloodMagic); block.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
// for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled) for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled)
{ {
// if (unlocName.equals(unlocalizedName)) if (unlocName.equals(unlocalizedName))
{ {
// blocksNotToBeRegistered.add(unlocName); blocksNotToBeRegistered.add(unlocName);
} }
} }
// if (!blocksNotToBeRegistered.contains(unlocalizedName)) if (!blocksNotToBeRegistered.contains(unlocalizedName))
{ {
GameRegistry.registerBlock(block, itemBlockClass, unlocalizedName); GameRegistry.registerBlock(block, itemBlockClass, unlocalizedName);
} }