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

Lots more experimental changes :)

Browse source
This commit is contained in:
pahimar 2014-01-04 18:38:42 -05:00
parent 2ad08cbdc5
commit 081730ad4b
17 changed files with 324 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.lib.ItemIds;
import com.pahimar.ee3.lib.Colours;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -9,7 +9,6 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import java.util.List;
@ -34,22 +33,52 @@ public class BlockInfusedCloth extends BlockEE
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z)
{
ItemStack dustStack = new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, MathHelper.clamp_int(blockAccess.getBlockMetadata(x, y, z), 0, Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length - 1));
return dustStack.getItem().getColorFromItemStack(dustStack, 0);
int metaData = blockAccess.getBlockMetadata(x, y, z);
if (metaData == 0)
{
return Integer.parseInt(Colours.INFUSED_CLOTH_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colours.INFUSED_CLOTH_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colours.INFUSED_CLOTH_MINIUM, 16);
}
else
{
return Integer.parseInt(Colours.PURE_WHITE, 16);
}
}
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
ItemStack dustStack = new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, MathHelper.clamp_int(metaData, 0, Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length - 1));
return dustStack.getItem().getColorFromItemStack(dustStack, metaData);
if (metaData == 0)
{
return Integer.parseInt(Colours.INFUSED_CLOTH_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colours.INFUSED_CLOTH_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colours.INFUSED_CLOTH_MINIUM, 16);
}
else
{
return Integer.parseInt(Colours.PURE_WHITE, 16);
}
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(int id, CreativeTabs creativeTab, List list)
{
for (int meta = 0; meta < Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length; ++meta)
for (int meta = 0; meta < 3; ++meta)
{
list.add(new ItemStack(id, 1, meta));
}

57
src/main/java/com/pahimar/ee3/block/BlockInfusedOre.java
View file

@ -1,57 +0,0 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.lib.ItemIds;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import java.util.List;
public class BlockInfusedOre extends BlockEE
{
public BlockInfusedOre(int id)
{
super(id, Material.iron);
this.setUnlocalizedName(Strings.INFUSED_ORE_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setStepSound(soundMetalFootstep);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
blockIcon = iconRegister.registerIcon("iron_block");
}
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z)
{
ItemStack dustStack = new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, MathHelper.clamp_int(blockAccess.getBlockMetadata(x, y, z), 0, Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length - 1));
return dustStack.getItem().getColorFromItemStack(dustStack, 0);
}
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
ItemStack dustStack = new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, MathHelper.clamp_int(metaData, 0, Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length - 1));
return dustStack.getItem().getColorFromItemStack(dustStack, metaData);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(int id, CreativeTabs creativeTab, List list)
{
for (int meta = 1; meta < Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length; ++meta)
{
list.add(new ItemStack(id, 1, meta));
}
}
}

86
src/main/java/com/pahimar/ee3/block/BlockInfusedPlanks.java Normal file
View file

@ -0,0 +1,86 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.lib.Colours;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import java.util.List;
public class BlockInfusedPlanks extends BlockEE
{
public BlockInfusedPlanks(int id)
{
super(id, Material.wood);
this.setUnlocalizedName(Strings.INFUSED_PLANKS_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setStepSound(soundWoodFootstep);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister 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(Colours.INFUSED_PLANKS_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colours.INFUSED_PLANKS_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colours.INFUSED_PLANKS_MINIUM, 16);
}
else
{
return Integer.parseInt(Colours.PURE_WHITE, 16);
}
}
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
if (metaData == 0)
{
return Integer.parseInt(Colours.INFUSED_PLANKS_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colours.INFUSED_PLANKS_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colours.INFUSED_PLANKS_MINIUM, 16);
}
else
{
return Integer.parseInt(Colours.PURE_WHITE, 16);
}
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(int id, CreativeTabs creativeTab, List list)
{
for (int meta = 0; meta < 3; ++meta)
{
list.add(new ItemStack(id, 1, meta));
}
}
}

57
src/main/java/com/pahimar/ee3/block/BlockInfusedStone.java
View file

