Skip to content

Commit

Permalink
Boot update
Browse files Browse the repository at this point in the history
Behold - the thaumium and void upgraded Boots of the Traveller.
  • Loading branch information
KryptonCaptain committed Mar 21, 2017
2 parents 475587d + f701596 commit a6b7a92
Show file tree
Hide file tree
Showing 39 changed files with 363 additions and 27 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#Sat Sep 26 08:25:20 EDT 2015
version=1.5.1
version=1.6.0
dir_output=../Build Output/TD/
mc_version=1.7.10
forge_version=10.13.4.1614
Expand Down
71 changes: 63 additions & 8 deletions src/main/java/thaumicdyes/common/DyeResearch.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ public static void addResearch() {
//Copy research nodes
copy(ResearchCategories.getResearchList("ARTIFICE").research.get("ARMORFORTRESS"),"TD.ARMORFORTRESS","DYES",5,-3).setConcealed().setHidden().registerResearchItem();
//copy(ResearchCategories.getResearchList("ELDRITCH").research.get("VOIDMETAL"),"TD.VOIDMETAL","DYES",0,-1).setConcealed().setHidden().registerResearchItem();
copy(ResearchCategories.getResearchList("ELDRITCH").research.get("ENTEROUTER"),"TD.OUTERARRIVAL","DYES",-4,2).setConcealed().setHidden().registerResearchItem();
copy(ResearchCategories.getResearchList("ELDRITCH").research.get("ENTEROUTER"),"TD.OUTERARRIVAL","DYES",-3,4).setConcealed().setHidden().registerResearchItem();
copy(ResearchCategories.getResearchList("ALCHEMY").research.get("THAUMIUM"),"TD.THAUMIUM","DYES",0,-2).setConcealed().setHidden().registerResearchItem();
copy(ResearchCategories.getResearchList("ELDRITCH").research.get("ARMORVOIDFORTRESS"),"TD.VOIDFORTRESS","DYES",-2,4).setConcealed().setHidden().registerResearchItem();
copy(ResearchCategories.getResearchList("ELDRITCH").research.get("ARMORVOIDFORTRESS"),"TD.VOIDFORTRESS","DYES",0,4).setConcealed().setHidden().registerResearchItem();



//TODO Crimson Robes
Expand Down Expand Up @@ -230,7 +231,7 @@ public static void addResearch() {

new ResearchItem("TD.INHABITEDPLATE", "DYES",
(new AspectList()).add(Aspect.ENTROPY, 4).add(Aspect.EXCHANGE, 4).add(Aspect.ELDRITCH, 4),
-2, 1, 2,
-4, 2, 2,
new ItemStack(ItemHandler.itemHelmetInhabitedPlate, 0))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.husk.1"),
Expand Down Expand Up @@ -376,7 +377,7 @@ public static void addResearch() {

new ResearchItem("TD.IRONFORTRESS", "DYES",
(new AspectList()).add(Aspect.ARMOR, 5).add(Aspect.METAL, 5).add(Aspect.CRAFT, 5),
4, 0, 2,
5, -1, 2,
new ItemStack(ItemHandler.itemHelmetIronFortress, 0))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.ironFortress.1"),
Expand Down Expand Up @@ -415,7 +416,7 @@ public static void addResearch() {

new ResearchItem("TD.IRONHELMGOGGLES", "DYES",
new AspectList().add(Aspect.SENSES, 5).add(Aspect.AURA, 3).add(Aspect.ARMOR, 3),
2, 0, 2,
7, -1, 2,
ItemApi.getItem("itemGoggles", 0))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.ironHelmGoggles.1"),
Expand All @@ -427,7 +428,7 @@ public static void addResearch() {

new ResearchItem("TD.IRONHELMAESTHETICS", "DYES",
new AspectList().add(Aspect.CRAFT, 5).add(Aspect.ARMOR, 3),
2, 1, 2,
7, 0, 2,
ItemApi.getItem("itemHelmetCultistPlate", 0))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.ironHelmFace.1"),
Expand All @@ -449,7 +450,7 @@ public static void addResearch() {

new ResearchItem("TD.IRONHELMHUSK", "DYES",
new AspectList().add(Aspect.CRAFT, 5).add(Aspect.ARMOR, 3).add(Aspect.ELDRITCH, 2),
3, 2, 2,
6, 1, 2,
new ResourceLocation("thaumicdyes:textures/items/icon/shinyhuskplatehelm.png"))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.ironHelmFace.2"),
Expand Down Expand Up @@ -480,7 +481,7 @@ public static void addResearch() {

new ResearchItem("TD.VOIDROBE", "DYES",
(new AspectList()).add(Aspect.ARMOR, 5).add(Aspect.METAL, 5).add(Aspect.CRAFT, 5),
0, 3, 2,
2, 4, 2,
new ItemStack(ItemHandler.itemChestVoidRobe, 0))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.voidrobe.1"),
Expand Down Expand Up @@ -544,6 +545,60 @@ public static void addResearch() {
.setParents("TD.THAUMIUM", "GOGGLES", "ENCHFABRIC")
.registerResearchItem();

//TODO boots

copy(ResearchCategories.getResearchList("ARTIFICE").research.get("BOOTSTRAVELLER"),"TD.BOOTSTRAVELLER","DYES",-1,1).setConcealed().setHidden().registerResearchItem();
//Thaumium

InfusionRecipe recipeThaumBoots = ThaumcraftApi.addInfusionCraftingRecipe("TD.THAUMIUMBOOTS",
new ItemStack(ItemHandler.itemBootsThaumiumTraveller), 4,
new AspectList().add(Aspect.METAL, 16).add(Aspect.ARMOR, 16).add(Aspect.CLOTH, 16).add(Aspect.MAGIC, 16).add(Aspect.TRAVEL, 8),
ItemApi.getItem("itemBootsTraveller", 0),
new ItemStack[] {
new ItemStack(Items.leather),
new ItemStack(ConfigItems.itemResource, 1, 2),
new ItemStack(ConfigItems.itemResource, 1, 2),
new ItemStack(ConfigItems.itemResource, 1, 14),
new ItemStack(ConfigItems.itemResource, 1, 7),
new ItemStack(ConfigItems.itemResource, 1, 7)});


new ResearchItem("TD.THAUMIUMBOOTS", "DYES",
(new AspectList()).add(Aspect.ARMOR, 5).add(Aspect.CLOTH, 5).add(Aspect.TRAVEL, 5),
1, 0, 2,
new ItemStack(ItemHandler.itemBootsThaumiumTraveller, 0))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.thaumboots.1"),
new ResearchPage(recipeThaumBoots)})
.setParents("TD.THAUMIUM", "TD.BOOTSTRAVELLER")
.registerResearchItem();

//Void

InfusionRecipe recipeVoidBoots = ThaumcraftApi.addInfusionCraftingRecipe("TD.VOIDBOOTS",
new ItemStack(ItemHandler.itemBootsVoidTraveller), 4,
new AspectList().add(Aspect.METAL, 16).add(Aspect.ARMOR, 16).add(Aspect.CLOTH, 16).add(Aspect.MAGIC, 16).add(Aspect.TRAVEL, 8).add(Aspect.ELDRITCH, 16).add(Aspect.VOID, 8),
ItemApi.getItem("itemBootsTraveller", 0),
new ItemStack[] {
new ItemStack(Items.leather),
new ItemStack(ConfigItems.itemResource, 1, 16),
new ItemStack(ConfigItems.itemResource, 1, 2),
new ItemStack(ConfigItems.itemResource, 1, 14),
new ItemStack(ConfigItems.itemResource, 1, 7),
new ItemStack(ConfigItems.itemResource, 1, 7)});


new ResearchItem("TD.VOIDBOOTS", "DYES",
(new AspectList()).add(Aspect.ARMOR, 5).add(Aspect.CLOTH, 5).add(Aspect.TRAVEL, 5).add(Aspect.ELDRITCH, 5),
1, 2, 2,
new ItemStack(ItemHandler.itemBootsVoidTraveller, 0))
.setPages(new ResearchPage[]{
new ResearchPage("tc.research_page.TD.voidboots.1"),
new ResearchPage(recipeVoidBoots)})
.setParents("TD.VOIDFORTRESS", "TD.BOOTSTRAVELLER")
.registerResearchItem();


}


Expand Down
2 changes: 1 addition & 1 deletion src/main/java/thaumicdyes/common/items/CultistRobes.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void registerIcons(IIconRegister ir) {
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return type == null?"thaumicdyes:textures/models/armor/robe_armor_overlay.png":"thaumicdyes:textures/models/armor/crim_robe_armor.png";
return type == null?"thaumicdyes:textures/models/robe_armor_overlay.png":"thaumicdyes:textures/models/crim_robe_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/thaumicdyes/common/items/FortressArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void registerIcons(IIconRegister ir) {
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return type == null?"thaumicdyes:textures/models/armor/fortress_armor_overlay.png":"thaumicdyes:textures/models/armor/fortress_armor.png";
return type == null?"thaumicdyes:textures/models/fortress_armor_overlay.png":"thaumicdyes:textures/models/fortress_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void registerIcons(IIconRegister ir) {

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
return "thaumicdyes:textures/models/armor/zombie_plate_armor.png";
return "thaumicdyes:textures/models/zombie_plate_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack) {
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/thaumicdyes/common/items/IronFortressArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ public void registerIcons(IIconRegister ir)
this.iconLegs = ir.registerIcon("thaumicdyes:icon/ironfortresslegs");
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
return "thaumicdyes:textures/models/iron_fortress_armor.png";
}

@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int par1)
{
Expand Down Expand Up @@ -106,10 +111,6 @@ public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemSta
return this.model;
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
return "thaumicdyes:textures/models/armor/iron_fortress_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack)
{
Expand Down
14 changes: 12 additions & 2 deletions src/main/java/thaumicdyes/common/items/ItemHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ public class ItemHandler {
public static Item itemHelmetThaumiumRobe;
public static Item itemChestThaumiumRobe;
public static Item itemLegsThaumiumRobe;

public static Item itemBootsThaumiumTraveller;
public static Item itemBootsVoidTraveller;


public static void registerItems() {
Expand Down Expand Up @@ -96,6 +99,10 @@ public static void registerItems() {
GameRegistry.registerItem(itemChestThaumiumRobe, "ThaumiumRobeChest");
GameRegistry.registerItem(itemLegsThaumiumRobe, "ThaumiumRobeLegs");

GameRegistry.registerItem(itemBootsThaumiumTraveller, "BootsThaumiumTraveller");
GameRegistry.registerItem(itemBootsVoidTraveller, "BootsVoidTraveller");


}

public static void defineItems() {
Expand Down Expand Up @@ -131,11 +138,14 @@ public static void defineItems() {
itemHelmetVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 0)).setUnlocalizedName("VoidRobeHelm").setCreativeTab(TabTD.TabTD);
itemChestVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 1)).setUnlocalizedName("VoidRobeChest").setCreativeTab(TabTD.TabTD);
itemLegsVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 2)).setUnlocalizedName("VoidRobeLegs").setCreativeTab(TabTD.TabTD);

//boot
itemBootsVoidTraveller = (new VoidBoots(ThaumcraftApi.armorMatVoid, 4, 3)).setUnlocalizedName("VoidTrvlBoots").setCreativeTab(TabTD.TabTD);

itemHelmetThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 0)).setUnlocalizedName("ThaumiumRobeHelm").setCreativeTab(TabTD.TabTD);
itemChestThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 1)).setUnlocalizedName("ThaumiumRobeChest").setCreativeTab(TabTD.TabTD);
itemLegsThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 2)).setUnlocalizedName("ThaumiumRobeLegs").setCreativeTab(TabTD.TabTD);

