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

Most blocks are done

Browse source
This commit is contained in:
Nick 2016-03-16 15:37:55 -07:00
parent 9de1f6e43e
commit b1db7c5152
85 changed files with 221 additions and 637 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -21,8 +22,13 @@ import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.Utils;
import com.google.common.base.Strings;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockAltar extends BlockContainer
import java.util.ArrayList;
import java.util.List;
public class BlockAltar extends BlockContainer implements IVariantProvider
{
public BlockAltar()
{
@ -150,4 +156,10 @@ public class BlockAltar extends BlockContainer
super.breakBlock(world, blockPos, blockState);
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

16
src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
View file

@ -1,11 +1,17 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.material.Material;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.base.BlockString;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockBloodRune extends BlockString
import java.util.ArrayList;
import java.util.List;
public class BlockBloodRune extends BlockString implements IVariantProvider
{
public static final String[] names = { "blank", "speed", "efficiency", "sacrifice", "selfSacrifice", "displacement", "capacity", "augCapacity", "orb", "acceleration", "charging" };
@ -26,4 +32,12 @@ public class BlockBloodRune extends BlockString
{
return meta;
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));
return ret;
}
}

16
src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
View file

@ -1,11 +1,17 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.material.Material;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.base.BlockString;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockBloodStoneBrick extends BlockString
import java.util.ArrayList;
import java.util.List;
public class BlockBloodStoneBrick extends BlockString implements IVariantProvider
{
public static final String[] names = { "large", "brick" };
@ -21,4 +27,12 @@ public class BlockBloodStoneBrick extends BlockString
setStepSound(soundTypeStone);
setHarvestLevel("pickaxe", 2);
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));
return ret;
}
}

16
src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
View file

@ -1,11 +1,17 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.material.Material;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.base.BlockString;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockCrystal extends BlockString
import java.util.ArrayList;
import java.util.List;
public class BlockCrystal extends BlockString implements IVariantProvider
{
public static final String[] names = { "large", "brick" };
@ -21,4 +27,12 @@ public class BlockCrystal extends BlockString
setResistance(5.0F);
setHarvestLevel("pickaxe", 2);
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));
return ret;
}
}