@ -1,57 +0,0 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.lib.ItemIds;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import java.util.List;
public class BlockInfusedStone extends BlockEE
{
public BlockInfusedStone(int id)
{
super(id, Material.rock);
this.setUnlocalizedName(Strings.INFUSED_STONE_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setStepSound(soundStoneFootstep);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
blockIcon = iconRegister.registerIcon("stone");
}
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z)
{
ItemStack dustStack = new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, MathHelper.clamp_int(blockAccess.getBlockMetadata(x, y, z), 0, Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length - 1));
return dustStack.getItem().getColorFromItemStack(dustStack, 0);
}
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
ItemStack dustStack = new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, MathHelper.clamp_int(metaData, 0, Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length - 1));
return dustStack.getItem().getColorFromItemStack(dustStack, metaData);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(int id, CreativeTabs creativeTab, List list)
{
for (int meta = 1; meta < Strings.ALCHEMICAL_DUST_SUBTYPE_NAMES.length; ++meta)
{
list.add(new ItemStack(id, 1, meta));
}
}
}

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

@ -1,11 +1,25 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.lib.Colours;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import java.util.List;
public class BlockInfusedWood extends BlockEE
{
@SideOnly(Side.CLIENT)
private Icon logTop, logSide;
public BlockInfusedWood(int id)
{
super(id, Material.wood);
@ -13,4 +27,81 @@ public class BlockInfusedWood extends BlockEE
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setStepSound(soundWoodFootstep);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
logTop = iconRegister.registerIcon("log_oak_top");
logSide = iconRegister.registerIcon("log_oak");
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int metaData)
{
if (ForgeDirection.getOrientation(side) == ForgeDirection.UP || ForgeDirection.getOrientation(side) == ForgeDirection.DOWN)
{
return logTop;
}
else
{
return logSide;
}
}
@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(Colours.INFUSED_WOOD_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colours.INFUSED_WOOD_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colours.INFUSED_WOOD_MINIUM, 16);
}
else
{
return Integer.parseInt(Colours.PURE_WHITE, 16);
}
}
@SideOnly(Side.CLIENT)
public int getRenderColor(int metaData)
{
if (metaData == 0)
{
return Integer.parseInt(Colours.INFUSED_WOOD_VERDANT, 16);
}
else if (metaData == 1)
{
return Integer.parseInt(Colours.INFUSED_WOOD_AZURE, 16);
}
else if (metaData == 2)
{
return Integer.parseInt(Colours.INFUSED_WOOD_MINIUM, 16);
}
else
{
return Integer.parseInt(Colours.PURE_WHITE, 16);
}
}
@Override
@SuppressWarnings("unchecked")
@SideOnly(Side.CLIENT)
public void getSubBlocks(int id, CreativeTabs creativeTab, List list)
{
for (int meta = 0; meta < 3; ++meta)
{
list.add(new ItemStack(id, 1, meta));
}
}
}

15
src/main/java/com/pahimar/ee3/block/ModBlocks.java
View file

@ -2,8 +2,8 @@ package com.pahimar.ee3.block;
import com.pahimar.ee3.item.ItemAlchemicalFuelBlock;
import com.pahimar.ee3.item.ItemInfusedClothBlock;
import com.pahimar.ee3.item.ItemInfusedOreBlock;
import com.pahimar.ee3.item.ItemInfusedStoneBlock;
import com.pahimar.ee3.item.ItemInfusedPlanksBlock;
import com.pahimar.ee3.item.ItemInfusedWoodBlock;
import com.pahimar.ee3.lib.BlockIds;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.common.registry.GameRegistry;
@ -25,10 +25,9 @@ public class ModBlocks
public static BlockEE chalk;
public static BlockEE glassBell;
public static BlockEE researchStation;
public static BlockEE infusedStone;
public static BlockEE infusedCloth;
public static BlockEE infusedWood;
public static BlockEE infusedOre;
public static BlockEE infusedPlanks;
public static void init()
{
@ -40,10 +39,9 @@ public class ModBlocks
chalk = new BlockChalk(BlockIds.CHALK);
glassBell = new BlockGlassBell(BlockIds.GLASS_BELL);
researchStation = new BlockResearchStation((BlockIds.RESEARCH_STATION));
infusedStone = new BlockInfusedStone(BlockIds.INFUSED_STONE);
infusedWood = new BlockInfusedWood(BlockIds.INFUSED_WOOD);
infusedCloth = new BlockInfusedCloth(BlockIds.INFUSED_CLOTH);
infusedOre = new BlockInfusedOre(BlockIds.INFUSED_ORE);
infusedPlanks = new BlockInfusedPlanks(BlockIds.INFUSED_PLANKS);
GameRegistry.registerBlock(alchemicalChest, "block." + Strings.ALCHEMICAL_CHEST_NAME);
GameRegistry.registerBlock(alchemicalFuel, ItemAlchemicalFuelBlock.class, "block." + Strings.ALCHEMICAL_FUEL_NAME);
@ -54,8 +52,7 @@ public class ModBlocks
GameRegistry.registerBlock(glassBell, "block." + Strings.GLASS_BELL_NAME);
GameRegistry.registerBlock(researchStation, "block." + Strings.RESEARCH_STATION_NAME);
GameRegistry.registerBlock(infusedCloth, ItemInfusedClothBlock.class, "block." + Strings.INFUSED_CLOTH_NAME);
GameRegistry.registerBlock(infusedOre, ItemInfusedOreBlock.class, "block." + Strings.INFUSED_ORE_NAME);
GameRegistry.registerBlock(infusedStone, ItemInfusedStoneBlock.class, "block." + Strings.INFUSED_STONE_NAME);
GameRegistry.registerBlock(infusedWood, "block." + Strings.INFUSED_WOOD_NAME);
GameRegistry.registerBlock(infusedWood, ItemInfusedWoodBlock.class, "block." + Strings.INFUSED_WOOD_NAME);
GameRegistry.registerBlock(infusedPlanks, ItemInfusedPlanksBlock.class, "block." + Strings.INFUSED_PLANKS_NAME);
}
}

