Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Moving the intialization of items and blocks to the init package, and simplifying things and removing the infused blocks (Aludel recipes will take their place)

Browse source
This commit is contained in:
pahimar 2014-04-29 22:26:30 -04:00
parent ac207393fe
commit 3362621750
19 changed files with 14 additions and 499 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -1,10 +1,10 @@
package com.pahimar.ee3;
import com.pahimar.ee3.block.ModBlocks;
import com.pahimar.ee3.handler.CraftingHandler;
import com.pahimar.ee3.handler.GuiHandler;
import com.pahimar.ee3.init.ModBlocks;
import com.pahimar.ee3.init.ModItems;
import com.pahimar.ee3.item.EquivalencyStack;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.network.PacketHandler;
import com.pahimar.ee3.proxy.IProxy;
import com.pahimar.ee3.reference.EventHandlers;

2
src/main/java/com/pahimar/ee3/block/BlockChalk.java
View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.init.ModItems;
import com.pahimar.ee3.reference.Names;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;

94
src/main/java/com/pahimar/ee3/block/BlockInfusedCloth.java
View file

@ -1,94 +0,0 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.reference.Colors;
import com.pahimar.ee3.reference.Names;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import java.util.List;
public class BlockInfusedCloth extends BlockEE
{
public BlockInfusedCloth()
{
super(Material.cloth);
this.setHardness(0.8f);
this.setBlockName(Names.Blocks.INFUSED_CLOTH);
this.setStepSound(soundTypeCloth);
}
@Override
public int damageDropped(int metaData)
{
return metaData;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < 3; meta++)
{
list.add(new ItemStack(item, 1, meta));
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
{
blockIcon = iconRegister.registerIcon("wool_colored_white");
}
@Override
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z)
{
int metaData = blockAccess.getBlockMetadata(x, y, z);
if (metaData == 0)
{
return Integer.parseInt(Colors.INFUSED_CLOTH_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colors.INFUSED_CLOTH_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colors.INFUSED_CLOTH_MINIUM, 16);
}
else
{
return Integer.parseInt(Colors.PURE_WHITE, 16);
}
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
if (metaData == 0)
{
return Integer.parseInt(Colors.INFUSED_CLOTH_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colors.INFUSED_CLOTH_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colors.INFUSED_CLOTH_MINIUM, 16);
}
else
{
return Integer.parseInt(Colors.PURE_WHITE, 16);
}
}
}

93
src/main/java/com/pahimar/ee3/block/BlockInfusedPlank.java
View file

@ -1,93 +0,0 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.reference.Colors;
import com.pahimar.ee3.reference.Names;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import java.util.List;
public class BlockInfusedPlank extends BlockEE
{
public BlockInfusedPlank()
{
super(Material.wood);
this.setHardness(2.0f);
this.setResistance(5.0f);
this.setBlockName(Names.Blocks.INFUSED_PLANK);
this.setStepSound(soundTypeWood);
}
@Override
public int damageDropped(int metaData)
{
return metaData;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < 3; meta++)
{
list.add(new ItemStack(item, 1, meta));
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
{
blockIcon = iconRegister.registerIcon("planks_oak");
}
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z)
{
int metaData = blockAccess.getBlockMetadata(x, y, z);
if (metaData == 0)
{
return Integer.parseInt(Colors.INFUSED_PLANKS_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colors.INFUSED_PLANKS_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colors.INFUSED_PLANKS_MINIUM, 16);
}
else
{
return Integer.parseInt(Colors.PURE_WHITE, 16);
}
}
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
if (metaData == 0)
{
return Integer.parseInt(Colors.INFUSED_PLANKS_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colors.INFUSED_PLANKS_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colors.INFUSED_PLANKS_MINIUM, 16);
}
else
{
return Integer.parseInt(Colors.PURE_WHITE, 16);
}
}
}

168
src/main/java/com/pahimar/ee3/block/BlockInfusedWood.java
View file

