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

Massive rework of configs, items and blocks.

Browse source 
I redone where the items/blocsks are stored and how the configs are
handled to clean up it and give space. You can change the config line to
AWWayofTime if you want to keep the compatibility with old configs. Now
you reference the blocks from the ModBlocks and Items from the ModItems.
This commit is contained in:
Fenn 2014-01-17 21:05:38 +00:00
parent 8601e9faff
commit e3644f2d2b
304 changed files with 3941 additions and 5108 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BM_src/WayofTime/alchemicalWizardry/common/summoning/SummoningFallenAngel.java
View file

@ -4,8 +4,7 @@ import WayofTime.alchemicalWizardry.common.entity.mob.EntityFallenAngel;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.world.World;
public class SummoningFallenAngel extends SummoningHelper
{
public class SummoningFallenAngel extends SummoningHelper {
public SummoningFallenAngel(int id)
{
super(id);

18
BM_src/WayofTime/alchemicalWizardry/common/summoning/SummoningHelper.java
View file

@ -2,31 +2,19 @@ package WayofTime.alchemicalWizardry.common.summoning;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAirElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityBileDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityBoulderFist;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityEarthElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityFallenAngel;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityFireElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityHolyElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityIceDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityLowerGuardian;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityShade;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityShadeElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntitySmallEarthGolem;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityWaterElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityWingedFireDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.*;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntityPig;
import net.minecraft.world.World;
public class SummoningHelper
{
public class SummoningHelper {
private int id;
public SummoningHelper(int id)
{
this.id = id;
}
public EntityLivingBase getEntity(World worldObj)
{
if (this.id == AlchemicalWizardry.entityFallenAngelID)

9
BM_src/WayofTime/alchemicalWizardry/common/summoning/SummoningRegistry.java
View file

@ -1,14 +1,13 @@
package WayofTime.alchemicalWizardry.common.summoning;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class SummoningRegistry
{
import java.util.ArrayList;
import java.util.List;
public class SummoningRegistry {
public static List<SummoningRegistryComponent> summoningList = new ArrayList();
public static void registerSummon(SummoningHelper s, ItemStack[] ring1, ItemStack[] ring2, ItemStack[] ring3, int amountUsed, int bloodOrbLevel)

18
BM_src/WayofTime/alchemicalWizardry/common/summoning/SummoningRegistryComponent.java
View file

@ -6,8 +6,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
public class SummoningRegistryComponent
{
public class SummoningRegistryComponent {
public ItemStack[] ring1 = new ItemStack[6];
public ItemStack[] ring2 = new ItemStack[6];
public ItemStack[] ring3 = new ItemStack[6];
@ -33,8 +32,7 @@ public class SummoningRegistryComponent
if (i + 1 > this.ring1.length)
{
newRecipe[i] = null;
}
else
} else
{
newRecipe[i] = this.ring1[i];
}
@ -52,8 +50,7 @@ public class SummoningRegistryComponent
if (i + 1 > this.ring2.length)
{
newRecipe[i] = null;
}
else
} else
{
newRecipe[i] = this.ring2[i];
}
@ -71,8 +68,7 @@ public class SummoningRegistryComponent
if (i + 1 > this.ring3.length)
{
newRecipe[i] = null;
}
else
} else
{
newRecipe[i] = this.ring3[i];
}
@ -118,8 +114,7 @@ public class SummoningRegistryComponent
if (i + 1 > recipe.length)
{
newRecipe[i] = null;
}
else
} else
{
newRecipe[i] = recipe[i];
}
@ -168,8 +163,7 @@ public class SummoningRegistryComponent
{
quickTest = true;
}
}
else if (!(checkedItemStack.getItem() instanceof ItemBlock))
} else if (!(checkedItemStack.getItem() instanceof ItemBlock))
{
quickTest = true;
}

9
BM_src/WayofTime/alchemicalWizardry/common/summoning/meteor/MeteorParadigm.java
View file

@ -1,15 +1,14 @@
package WayofTime.alchemicalWizardry.common.summoning.meteor;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class MeteorParadigm
{
import java.util.ArrayList;
import java.util.List;
public class MeteorParadigm {
public List<MeteorParadigmComponent> componentList = new ArrayList();
public ItemStack focusStack;
public int radius;

7
BM_src/WayofTime/alchemicalWizardry/common/summoning/meteor/MeteorParadigmComponent.java
View file

@ -1,13 +1,12 @@
package WayofTime.alchemicalWizardry.common.summoning.meteor;
import java.util.List;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class MeteorParadigmComponent
{
import java.util.List;
public class MeteorParadigmComponent {
public String oreDictName;
public int chance;

9
BM_src/WayofTime/alchemicalWizardry/common/summoning/meteor/MeteorRegistry.java
View file

@ -1,14 +1,13 @@
package WayofTime.alchemicalWizardry.common.summoning.meteor;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
public class MeteorRegistry
{
import java.util.ArrayList;
import java.util.List;
public class MeteorRegistry {
public static List<MeteorParadigm> paradigmList = new ArrayList();
public static void registerMeteorParadigm(MeteorParadigm paradigm)