4
src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java
View file

@ -27,11 +27,9 @@ public class BlockConfiguration
BlockIds.ALCHEMICAL_CHEST = blockConfiguration.getBlock(Strings.ALCHEMICAL_CHEST_NAME, BlockIds.ALCHEMICAL_CHEST_DEFAULT).getInt(BlockIds.ALCHEMICAL_CHEST_DEFAULT);
BlockIds.GLASS_BELL = blockConfiguration.getBlock(Strings.GLASS_BELL_NAME, BlockIds.GLASS_BELL_DEFAULT).getInt(BlockIds.GLASS_BELL_DEFAULT);
BlockIds.RESEARCH_STATION = blockConfiguration.getBlock(Strings.RESEARCH_STATION_NAME, BlockIds.RESEARCH_STATION_DEFAULT).getInt(BlockIds.RESEARCH_STATION_DEFAULT);
BlockIds.INFUSED_CLOTH = blockConfiguration.getBlock(Strings.INFUSED_CLOTH_NAME, BlockIds.INFUSED_CLOTH_DEFAULT).getInt(BlockIds.INFUSED_CLOTH_DEFAULT);
BlockIds.INFUSED_ORE = blockConfiguration.getBlock(Strings.INFUSED_ORE_NAME, BlockIds.INFUSED_ORE_DEFAULT).getInt(BlockIds.INFUSED_ORE_DEFAULT);
BlockIds.INFUSED_STONE = blockConfiguration.getBlock(Strings.INFUSED_STONE_NAME, BlockIds.INFUSED_STONE_DEFAULT).getInt(BlockIds.INFUSED_STONE_DEFAULT);
BlockIds.INFUSED_WOOD = blockConfiguration.getBlock(Strings.INFUSED_WOOD_NAME, BlockIds.INFUSED_WOOD_DEFAULT).getInt(BlockIds.INFUSED_WOOD_DEFAULT);
BlockIds.INFUSED_PLANKS = blockConfiguration.getBlock(Strings.INFUSED_PLANKS_NAME, BlockIds.INFUSED_PLANKS_DEFAULT).getInt(BlockIds.INFUSED_PLANKS_DEFAULT);
}
catch (Exception e)
{

1
src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
View file

@ -183,7 +183,6 @@ public class EmcValuesDefault
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 1)), new EmcValue(256));
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 2)), new EmcValue(2048));
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 3)), new EmcValue(8192));
valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 4)), new EmcValue(73728));
}
public static Map<WrappedStack, EmcValue> getDefaultValueMap()

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