//boot
itemBootsThaumiumTraveller = (new ThaumiumBoots(ThaumcraftApi.armorMatThaumium, 4, 3)).setUnlocalizedName("ThaumiumTrvlBoots").setCreativeTab(TabTD.TabTD);

}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/thaumicdyes/common/items/KnightArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void registerIcons(IIconRegister ir) {
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return type == null?"thaumicdyes:textures/models/armor/cultist_plate_armor_overlay.png":"thaumicdyes:textures/models/armor/cultist_plate_armor.png";
return type == null?"thaumicdyes:textures/models/cultist_plate_armor_overlay.png":"thaumicdyes:textures/models/cultist_plate_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/thaumicdyes/common/items/PraetorArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void registerIcons(IIconRegister ir) {
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return type == null?"thaumicdyes:textures/models/armor/praetor_armor_overlay.png":"thaumicdyes:textures/models/armor/praetor_armor.png";
return type == null?"thaumicdyes:textures/models/praetor_armor_overlay.png":"thaumicdyes:textures/models/praetor_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/thaumicdyes/common/items/RangerArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void registerIcons(IIconRegister ir) {
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return type == null?"thaumicdyes:textures/models/armor/ranger_armor_overlay.png":"thaumicdyes:textures/models/armor/ranger_armor.png";
return type == null?"thaumicdyes:textures/models/ranger_armor_overlay.png":"thaumicdyes:textures/models/ranger_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack) {
Expand Down
117 changes: 117 additions & 0 deletions src/main/java/thaumicdyes/common/items/ThaumiumBoots.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
package thaumicdyes.common.items;

import java.util.List;

import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingEvent;
import thaumcraft.api.IRepairable;
import thaumcraft.api.IRunicArmor;
import thaumcraft.api.IVisDiscountGear;
import thaumcraft.api.ItemApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.common.Thaumcraft;
import thaumcraft.common.items.armor.Hover;
import thaumcraft.common.items.armor.ItemBootsTraveller;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ThaumiumBoots extends ItemBootsTraveller implements IRepairable, IVisDiscountGear, IRunicArmor {

//public IIcon iconBoot;

public ThaumiumBoots(ArmorMaterial enumarmormaterial, int j, int k) {
super(enumarmormaterial, j, k);
this.setCreativeTab(CreativeTabs.tabCombat);
MinecraftForge.EVENT_BUS.register(this);
}

@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ir)
{
this.icon = ir.registerIcon("thaumicdyes:bootsThaumiumTrv");
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
return "thaumicdyes:textures/models/bootsThaumiumTrv.png";
}

public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 2))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
}