15
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -15,8 +16,13 @@ import WayofTime.bloodmagic.api.soul.IDemonWillGem;
import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill;
import WayofTime.bloodmagic.tile.TileDemonCrucible;
import WayofTime.bloodmagic.util.Utils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockDemonCrucible extends BlockContainer
import java.util.ArrayList;
import java.util.List;
public class BlockDemonCrucible extends BlockContainer implements IVariantProvider
{
public BlockDemonCrucible()
{
@ -95,4 +101,11 @@ public class BlockDemonCrucible extends BlockContainer
super.breakBlock(world, blockPos, blockState);
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

15
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
@ -10,8 +11,13 @@ import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.TileDemonCrystallizer;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockDemonCrystallizer extends BlockContainer
import java.util.ArrayList;
import java.util.List;
public class BlockDemonCrystallizer extends BlockContainer implements IVariantProvider
{
public BlockDemonCrystallizer()
{
@ -62,4 +68,11 @@ public class BlockDemonCrystallizer extends BlockContainer
{
return new TileDemonCrystallizer();
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

15
src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
@ -7,8 +8,13 @@ import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.TileDemonPylon;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockDemonPylon extends BlockContainer
import java.util.ArrayList;
import java.util.List;
public class BlockDemonPylon extends BlockContainer implements IVariantProvider
{
public BlockDemonPylon()
{
@ -53,4 +59,11 @@ public class BlockDemonPylon extends BlockContainer
{
return new TileDemonPylon();
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

15
src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -9,8 +10,13 @@ import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.TileIncenseAltar;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockIncenseAltar extends BlockContainer
import java.util.ArrayList;
import java.util.List;
public class BlockIncenseAltar extends BlockContainer implements IVariantProvider
{
public BlockIncenseAltar()
{
@ -65,4 +71,11 @@ public class BlockIncenseAltar extends BlockContainer
super.breakBlock(world, blockPos, blockState);
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

16
src/main/java/WayofTime/bloodmagic/block/BlockPath.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
@ -8,8 +9,13 @@ import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.incense.IIncensePath;
import WayofTime.bloodmagic.block.base.BlockString;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockPath extends BlockString implements IIncensePath
import java.util.ArrayList;
import java.util.List;
public class BlockPath extends BlockString implements IIncensePath, IVariantProvider
{
public static final String[] names = { "wood", "woodTile", "stone", "stoneTile", "wornstone", "wornstoneTile", "obsidian", "obsidianTile" };
@ -55,4 +61,12 @@ public class BlockPath extends BlockString implements IIncensePath
return 0;
}
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));
return ret;
}
}

14
src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
View file

@ -1,7 +1,10 @@
package WayofTime.bloodmagic.block;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -17,8 +20,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.TilePhantomBlock;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockPhantom extends BlockContainer
public class BlockPhantom extends BlockContainer implements IVariantProvider
{
public BlockPhantom()
{
@ -87,4 +92,11 @@ public class BlockPhantom extends BlockContainer
{
return new TilePhantomBlock(100);
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

16
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
@ -20,8 +21,13 @@ import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
import WayofTime.bloodmagic.tile.TileMasterRitualStone;
import WayofTime.bloodmagic.util.ChatUtil;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockRitualController extends BlockStringContainer
import java.util.ArrayList;
import java.util.List;
public class BlockRitualController extends BlockStringContainer implements IVariantProvider
{
public static final String[] names = { "master", "imperfect" };
@ -98,4 +104,12 @@ public class BlockRitualController extends BlockStringContainer
{
return meta == 0 ? (new TileMasterRitualStone()) : (new TileImperfectRitualStone());
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));
return ret;
}
}

16
src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
@ -10,8 +11,13 @@ import WayofTime.bloodmagic.api.ritual.EnumRuneType;
import WayofTime.bloodmagic.api.ritual.IRitualStone;
import WayofTime.bloodmagic.block.base.BlockString;
import WayofTime.bloodmagic.registry.ModBlocks;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockRitualStone extends BlockString implements IRitualStone
import java.util.ArrayList;
import java.util.List;
public class BlockRitualStone extends BlockString implements IRitualStone, IVariantProvider
{
public static final String[] names = { "blank", "water", "fire", "earth", "air", "dusk", "dawn" };
@ -47,4 +53,12 @@ public class BlockRitualStone extends BlockString implements IRitualStone
IBlockState newState = ModBlocks.ritualStone.getStateFromMeta(meta);
world.setBlockState(pos, newState);
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));
return ret;
}
}

15
src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -11,8 +12,13 @@ import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.TileSoulForge;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockSoulForge extends BlockContainer
import java.util.ArrayList;
import java.util.List;
public class BlockSoulForge extends BlockContainer implements IVariantProvider
{
public BlockSoulForge()
{
@ -77,4 +83,11 @@ public class BlockSoulForge extends BlockContainer
{
return new TileSoulForge();
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

13
src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
View file

@ -1,8 +1,10 @@
package WayofTime.bloodmagic.block;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -17,8 +19,10 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.TileSpectralBlock;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockSpectral extends BlockContainer
public class BlockSpectral extends BlockContainer implements IVariantProvider
{
public BlockSpectral()
{
@ -76,4 +80,11 @@ public class BlockSpectral extends BlockContainer
{
return new TileSpectralBlock();
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}

15
src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -13,8 +14,13 @@ import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.item.ItemTelepositionFocus;
import WayofTime.bloodmagic.tile.TileTeleposer;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
public class BlockTeleposer extends BlockContainer
import java.util.ArrayList;
import java.util.List;
public class BlockTeleposer extends BlockContainer implements IVariantProvider
{
public BlockTeleposer()
{
@ -61,4 +67,11 @@ public class BlockTeleposer extends BlockContainer
{
return new TileTeleposer();
}
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;
}
}