@ -28,13 +28,6 @@ public class ItemAlchemicalDust extends ItemEE
maxStackSize = 64;
}
// @Override
// @SideOnly(Side.CLIENT)
// public boolean requiresMultipleRenderPasses()
// {
// return true;
// }
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack itemStack, int renderPass)
@ -55,10 +48,6 @@ public class ItemAlchemicalDust extends ItemEE
{
return Integer.parseInt(Colours.DUST_MINIUM, 16);
}
else if (itemStack.getItemDamage() == 4)
{
return Integer.parseInt(Colours.DUST_SHIMMERING, 16);
}
return Integer.parseInt(Colours.PURE_WHITE, 16);
}
@ -82,7 +71,7 @@ public class ItemAlchemicalDust extends ItemEE
{
case 0:
{
return EnumChatFormatting.WHITE + super.getItemDisplayName(itemStack);
return EnumChatFormatting.GRAY + super.getItemDisplayName(itemStack);
}
case 1:
{
@ -96,10 +85,6 @@ public class ItemAlchemicalDust extends ItemEE
{
return EnumChatFormatting.RED + super.getItemDisplayName(itemStack);
}
case 4:
{
return EnumChatFormatting.GOLD + super.getItemDisplayName(itemStack);
}
default:
{
return EnumChatFormatting.WHITE + super.getItemDisplayName(itemStack);

18
src/main/java/com/pahimar/ee3/item/ItemInfusedOreBlock.java
View file

@ -1,18 +0,0 @@
package com.pahimar.ee3.item;
import net.minecraft.item.ItemBlock;
public class ItemInfusedOreBlock extends ItemBlock
{
public ItemInfusedOreBlock(int id)
{
super(id);
this.setHasSubtypes(true);
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

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

@ -0,0 +1,34 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.lib.ItemIds;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
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 ItemInfusedPlanksBlock extends ItemBlock
{
public ItemInfusedPlanksBlock(int id)
{
super(id);
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(Strings.TOOLTIP_INFUSED_WITH), new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, dustMetaData).getDisplayName()));
}
}

18
src/main/java/com/pahimar/ee3/item/ItemInfusedStoneBlock.java
View file

@ -1,18 +0,0 @@
package com.pahimar.ee3.item;
import net.minecraft.item.ItemBlock;
public class ItemInfusedStoneBlock extends ItemBlock
{
public ItemInfusedStoneBlock(int id)
{
super(id);
this.setHasSubtypes(true);
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

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

@ -0,0 +1,34 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.lib.ItemIds;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
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 ItemInfusedWoodBlock extends ItemBlock
{
public ItemInfusedWoodBlock(int id)
{
super(id);
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(Strings.TOOLTIP_INFUSED_WITH), new ItemStack(ItemIds.ALCHEMICAL_DUST, 1, dustMetaData).getDisplayName()));
}
}

6
src/main/java/com/pahimar/ee3/lib/BlockIds.java
View file

@ -18,10 +18,9 @@ public class BlockIds
public static int CHALK_DEFAULT = 2456;
public static int ALCHEMY_SQUARE_DEFAULT = 2457;
public static int RESEARCH_STATION_DEFAULT = 2458;
public static int INFUSED_STONE_DEFAULT = 2459;
public static int INFUSED_CLOTH_DEFAULT = 2460;
public static int INFUSED_WOOD_DEFAULT = 2461;
public static int INFUSED_ORE_DEFAULT = 2462;
public static int INFUSED_PLANKS_DEFAULT = 2462;
/* Current block ids */
public static int CALCINATOR;
@ -32,8 +31,7 @@ public class BlockIds
public static int CHALK;
public static int ALCHEMY_SQUARE;
public static int RESEARCH_STATION;
public static int INFUSED_STONE;
public static int INFUSED_CLOTH;
public static int INFUSED_WOOD;
public static int INFUSED_ORE;
public static int INFUSED_PLANKS;
}

20
src/main/java/com/pahimar/ee3/lib/Colours.java
View file

@ -9,16 +9,30 @@ package com.pahimar.ee3.lib;
*/
public class Colours
{
public static final String PURE_WHITE = "ffffff";
// Alchemical Dust
public static final String DUST_ASH = "A0A0A0";
public static final String DUST_VERDANT = "45CC39";
public static final String DUST_AZURE = "35A6DE";
public static final String DUST_MINIUM = "FF4545";
public static final String DUST_SHIMMERING = "FFF459";
/* Text colour related constants */
// 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";
}

8
src/main/java/com/pahimar/ee3/lib/Strings.java
View file

@ -25,6 +25,9 @@ public class Strings
public static final String FINAL_ERROR_MESSAGE = "version.ee3:final_error";
public static final String MC_VERSION_NOT_FOUND = "version.ee3:mc_version_not_found";
// Tooltip related localiation keys
public static final String TOOLTIP_INFUSED_WITH = "tooltip.ee3:infusedPrefix";
/* NBT related constants */
public static final String NBT_ITEM_CHARGE_LEVEL_KEY = "itemChargeLevel";
public static final String NBT_ITEM_MODE_KEY = "itemMode";
@ -44,10 +47,9 @@ public class Strings
public static final String GLASS_BELL_NAME = "glassBell";
public static final String ALCHEMY_SQUARE_NAME = "alchemySquare";
public static final String RESEARCH_STATION_NAME = "researchStation";
public static final String INFUSED_STONE_NAME = "infusedStone";
public static final String INFUSED_CLOTH_NAME = "infusedCloth";
public static final String INFUSED_WOOD_NAME = "infusedWood";
public static final String INFUSED_ORE_NAME = "infusedOre";
public static final String INFUSED_PLANKS_NAME = "infusedPlanks";
/* Item name constants */
public static final String MINIUM_SHARD_NAME = "shardMinium";
@ -55,7 +57,7 @@ public class Strings
public static final String MINIUM_STONE_NAME = "stoneMinium";
public static final String PHILOSOPHERS_STONE_NAME = "stonePhilosophers";
public static final String ALCHEMICAL_DUST_NAME = "alchemicalDust";
public static final String[] ALCHEMICAL_DUST_SUBTYPE_NAMES = {"ash", "verdant", "azure", "minium", "shimmering"};
public static final String[] ALCHEMICAL_DUST_SUBTYPE_NAMES = {"ash", "verdant", "azure", "minium"};
public static final String ALCHEMICAL_BAG_NAME = "alchemicalBag";
public static final String CHALK_NAME = "chalk";
public static final String DIVINING_ROD_NAME = "diviningRod";

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

@ -6,11 +6,10 @@ key.toggle=Toggle
# Item localizations
item.ee3:alchemicalBag.name=Alchemical Bag [WIP]
item.ee3:alchemicalDust.ash.name=Ash [WIP]
item.ee3:alchemicalDust.verdant.name=Verdant Dust [WIP]
item.ee3:alchemicalDust.azure.name=Azure Dust [WIP]
item.ee3:alchemicalDust.minium.name=Minium Dust [WIP]
item.ee3:alchemicalDust.shimmering.name=Shimmering Dust [WIP]
item.ee3:alchemicalDust.ash.name=Ash
item.ee3:alchemicalDust.verdant.name=Verdant Dust
item.ee3:alchemicalDust.azure.name=Azure Dust
item.ee3:alchemicalDust.minium.name=Minium Dust
item.ee3:alchemicalFuel.alchemicalCoal.name=Alchemical Coal
item.ee3:alchemicalFuel.mobiusFuel.name=Mobius Fuel
item.ee3:alchemicalFuel.aeternalisFuel.name=Aeternalis Fuel
@ -18,7 +17,7 @@ item.ee3:chalk.name=Chalk [WIP]
item.ee3:diviningRod.name=Divining Rod [WIP]
item.ee3:shardMinium.name=Shard of Minium
item.ee3:stoneInert.name=Inert Stone
item.ee3:stoneMinium.name=Minium Stone
item.ee3:stoneMinium.name=Minium Stone [WIP]
item.ee3:stonePhilosophers.name=Philosopher's Stone [WIP]
# Block localizations
@ -32,9 +31,8 @@ tile.ee3:chalk.name=Chalk
tile.ee3:glassBell.name=Glass Bell [WIP]
tile.ee3:researchStation.name=Research Station [WIP]
tile.ee3:infusedCloth.name=Infused Cloth [WIP]
tile.ee3:infusedOre.name=Infused Ore [WIP]
tile.ee3:infusedStone.name=Infused Stone [WIP]
tile.ee3:infusedWood.name=Infused Wood [WIP]
tile.ee3:infusedWood.name=Infused Wood
tile.ee3:infusedPlanks.name=Infused Wood Planks
# GUI localizations
container.ee3:alchemicalBag=Alchemical Bag [WIP]
@ -68,4 +66,7 @@ version.ee3:current=Currently using the most up to date version (%s) of Equivale
version.ee3:outdated=A new %s version exists (%s) for %s. Get it here: %s
version.ee3:general_error=Error while connecting to remote version authority file; trying again
version.ee3:final_error=Version check stopping after three unsuccessful connection attempts
version.ee3:mc_version_not_found=Unable to find a version of %s for %s in the remote version authority
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