public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
{
return 2;
}

public int getRunicCharge(ItemStack itemstack)
{
return 0;
}

public EnumRarity getRarity(ItemStack itemstack)
{
return EnumRarity.rare;
}

public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + ": " + this.getVisDiscount(stack, player, (Aspect)null) + "%");
super.addInformation(stack, player, list, par4);
}

public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
{
if ((!player.capabilities.isFlying) && (player.moveForward > 0.0F))
{
if ((player.worldObj.isRemote) && (!player.isSneaking()))
{
if (!Thaumcraft.instance.entityEventHandler.prevStep.containsKey(Integer.valueOf(player.getEntityId()))) {
Thaumcraft.instance.entityEventHandler.prevStep.put(Integer.valueOf(player.getEntityId()), Float.valueOf(player.stepHeight));
}
player.stepHeight = 1.0F;
}
if (player.onGround)
{
float bonus = 0.085F;
if (player.isInWater()) {
bonus /= 3.0F;
}
player.moveFlying(0.0F, 1.0F, bonus);
}
else if (Hover.getHover(player.getEntityId()))
{
player.jumpMovementFactor = 0.03F;
}
else
{
player.jumpMovementFactor = 0.05F;
}
}
if (player.fallDistance > 0.0F) {
player.fallDistance -= 0.35F;
}
}

@SubscribeEvent
public void playerJumps(LivingEvent.LivingJumpEvent event)
{
if (((event.entity instanceof EntityPlayer)) && (((EntityPlayer)event.entity).inventory.armorItemInSlot(0) != null) && (((EntityPlayer)event.entity).inventory.armorItemInSlot(0).getItem() == ItemHandler.itemBootsThaumiumTraveller)) {
event.entityLiving.motionY += 0.2750000059604645D;
}
}

}
4 changes: 2 additions & 2 deletions src/main/java/thaumicdyes/common/items/ThaumiumRobeArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public void registerIcons(IIconRegister ir) {
}

public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return type == null?"thaumicdyes:textures/models/armor/thaumium_robe_armor_overlay.png":"thaumicdyes:textures/models/armor/thaumium_robe_armor.png";
return type == null?"thaumicdyes:textures/models/thaumium_robe_armor_overlay.png":"thaumicdyes:textures/models/thaumium_robe_armor.png";
}

public EnumRarity getRarity(ItemStack itemstack) {
return EnumRarity.uncommon;
return EnumRarity.rare;
}

public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
Expand Down
Loading

0 comments on commit a6b7a92

Please sign in to comment.