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

Generify

Browse source
This commit is contained in:
Nick 2015-12-28 14:04:34 -08:00
parent e6354fb483
commit beb85cf154
18 changed files with 33 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/main/java/WayofTime/bloodmagic/block/BlockSocket.java
View file

@ -1,70 +0,0 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class BlockSocket extends Block {
public static final String[] names = {"empty", "filled"};
public static final PropertyInteger META = PropertyInteger.create("META", 0, names.length - 1);
public BlockSocket() {
super(Material.iron);
setUnlocalizedName(Constants.Mod.MODID + ".socket.");
setHardness(2.0F);
setResistance(5.0F);
setStepSound(soundTypeMetal);
setHarvestLevel("pickaxe", 2);
setCreativeTab(BloodMagic.tabBloodMagic);
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(META, meta);
}
@Override
public int getMetaFromState(IBlockState state) {
return (Integer) state.getValue(META);
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
protected BlockState createBlockState() {
return new BlockState(this, META);
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(this, 1, this.getMetaFromState(world.getBlockState(pos)));
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < names.length; i++)
list.add(new ItemStack(this, 1, i));
}
}

3
src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
View file

@ -86,8 +86,7 @@ public class BlockInteger extends Block {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) {
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List<ItemStack> list) {
for (int i = 0; i < maxMeta + 1; i++)
list.add(new ItemStack(this, 1, i));
}

3
src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
View file

@ -90,8 +90,7 @@ public class BlockString extends Block {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) {
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List<ItemStack> list) {
for (int i = 0; i < maxMeta + 1; i++)
list.add(new ItemStack(this, 1, i));
}

3
src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java
View file

@ -12,11 +12,10 @@ public class PropertyString extends PropertyHelper {
private final ImmutableSet allowedValues;
@SuppressWarnings("unchecked")
protected PropertyString(String name, String[] values) {
super(name, String.class);
HashSet hashSet = Sets.newHashSet();
HashSet<String> hashSet = Sets.newHashSet();
hashSet.addAll(Arrays.asList(values));
allowedValues = ImmutableSet.copyOf(hashSet);
}