diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml index 84c75bc2..3bd9bd27 100644 --- a/assets/tinker/lang/en_US.xml +++ b/assets/tinker/lang/en_US.xml @@ -173,6 +173,8 @@ ======= >>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml + Essence Crystal + Smeltery Controller Smeltery Drain Seared Bricks @@ -201,12 +203,16 @@ Spruce Barricade Birch Barricade Jungle Barricade +<<<<<<< HEAD:assets/tinker/lang/en_US.xml <<<<<<< HEAD:assets/tinker/lang/en_US.xml Essence Extractor ======= >>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml ======= >>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml +======= + Essence Extractor +>>>>>>> Added early essence extractor, liquid ender, updated lang files:mods/tinker/resources/lang/en_US.xml Block of Cobalt Block of Ardite @@ -336,6 +342,7 @@ Bowstring Enchanted Bowstring +<<<<<<< HEAD:assets/tinker/lang/en_US.xml Molten Iron Molten Gold Molten Copper @@ -360,6 +367,32 @@ Molten Invar Molten Electrum Liquified Ender +======= + Molten Iron + Molten Gold + Molten Copper + Liquid Tin + Molten Aluminum + Molten Cobalt + Molten Ardite + Molten Bronze + Molten Aluminum Brass + Molten Manyullyn + Molten Alumite + Molten Obsidian + Molten Steel + Molten Glass + Seared Stone + Liquified Emerald + Blood + Molten Nickel + Molten Silver + Molten Lead + Molten Shiny + Molten Invar + Molten Electrum + Liquified Ender +>>>>>>> Added early essence extractor, liquid ender, updated lang files:mods/tinker/resources/lang/en_US.xml Jeweled Apple Gelatinous Slime diff --git a/assets/tinker/manuals/smeltery.xml b/assets/tinker/manuals/smeltery.xml index 6a6f9cc6..75011e28 100644 --- a/assets/tinker/manuals/smeltery.xml +++ b/assets/tinker/manuals/smeltery.xml @@ -240,6 +240,11 @@ Part casts must be created by pouring metal around existing parts, like a pickax searedstone + +Endstone +endstone + + Drawbridge diff --git a/mods/tinker/textures/blocks/compressed_ender.png b/mods/tinker/textures/blocks/compressed_ender.png new file mode 100644 index 00000000..b7e9bbbc Binary files /dev/null and b/mods/tinker/textures/blocks/compressed_ender.png differ diff --git a/mods/tinker/textures/blocks/extractor_bottom.png b/mods/tinker/textures/blocks/extractor_bottom.png new file mode 100644 index 00000000..a7755c87 Binary files /dev/null and b/mods/tinker/textures/blocks/extractor_bottom.png differ diff --git a/mods/tinker/textures/blocks/extractor_side.png b/mods/tinker/textures/blocks/extractor_side.png new file mode 100644 index 00000000..b9f52414 Binary files /dev/null and b/mods/tinker/textures/blocks/extractor_side.png differ diff --git a/mods/tinker/textures/blocks/extractor_top.png b/mods/tinker/textures/blocks/extractor_top.png new file mode 100644 index 00000000..1eaf2fa1 Binary files /dev/null and b/mods/tinker/textures/blocks/extractor_top.png differ diff --git a/mods/tinker/textures/blocks/liquid_ender.png b/mods/tinker/textures/blocks/liquid_ender.png new file mode 100644 index 00000000..bbc90b39 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_ender.png differ diff --git a/mods/tinker/textures/blocks/liquid_ender.txt b/mods/tinker/textures/blocks/liquid_ender.txt new file mode 100644 index 00000000..d8fe765a --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_ender.txt @@ -0,0 +1,32 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +20*2 +21*2 +22*2 +23*2 +24*2 +25*2 +26*2 +27*2 +28*2 +29*2 +30*2 +31*2 diff --git a/mods/tinker/textures/blocks/liquid_ender_flow.png b/mods/tinker/textures/blocks/liquid_ender_flow.png new file mode 100644 index 00000000..2612655c Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_ender_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_ender_flow.txt b/mods/tinker/textures/blocks/liquid_ender_flow.txt new file mode 100644 index 00000000..e69de29b diff --git a/mods/tinker/textures/items/materials/bucket_electrum.png b/mods/tinker/textures/items/materials/bucket_electrum.png new file mode 100644 index 00000000..00d1819d Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_electrum.png differ diff --git a/mods/tinker/textures/items/materials/bucket_ender.png b/mods/tinker/textures/items/materials/bucket_ender.png new file mode 100644 index 00000000..d957a2c2 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_ender.png differ diff --git a/mods/tinker/textures/items/materials/bucket_invar.png b/mods/tinker/textures/items/materials/bucket_invar.png new file mode 100644 index 00000000..c8e0f24b Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_invar.png differ diff --git a/mods/tinker/textures/items/materials/bucket_lead.png b/mods/tinker/textures/items/materials/bucket_lead.png new file mode 100644 index 00000000..164cc3ba Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_lead.png differ diff --git a/mods/tinker/textures/items/materials/bucket_nickel.png b/mods/tinker/textures/items/materials/bucket_nickel.png new file mode 100644 index 00000000..ff248756 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_nickel.png differ diff --git a/mods/tinker/textures/items/materials/bucket_shiny.png b/mods/tinker/textures/items/materials/bucket_shiny.png new file mode 100644 index 00000000..b2082441 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_shiny.png differ diff --git a/mods/tinker/textures/items/materials/bucket_silver.png b/mods/tinker/textures/items/materials/bucket_silver.png new file mode 100644 index 00000000..c8e81d96 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_silver.png differ diff --git a/tconstruct/blocks/logic/SmelteryLogic.java b/tconstruct/blocks/logic/SmelteryLogic.java index d143c31b..164ebf69 100644 --- a/tconstruct/blocks/logic/SmelteryLogic.java +++ b/tconstruct/blocks/logic/SmelteryLogic.java @@ -19,6 +19,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -317,6 +318,17 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } } + else if (o instanceof EntityEnderman) + { + EntityEnderman villager = (EntityEnderman) o; + if (villager.attackEntityFrom(new SmelteryDamageSource(), 1)) + { + if (currentLiquid + 25 < maxLiquid) + { + this.addMoltenMetal(new FluidStack(TContent.moltenEnder.blockID, 25), false); + } + } + } else if (o instanceof EntityLiving) { EntityLiving living = (EntityLiving) o; diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java index d7b21faf..5540ba67 100644 --- a/tconstruct/client/TProxyClient.java +++ b/tconstruct/client/TProxyClient.java @@ -673,6 +673,7 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel)); TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null); TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null); + TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian)); } diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index c2e4effe..7ece1c94 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -14,10 +14,7 @@ import net.minecraft.block.material.MaterialLiquid; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.RecipesTools; -import net.minecraft.item.crafting.RecipesWeapons; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; @@ -121,10 +118,8 @@ import tconstruct.items.TitleIcon; import tconstruct.items.ToolPart; import tconstruct.items.ToolPartHidden; import tconstruct.items.ToolShard; -import tconstruct.items.armor.Glove; import tconstruct.items.armor.HeartCanister; import tconstruct.items.armor.Knapsack; -import tconstruct.items.armor.TArmorBase; import tconstruct.items.blocks.BarricadeItem; import tconstruct.items.blocks.CraftedSoilItemBlock; import tconstruct.items.blocks.CraftingSlabItemBlock; @@ -596,6 +591,10 @@ public class TContent implements IFuelHandler GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge"); GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter"); + essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence"); + GameRegistry.registerBlock(essenceExtractor, "extractor.essence"); + GameRegistry.registerTileEntity(EssenceExtractorLogic.class, "extractor.essence"); + //Traps landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("landmine"); GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine"); @@ -1069,9 +1068,12 @@ public class TContent implements IFuelHandler //Wearables //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister"); - heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); - glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); + //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); + //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); + + //Crystalline + essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); @@ -1883,6 +1885,8 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 12)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 13)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE)); + + GameRegistry.addRecipe(new ItemStack(essenceExtractor, 1, 0), " b ", "eme", "mmm", 'b', Item.book, 'e', Item.emerald, 'm', Block.whiteStone); } void setupToolTabs () @@ -1986,6 +1990,7 @@ public class TContent implements IFuelHandler "blueslime" }; for (int i = 0; i < matNames.length; i++) OreDictionary.registerOre(matNames[i] + "Rod", new ItemStack(toolRod, 1, i)); + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; for (int i = 0; i < 16; i++) diff --git a/tconstruct/items/CraftingItem.java b/tconstruct/items/CraftingItem.java index 3e2e32c2..09ad26d8 100644 --- a/tconstruct/items/CraftingItem.java +++ b/tconstruct/items/CraftingItem.java @@ -39,8 +39,8 @@ public class CraftingItem extends Item return icons[arr]; } - @SideOnly(Side.CLIENT) @Override + @SideOnly(Side.CLIENT) public void registerIcons (IconRegister iconRegister) { this.icons = new Icon[textureNames.length]; diff --git a/tconstruct/items/MaterialItem.java b/tconstruct/items/MaterialItem.java index ecc1c49e..3b0fbb48 100644 --- a/tconstruct/items/MaterialItem.java +++ b/tconstruct/items/MaterialItem.java @@ -1,5 +1,6 @@ package tconstruct.items; + public class MaterialItem extends CraftingItem { @@ -26,4 +27,21 @@ public class MaterialItem extends CraftingItem "nugget_copper", "nugget_tin", "nugget_aluminum", "essencecrystal", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", "nugget_bronze", "nugget_alumite", "nugget_steel" }; + /*@Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + if (stack.getItemDamage() == 23) + { + if (stack.hasTagCompound()) + { + int amount = stack.getTagCompound().getInteger("Essence"); + list.add("Stored Levels: " + EssenceExtractorLogic.getEssencelevels(amount)); + } + else + { + list.add("Stored Levels: 0"); + } + } + }*/ } diff --git a/tconstruct/items/blocks/MetalItemBlock.java b/tconstruct/items/blocks/MetalItemBlock.java index d93e89b6..6960a314 100644 --- a/tconstruct/items/blocks/MetalItemBlock.java +++ b/tconstruct/items/blocks/MetalItemBlock.java @@ -9,7 +9,7 @@ import net.minecraft.util.MathHelper; public class MetalItemBlock extends ItemBlock { - public static final String blockType[] = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel" }; + public static final String blockType[] = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel", "Ender" }; public MetalItemBlock(int id) {