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

Change how blocks/items are registered (desc)

Browse source 
tterrag is a meany face and yelled at me for using class.getSimpleName(). So here's an API-friendly re-work of the registration system. This allows all our Items/Blocks to be obtained via the API. Just add a new enum.
This commit is contained in:
Nick 2016-01-18 22:34:12 -08:00
parent 2a028414b1
commit fdfcb5c5b7
69 changed files with 260 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
@ -10,6 +11,7 @@ public class ItemSigilAir extends ItemSigilBase
public ItemSigilAir()
{
super("air", 50);
setRegistryName(Constants.BloodMagicItem.SIGIL_AIR.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
import WayofTime.bloodmagic.item.ItemBindable;
@ -15,6 +16,7 @@ public class ItemSigilBloodLight extends ItemSigilBase
public ItemSigilBloodLight()
{
super("bloodLight", 10);
setRegistryName(Constants.BloodMagicItem.SIGIL_BLOOD_LIGHT.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.compress.CompressionRegistry;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -11,6 +12,7 @@ public class ItemSigilCompression extends ItemSigilToggleable
public ItemSigilCompression()
{
super("compression", 200);
setRegistryName(Constants.BloodMagicItem.SIGIL_COMPRESSION.getRegName());
}
// TODO REWRITE all compression stuff if someone has time

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@ -10,7 +11,6 @@ import WayofTime.bloodmagic.api.altar.IBloodAltar;
import WayofTime.bloodmagic.api.iface.IAltarReader;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -19,6 +19,7 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
public ItemSigilDivination()
{
super("divination");
setRegistryName(Constants.BloodMagicItem.SIGIL_DIVINATION.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
@ -11,6 +12,7 @@ public class ItemSigilElementalAffinity extends ItemSigilToggleable
public ItemSigilElementalAffinity()
{
super("elementalAffinity", 200);
setRegistryName(Constants.BloodMagicItem.SIGIL_ELEMENTAL_AFFINITY.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.registry.ModPotions;
import net.minecraft.entity.Entity;
import net.minecraft.entity.monster.EntityEnderman;
@ -16,6 +17,7 @@ public class ItemSigilEnderSeverance extends ItemSigilToggleable
public ItemSigilEnderSeverance()
{
super("enderSeverance", 200);
setRegistryName(Constants.BloodMagicItem.SIGIL_ENDER_SEVERANCE.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
@ -11,6 +12,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleable
public ItemSigilFastMiner()
{
super("fastMiner", 100);
setRegistryName(Constants.BloodMagicItem.SIGIL_FAST_MINER.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.block.Block;
import net.minecraft.block.IGrowable;
import net.minecraft.block.state.IBlockState;
@ -15,6 +16,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleable
public ItemSigilGreenGrove()
{
super("greenGrove", 150);
setRegistryName(Constants.BloodMagicItem.SIGIL_GREEN_GROVE.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.registry.ModPotions;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -11,6 +12,7 @@ public class ItemSigilHaste extends ItemSigilToggleable
public ItemSigilHaste()
{
super("haste", 250);
setRegistryName(Constants.BloodMagicItem.SIGIL_HASTE.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
@ -20,6 +21,7 @@ public class ItemSigilLava extends ItemSigilBase
public ItemSigilLava()
{
super("lava", 1000);
setRegistryName(Constants.BloodMagicItem.SIGIL_LAVA.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.EntityXPOrb;
import net.minecraft.entity.player.EntityPlayer;
@ -14,6 +15,7 @@ public class ItemSigilMagnetism extends ItemSigilToggleable
public ItemSigilMagnetism()
{
super("magnetism", 50);
setRegistryName(Constants.BloodMagicItem.SIGIL_MAGNETISM.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.registry.ModBlocks;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -11,6 +12,7 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleable
public ItemSigilPhantomBridge()
{
super("phantomBridge", 100);
setRegistryName(Constants.BloodMagicItem.SIGIL_PHANTOM_BRIDGE.getRegName());
}
@Override

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@ -11,7 +12,6 @@ import WayofTime.bloodmagic.api.altar.IBloodAltar;
import WayofTime.bloodmagic.api.iface.IAltarReader;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -20,6 +20,7 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader
public ItemSigilSeer()
{
super("seer");
setRegistryName(Constants.BloodMagicItem.SIGIL_SEER.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.TileSpectralBlock;
import WayofTime.bloodmagic.util.Utils;
import net.minecraft.block.Block;
@ -14,6 +15,7 @@ public class ItemSigilSuppression extends ItemSigilToggleable
public ItemSigilSuppression()
{
super("suppression", 400);
setRegistryName(Constants.BloodMagicItem.SIGIL_SUPPRESION.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -17,6 +18,7 @@ public class ItemSigilVoid extends ItemSigilBase
public ItemSigilVoid()
{
super("void", 50);
setRegistryName(Constants.BloodMagicItem.SIGIL_VOID.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
@ -20,6 +21,7 @@ public class ItemSigilWater extends ItemSigilBase
public ItemSigilWater()
{
super("water", 100);
setRegistryName(Constants.BloodMagicItem.SIGIL_WATER.getRegName());
}
@Override

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.registry.ModPotions;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -11,6 +12,7 @@ public class ItemSigilWhirlwind extends ItemSigilToggleable
public ItemSigilWhirlwind()
{
super("whirlwind", 250);
setRegistryName(Constants.BloodMagicItem.SIGIL_WHIRLWIND.getRegName());
}
@Override