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

Removed debug stuff ;-;

Browse source
This commit is contained in:
WayofTime 2014-12-29 06:48:01 -05:00
parent 31e154a980
commit fa5fe1555c
9 changed files with 82 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.properties
View file

@ -1,12 +1,12 @@
#
#Fri Dec 12 19:27:09 EST 2014
#Fri Dec 19 08:14:15 EST 2014
mod_name=BloodMagic
forge_version=10.13.2.1232
ccc_version=1.0.4.29
nei_version=1.0.3.64
//=Dependency Information
package_group=com.wayoftime.bloodmagic
mod_version=1.3.0Beta
mod_version=1.3.0
minetweaker_version=Dev-1.7.10-3.0.9B
build_number=7
mc_version=1.7.10
build_number=2

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

@ -271,7 +271,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.3.0Beta", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory")
@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.3.0", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory")
public class AlchemicalWizardry
{
@ -862,7 +862,7 @@ public class AlchemicalWizardry
SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityFireElementalID), new ItemStack[]{incendiumStack, incendiumStack, incendiumStack, incendiumStack, incendiumStack, incendiumStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityShadeElementalID), new ItemStack[]{tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityHolyElementalID), new ItemStack[]{sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityMinorDemonGruntID), new ItemStack[]{incendiumStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
// SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityMinorDemonGruntID), new ItemStack[]{incendiumStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
//Custom mobs
EntityRegistry.registerModEntity(EntityFallenAngel.class, "FallenAngel", 20, this, 80, 3, true);
@ -1158,7 +1158,7 @@ public class AlchemicalWizardry
// if(parseTextFiles)
// this.parseTextFile();
this.createItemTextureFiles();
// this.createItemTextureFiles();
}
public static void initAlchemyPotionRecipes()
@ -1390,48 +1390,48 @@ public class AlchemicalWizardry
CompressionRegistry.registerItemThreshold(new ItemStack(Blocks.cobblestone), 64);
}
public void createItemTextureFiles()
{
File textFiles = new File("config/BloodMagic/itemJsonFiles");
File bmDirectory = new File("src/main/resources/assets/alchemicalwizardryJsonFiles");
if(!bmDirectory.exists())
{
bmDirectory.mkdirs();
}
String[] itemStrings = new String[]{"apple", "apple"};
String prefix = "alchemicalwizardry:items/";
try
{
for(int i=0; i<itemStrings.length; i+=2)
{
if(i+1 < itemStrings.length)
{
File file = new File(bmDirectory, itemStrings[i] + ".json");
{
String[] strings = getGeneratedStrings(prefix + itemStrings[i + 1]);
PrintWriter writer = new PrintWriter(file);
for(String stri : strings)
{
writer.println(stri);
}
writer.close();
}
}
}
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
// public void createItemTextureFiles()
// {
// File textFiles = new File("config/BloodMagic/itemJsonFiles");
//
// File bmDirectory = new File("src/main/resources/assets/alchemicalwizardryJsonFiles");
// if(!bmDirectory.exists())
// {
// bmDirectory.mkdirs();
// }
//
// String[] itemStrings = new String[]{"apple", "apple"};
//
// String prefix = "alchemicalwizardry:items/";
//
// try
// {
// for(int i=0; i<itemStrings.length; i+=2)
// {
// if(i+1 < itemStrings.length)
// {
// File file = new File(bmDirectory, itemStrings[i] + ".json");
// {
// String[] strings = getGeneratedStrings(prefix + itemStrings[i + 1]);
// PrintWriter writer = new PrintWriter(file);
// for(String stri : strings)
// {
// writer.println(stri);
// }
// writer.close();
// }
// }
//
// }
//
// } catch (FileNotFoundException e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
//
//
//
// }
public String[] getGeneratedStrings(String itemName)
{

2
src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
View file

@ -136,7 +136,7 @@ public class BloodMagicConfiguration
AlchemicalWizardry.ritualDisabledVeilOfEvil = config.get("Ritual Blacklist", "Veil of Evil", false).getBoolean(false);
AlchemicalWizardry.ritualDisabledFullStomach = config.get("Ritual Blacklist", "Requiem of the Satiated Stomach", false).getBoolean(false);
String tempDemonConfigs = "Temp Demon Configs [2]";
String tempDemonConfigs = "Demon Configs";
TEDemonPortal.buildingGridDelay = config.get(tempDemonConfigs, "Building Grid Delay", 25).getInt();
TEDemonPortal.roadGridDelay = config.get(tempDemonConfigs, "Road Grid Delay", 10).getInt();
TEDemonPortal.demonHoardDelay = config.get(tempDemonConfigs, "Demon Hoard Delay", 40).getInt();

14
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockDemonPortal.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@ -13,12 +16,19 @@ public class BlockDemonPortal extends BlockContainer
public BlockDemonPortal()
{
super(Material.rock);
setHardness(2.0F);
setResistance(5.0F);
setHardness(1000);
setResistance(10000);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("demonPortal");
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
{
this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonPortal");
}
@Override
public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player)
{

2
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java
View file

@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
public class BlockDemonChest extends BlockChest implements IBlockPortalNode, IRoadWard
public class BlockDemonChest extends BlockChest implements IBlockPortalNode
{
public BlockDemonChest()
{

36
src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
View file

@ -46,7 +46,7 @@ public class TEDemonPortal extends TileEntity
{
public DemonType type = DemonType.FIRE;
public static boolean printDebug = true;
public static boolean printDebug = false;
public static int limit = 100;
@ -1158,23 +1158,23 @@ public class TEDemonPortal extends TileEntity
public void rightClickBlock(EntityPlayer player, int side)
{
if (worldObj.isRemote)
{
return;
}
this.initialize();
if (ForgeDirection.getOrientation(side) == ForgeDirection.UP)
{
this.createRandomBuilding(DemonBuilding.BUILDING_HOUSE, 0);
} else if (ForgeDirection.getOrientation(side) == ForgeDirection.DOWN)
{
this.createRandomBuilding(DemonBuilding.BUILDING_PORTAL, 0);
} else
{
this.createRandomRoad();
}
// if (worldObj.isRemote)
// {
// return;
// }
//
// this.initialize();
//
// if (ForgeDirection.getOrientation(side) == ForgeDirection.UP)
// {
// this.createRandomBuilding(DemonBuilding.BUILDING_HOUSE, 0);
// } else if (ForgeDirection.getOrientation(side) == ForgeDirection.DOWN)
// {
// this.createRandomBuilding(DemonBuilding.BUILDING_PORTAL, 0);
// } else
// {
// this.createRandomRoad();
// }
}
public int createRandomBuilding(int type, int tier)

2
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java
View file

@ -143,7 +143,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
{
//This is where I need to do the updating
if(world.isRemote)
if(!world.isRemote)
{
return;
}

1
src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
View file

@ -57,6 +57,7 @@ tile.blockReagentConduit.name=Alchemy Relay
tile.lifeEssenceFluidBlock.name=Life Essence
tile.crystalBlock.fullCrystal.name=Crystal Cluster
tile.crystalBlock.crystalBrick.name=Crystal Cluster Brick
tile.demonPortal.name=Demon Portal
#Item Localization
item.weakBloodOrb.name=Weak Blood Orb

BIN
src/main/resources/assets/alchemicalwizardry/textures/blocks/DemonPortal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 416 B