@ -1,168 +0,0 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.reference.Colors;
import com.pahimar.ee3.reference.Names;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.List;
public class BlockInfusedWood extends BlockEE
{
@SideOnly(Side.CLIENT)
private IIcon logEnd, logSide;
public BlockInfusedWood()
{
super(Material.wood);
this.setHardness(2.0f);
this.setBlockName(Names.Blocks.INFUSED_WOOD);
this.setStepSound(soundTypeWood);
}
@Override
public int damageDropped(int metaData)
{
return metaData & 3;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < 3; meta++)
{
list.add(new ItemStack(item, 1, meta));
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
{
logEnd = iconRegister.registerIcon("log_oak_top");
logSide = iconRegister.registerIcon("log_oak");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int metaData)
{
if (ForgeDirection.getOrientation(side) == ForgeDirection.UP || ForgeDirection.getOrientation(side) == ForgeDirection.DOWN)
{
if (metaData >> 2 == 0)
{
return logEnd;
}
else
{
return logSide;
}
}
else if (ForgeDirection.getOrientation(side) == ForgeDirection.NORTH || ForgeDirection.getOrientation(side) == ForgeDirection.SOUTH)
{
if (metaData >> 2 == 2)
{
return logEnd;
}
else
{
return logSide;
}
}
else
{
if (metaData >> 2 == 1)
{
return logEnd;
}
else
{
return logSide;
}
}
}
/**
* Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, side, hitX, hitY, hitZ, block metadata
*/
@Override
public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metaData)
{
int logType = metaData & 3;
byte rotation = 0;
switch (side)
{
case 0:
case 1:
rotation = 0;
break;
case 2:
case 3:
rotation = 8;
break;
case 4:
case 5:
rotation = 4;
}
int newMetaData = logType | rotation;
world.setBlockMetadataWithNotify(x, y, z, newMetaData, 3);
return newMetaData;
}
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z)
{
int metaData = blockAccess.getBlockMetadata(x, y, z) & 3;
if (metaData == 0)
{
return Integer.parseInt(Colors.INFUSED_WOOD_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colors.INFUSED_WOOD_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colors.INFUSED_WOOD_MINIUM, 16);
}
else
{
return Integer.parseInt(Colors.PURE_WHITE, 16);
}
}
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
int adjustedMetaData = metaData & 3;
if (adjustedMetaData == 0)
{
return Integer.parseInt(Colors.INFUSED_WOOD_VERDANT, 16);
}
else if (adjustedMetaData == 1)
{
return Integer.parseInt(Colors.INFUSED_WOOD_AZURE, 16);
}
else if (adjustedMetaData == 2)
{
return Integer.parseInt(Colors.INFUSED_WOOD_MINIUM, 16);
}
else
{
return Integer.parseInt(Colors.PURE_WHITE, 16);
}
}
}

2
src/main/java/com/pahimar/ee3/creativetab/CreativeTab.java
View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.creativetab;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.init.ModItems;
import com.pahimar.ee3.reference.Reference;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

12
src/main/java/com/pahimar/ee3/block/ModBlocks.java → src/main/java/com/pahimar/ee3/init/ModBlocks.java
View file

