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

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
Show stats 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);
}

20
src/main/java/WayofTime/bloodmagic/client/render/RenderAlchemyArray.java
View file

@ -2,22 +2,18 @@ package WayofTime.bloodmagic.client.render;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer;
import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry;
import WayofTime.bloodmagic.tile.TileAlchemyArray;
public class RenderAlchemyArray extends TileEntitySpecialRenderer {
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTicks, int destroyStage) {
if (tileEntity instanceof TileAlchemyArray) {
ItemStack inputStack = ((TileAlchemyArray)tileEntity).getStackInSlot(0);
public class RenderAlchemyArray extends TileEntitySpecialRenderer<TileAlchemyArray> {
AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack);
int craftTime = ((TileAlchemyArray)tileEntity).activeCounter;
renderer.renderAt(tileEntity, x, y, z, (craftTime > 0 ? craftTime + partialTicks : 0));
}
@Override
public void renderTileEntityAt(TileAlchemyArray alchemyArray, double x, double y, double z, float partialTicks, int destroyStage) {
ItemStack inputStack = alchemyArray.getStackInSlot(0);
int craftTime = alchemyArray.activeCounter;
AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack);
renderer.renderAt(alchemyArray, x, y, z, (craftTime > 0 ? craftTime + partialTicks : 0));
}
}

6
src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
View file

@ -30,16 +30,14 @@ public class ItemActivationCrystal extends ItemBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
for (int i = 0; i < names.length; i++)
list.add(new ItemStack(id, 1, i));
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
tooltip.add(TextHelper.localize("tooltip.BloodMagic.activationCrystal." + names[stack.getItemDamage()]));
super.addInformation(stack, player, tooltip, advanced);

3
src/main/java/WayofTime/bloodmagic/item/ItemBindable.java
View file

@ -73,8 +73,7 @@ public class ItemBindable extends Item implements IBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
NBTHelper.checkNBT(stack);
if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(Constants.NBT.OWNER_NAME)))

6
src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
View file

@ -33,8 +33,7 @@ public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
for (int i = 0; i < OrbRegistry.getSize(); i++)
list.add(new ItemStack(id, 1, i));
}
@ -71,8 +70,7 @@ public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
tooltip.add(StatCollector.translateToLocal("tooltip.BloodMagic.orb.desc"));
if (advanced)

3
src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
View file

@ -55,8 +55,7 @@ public class ItemComponent extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
for (int i = 0; i < names.size(); i++)
list.add(new ItemStack(id, 1, i));
}

6
src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
View file

@ -36,8 +36,7 @@ public class ItemInscriptionTool extends ItemBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
for (int i = 1; i < EnumRuneType.values().length; i++)
list.add(new ItemStack(id, 1, i));
}
@ -57,8 +56,7 @@ public class ItemInscriptionTool extends ItemBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean advanced) {
list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.inscriber.desc"))));
super.addInformation(stack, player, list, advanced);
}

3
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -49,8 +49,7 @@ public class ItemSacrificialDagger extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
for (int i = 0; i < names.length; i++)
list.add(new ItemStack(id, 1, i));
}

6
src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
View file

@ -27,8 +27,7 @@ public class ItemSlate extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
for (int i = 0; i < names.length; i++)
list.add(new ItemStack(id, 1, i));
}
@ -40,8 +39,7 @@ public class ItemSlate extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean advanced) {
list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.slate.desc"))));
}
}

6
src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
View file

@ -40,8 +40,7 @@ public class ItemTelepositionFocus extends ItemBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
for (int i = 0; i < names.length; i++)
list.add(new ItemStack(id, 1, i));
}
@ -57,8 +56,7 @@ public class ItemTelepositionFocus extends ItemBindable {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localize("tooltip.BloodMagic.telepositionfocus." + names[stack.getItemDamage()]))));
super.addInformation(stack, player, tooltip, advanced);

3
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
View file

@ -68,8 +68,7 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator {
}
@Override
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean advanced) {
stack = NBTHelper.checkNBT(stack);
list.add(TextHelper.localize("tooltip.BloodMagic.pack.sacrifice.desc"));
list.add(TextHelper.localize("tooltip.BloodMagic.pack.stored", getStoredLP(stack)));

3
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

@ -84,8 +84,7 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
}
@Override
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean advanced) {
stack = NBTHelper.checkNBT(stack);
list.add(TextHelper.localize("tooltip.BloodMagic.pack.selfSacrifice.desc"));
list.add(TextHelper.localize("tooltip.BloodMagic.pack.stored", getStoredLP(stack)));

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

@ -54,8 +54,7 @@ public class ItemSigilBase extends ItemBindable implements ISigil {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
if (StatCollector.canTranslate(tooltipBase + "desc"))
tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc"));

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

@ -24,8 +24,7 @@ public class ItemSigilToggleable extends ItemSigilBase {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced);
if (getActivated(stack))
tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated"));

15
src/main/java/WayofTime/bloodmagic/render/RenderEntityBloodLight.java
View file

@ -10,7 +10,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
public class RenderEntityBloodLight extends Render {
public class RenderEntityBloodLight extends Render<EntityBloodLight> {
public RenderEntityBloodLight(RenderManager renderManager) {
super(renderManager);
@ -26,28 +26,23 @@ public class RenderEntityBloodLight extends Render {
Tessellator tessellator = Tessellator.getInstance();
GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
tessellator.getWorldRenderer().begin(7, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); //startDrawingQuads
// tessellator.getWorldRenderer().putNormal(0.0F, 1.0F, 0.0F); //setNormal
tessellator.getWorldRenderer().begin(7, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL);
tessellator.getWorldRenderer().pos(-0.5D, -0.25D, 0.0D).tex(0D, 1D).normal(0F, 1F, 0F).endVertex();
tessellator.getWorldRenderer().pos(0.5D, -0.25D, 0.0D).tex(1D, 1D).normal(0F, 1F, 0F).endVertex();
tessellator.getWorldRenderer().pos(0.5D, 0.75D, 0.0D).tex(1D, 0D).normal(0F, 1F, 0F).endVertex();
tessellator.getWorldRenderer().pos(-0.5D, 0.75D, 0.0D).tex(0D, 1D).normal(0F, 1F, 0F).endVertex();
// tessellator.getWorldRenderer().addVertexWithUV(-0.5F, -0.25F, 0.0D, 0, 1);
// tessellator.getWorldRenderer().addVertexWithUV(0.5F, -0.25F, 0.0D, 1, 1);
// tessellator.getWorldRenderer().addVertexWithUV(0.5F, 0.75F, 0.0D, 1, 0);
// tessellator.getWorldRenderer().addVertexWithUV(-0.5F, 0.75F, 0.0D, 0, 0);
tessellator.draw();
GlStateManager.disableRescaleNormal();
GlStateManager.popMatrix();
}
@Override
public void doRender(Entity entity, double d, double d1, double d2, float f, float f1) {
renderEntityAt((EntityBloodLight) entity, d, d1, d2, f, f1);
public void doRender(EntityBloodLight entityBloodLight, double d, double d1, double d2, float f, float f1) {
renderEntityAt(entityBloodLight, d, d1, d2, f, f1);
}
@Override
protected ResourceLocation getEntityTexture(Entity entity) {
protected ResourceLocation getEntityTexture(EntityBloodLight entityBloodLight) {
return TextureMap.locationBlocksTexture;
}
}