@ -1,6 +1,8 @@
package com.pahimar.ee3.block;
package com.pahimar.ee3.init;
import com.pahimar.ee3.item.*;
import com.pahimar.ee3.block.*;
import com.pahimar.ee3.item.ItemBlockAlchemicalChest;
import com.pahimar.ee3.item.ItemBlockAlchemicalFuel;
import com.pahimar.ee3.reference.Names;
import cpw.mods.fml.common.registry.GameRegistry;
@ -8,9 +10,6 @@ public class ModBlocks
{
public static final BlockEE chalk = new BlockChalk();
public static final BlockEE alchemicalFuel = new BlockAlchemicalFuel();
public static final BlockEE infusedCloth = new BlockInfusedCloth();
public static final BlockEE infusedWood = new BlockInfusedWood();
public static final BlockEE infusedPlank = new BlockInfusedPlank();
public static final BlockEE alchemicalChest = new BlockAlchemicalChest();
public static final BlockEE aludel = new BlockAludel();
public static final BlockEE calcinator = new BlockCalcinator();
@ -21,9 +20,6 @@ public class ModBlocks
{
GameRegistry.registerBlock(chalk, "tile." + Names.Items.CHALK);
GameRegistry.registerBlock(alchemicalFuel, ItemBlockAlchemicalFuel.class, "tile." + Names.Items.ALCHEMICAL_FUEL);
GameRegistry.registerBlock(infusedCloth, ItemBlockInfusedCloth.class, "tile." + Names.Blocks.INFUSED_CLOTH);
GameRegistry.registerBlock(infusedWood, ItemBlockInfusedWood.class, "tile." + Names.Blocks.INFUSED_WOOD);
GameRegistry.registerBlock(infusedPlank, ItemBlockInfusedPlank.class, "tile." + Names.Blocks.INFUSED_PLANK);
GameRegistry.registerBlock(alchemicalChest, ItemBlockAlchemicalChest.class, "tile." + Names.Blocks.ALCHEMICAL_CHEST);
GameRegistry.registerBlock(aludel, "tile." + Names.Blocks.ALUDEL);
GameRegistry.registerBlock(calcinator, "tile." + Names.Blocks.CALCINATOR);

6
src/main/java/com/pahimar/ee3/item/ModItems.java → src/main/java/com/pahimar/ee3/init/ModItems.java
View file

@ -1,9 +1,8 @@
package com.pahimar.ee3.item;
package com.pahimar.ee3.init;
import com.pahimar.ee3.block.ModBlocks;
import com.pahimar.ee3.item.*;
import com.pahimar.ee3.reference.Names;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.ItemBlock;
public class ModItems
{
@ -17,7 +16,6 @@ public class ModItems
public static final ItemEE alchemicalInventoryUpgrade = new ItemAlchemicalInventoryUpgrade();
public static final ItemEE chalk = new ItemChalk();
public static final ItemEE diviningRod = new ItemDiviningRod();
public static final ItemBlock alchemicalChest = new ItemBlockAlchemicalChest(ModBlocks.alchemicalChest);
public static void init()
{

1
src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
View file

@ -1,5 +1,6 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.init.ModItems;
import com.pahimar.ee3.reference.Colors;
import com.pahimar.ee3.reference.Names;
import com.pahimar.ee3.reference.Textures;

2
src/main/java/com/pahimar/ee3/item/ItemBlockAlchemicalFuel.java
View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.block.ModBlocks;
import com.pahimar.ee3.init.ModBlocks;
import com.pahimar.ee3.reference.Names;
import net.minecraft.block.Block;
import net.minecraft.item.ItemMultiTexture;

34
src/main/java/com/pahimar/ee3/item/ItemBlockInfusedCloth.java
View file

@ -1,34 +0,0 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.reference.Messages;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import java.util.List;
public class ItemBlockInfusedCloth extends ItemBlock
{
public ItemBlockInfusedCloth(Block block)
{
super(block);
this.setHasSubtypes(true);
}
@Override
public int getMetadata(int meta)
{
return meta;
}
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean flag)
{
int dustMetaData = (itemStack.getItemDamage() % 3) + 1;
list.add(String.format("%s %s", StatCollector.translateToLocal(Messages.TOOLTIP_INFUSED_WITH), new ItemStack(ModItems.alchemicalDust, 1, dustMetaData).getDisplayName()));
}
}

34
src/main/java/com/pahimar/ee3/item/ItemBlockInfusedPlank.java
View file

@ -1,34 +0,0 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.reference.Messages;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import java.util.List;
public class ItemBlockInfusedPlank extends ItemBlock
{
public ItemBlockInfusedPlank(Block block)
{
super(block);
this.setHasSubtypes(true);
}
@Override
public int getMetadata(int meta)
{
return meta;
}
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean flag)
{
int dustMetaData = (itemStack.getItemDamage() % 3) + 1;
list.add(String.format("%s %s", StatCollector.translateToLocal(Messages.TOOLTIP_INFUSED_WITH), new ItemStack(ModItems.alchemicalDust, 1, dustMetaData).getDisplayName()));
}
}

34
src/main/java/com/pahimar/ee3/item/ItemBlockInfusedWood.java
View file

@ -1,34 +0,0 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.reference.Messages;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import java.util.List;
public class ItemBlockInfusedWood extends ItemBlock
{
public ItemBlockInfusedWood(Block block)
{
super(block);
this.setHasSubtypes(true);
}
@Override
public int getMetadata(int meta)
{
return meta;
}
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean flag)
{
int dustMetaData = (itemStack.getItemDamage() % 3) + 1;
list.add(String.format("%s %s", StatCollector.translateToLocal(Messages.TOOLTIP_INFUSED_WITH), new ItemStack(ModItems.alchemicalDust, 1, dustMetaData).getDisplayName()));
}
}

2
src/main/java/com/pahimar/ee3/proxy/ClientProxy.java
View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.proxy;
import com.pahimar.ee3.block.ModBlocks;
import com.pahimar.ee3.client.renderer.item.*;
import com.pahimar.ee3.client.renderer.tileentity.*;
import com.pahimar.ee3.init.ModBlocks;
import com.pahimar.ee3.reference.RenderIds;
import com.pahimar.ee3.tileentity.*;
import cpw.mods.fml.client.registry.ClientRegistry;

15
src/main/java/com/pahimar/ee3/reference/Colors.java
View file

@ -11,21 +11,6 @@ public class Colors
public static final String DUST_MINIUM = "FF4545";
public static final String[] DUST_COLOURS = new String[]{DUST_ASH, DUST_VERDANT, DUST_AZURE, DUST_MINIUM};
// Infused Planks
public static final String INFUSED_PLANKS_VERDANT = "3D822A";
public static final String INFUSED_PLANKS_AZURE = "356E84";
public static final String INFUSED_PLANKS_MINIUM = "A33931";
// Infused Wood
public static final String INFUSED_WOOD_VERDANT = "3D822A";
public static final String INFUSED_WOOD_AZURE = "356E84";
public static final String INFUSED_WOOD_MINIUM = "A33931";
// Infused Cloth
public static final String INFUSED_CLOTH_VERDANT = "98E191";
public static final String INFUSED_CLOTH_AZURE = "8FCDEB";
public static final String INFUSED_CLOTH_MINIUM = "FD9898";
// Text
public static final String TEXT_COLOUR_PREFIX_YELLOW = "\u00a7e";
public static final String TEXT_COLOUR_PREFIX_WHITE = "\u00a7f";

1
src/main/java/com/pahimar/ee3/reference/Messages.java
View file

@ -2,6 +2,5 @@ package com.pahimar.ee3.reference;
public class Messages
{
public static final String TOOLTIP_INFUSED_WITH = "tooltip.ee3:infusedPrefix";
public static final String UPGRADES_CHESTS = "tooltip.ee3:upgradesPrefix";
}

3
src/main/java/com/pahimar/ee3/reference/Names.java
View file

@ -4,9 +4,6 @@ public class Names
{
public static class Blocks
{
public static final String INFUSED_CLOTH = "infusedCloth";
public static final String INFUSED_WOOD = "infusedWood";
public static final String INFUSED_PLANK = "infusedPlank";
public static final String ALCHEMICAL_CHEST = "alchemicalChest";
public static final String ALUDEL = "aludel";
public static final String GLASS_BELL = "glassBell";

2
src/main/java/com/pahimar/ee3/tileentity/TileEntityAlchemicalChest.java
View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.tileentity;
import com.pahimar.ee3.block.ModBlocks;
import com.pahimar.ee3.init.ModBlocks;
import com.pahimar.ee3.inventory.ContainerAlchemicalChest;
import com.pahimar.ee3.reference.Names;
import com.pahimar.ee3.reference.Sounds;

4
src/main/resources/assets/ee3/lang/en_US.lang
View file

@ -33,9 +33,6 @@ tile.ee3:calcinator.name=Calcinator
tile.ee3:chalk.name=Chalk
tile.ee3:glassBell.name=Glass Bell
tile.ee3:researchStation.name=Research Station [WIP]
tile.ee3:infusedCloth.name=Infused Cloth
tile.ee3:infusedWood.name=Infused Wood
tile.ee3:infusedPlank.name=Infused Wood Planks
# GUI localizations
container.ee3:alchemicalBag=Alchemical Bag
@ -72,5 +69,4 @@ version.ee3:final_error=Version check stopping after three unsuccessful connecti
version.ee3:mc_version_not_found=Unable to find a version of %s for %s in the remote version authority
# Tooltip localizations
tooltip.ee3:infusedPrefix=Infused with
tooltip.ee3:upgradesPrefix=Upgrades (Alchemical) Chests