diff options
4 files changed, 44 insertions, 8 deletions
diff --git a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java index acef5d8..4be694b 100644 --- a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java +++ b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java @@ -376,10 +376,10 @@ public class TDMaterials TinkerRegistry.addMaterialStats(this.yellow, new ClothMaterialStats(100, 10)); TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ShieldMaterialStats(35, 33)); - TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new HelmMaterialStats(35, 0, 0)); - TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ChestMaterialStats(35, 0, 0)); - TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new LegsMaterialStats(35, 0, 0)); - TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new BootsMaterialStats(35, 0, 0)); + TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new HelmMaterialStats(35, 2, 0)); + TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ChestMaterialStats(35, 5, 0)); + TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new LegsMaterialStats(35, 3, 0)); + TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new BootsMaterialStats(35, 1, 0)); // TinkerMaterials.wood.addTrait(axelover, SHIELD); TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new ShieldMaterialStats(120, 33)); diff --git a/src/main/java/lance5057/tDefense/core/tools/TDTools.java b/src/main/java/lance5057/tDefense/core/tools/TDTools.java index 89476f2..0ab7a4d 100644 --- a/src/main/java/lance5057/tDefense/core/tools/TDTools.java +++ b/src/main/java/lance5057/tDefense/core/tools/TDTools.java @@ -212,10 +212,10 @@ public class TDTools { TinkerRegistry.registerToolCrafting(boots); - TinkerRegistry.registerToolCrafting(helm); - TinkerRegistry.registerToolCrafting(breastplate); - TinkerRegistry.registerToolCrafting(grieves); - TinkerRegistry.registerToolCrafting(sabatons); + TinkerRegistry.registerToolForgeCrafting(helm); + TinkerRegistry.registerToolForgeCrafting(breastplate); + TinkerRegistry.registerToolForgeCrafting(grieves); + TinkerRegistry.registerToolForgeCrafting(sabatons); TinkerRegistry.registerToolCrafting(sheathe); TinkerRegistry.registerToolCrafting(ring); diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/shaders/ArmorShader.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/shaders/ArmorShader.java index 90638a5..de1e004 100644 --- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/shaders/ArmorShader.java +++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/shaders/ArmorShader.java @@ -56,6 +56,10 @@ public class ArmorShader metalTexture(r1,r1, ((MaterialRenderInfo.MetalTextured) info).color); else if(info instanceof MaterialRenderInfo.Metal) colorize(r1, ((MaterialRenderInfo.Metal) info).color); + else if(info instanceof MaterialRenderInfo.MultiColor) + colorize(r1, ((MaterialRenderInfo.MultiColor) info).getVertexColor()); + else if(info instanceof MaterialRenderInfo.InverseMultiColor) + colorize(r1, ((MaterialRenderInfo.InverseMultiColor) info).getVertexColor()); else colorize(r1, ((MaterialRenderInfo.Default) info).color); diff --git a/src/main/java/lance5057/tDefense/util/TDMatHelper.java b/src/main/java/lance5057/tDefense/util/TDMatHelper.java index 21fd555..ca44320 100644 --- a/src/main/java/lance5057/tDefense/util/TDMatHelper.java +++ b/src/main/java/lance5057/tDefense/util/TDMatHelper.java @@ -2,6 +2,10 @@ package lance5057.tDefense.util; import javax.annotation.Nullable; +import lance5057.tDefense.core.materials.BootsMaterialStats; +import lance5057.tDefense.core.materials.ChestMaterialStats; +import lance5057.tDefense.core.materials.HelmMaterialStats; +import lance5057.tDefense.core.materials.LegsMaterialStats; import lance5057.tDefense.core.materials.ShieldMaterialStats; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,6 +34,10 @@ public class TDMatHelper public BowStringMaterialStats bowstring; public HandleMaterialStats handle; public ArrowShaftMaterialStats shaft; + public HelmMaterialStats helm; + public ChestMaterialStats chest; + public LegsMaterialStats legs; + public BootsMaterialStats boots; public ItemStack gem; public ItemStack ingot; @@ -124,6 +132,30 @@ public class TDMatHelper shaft = h; return this; } + + public TDMatHelper setHelm(HelmMaterialStats h) + { + helm = h; + return this; + } + + public TDMatHelper setChest(ChestMaterialStats h) + { + chest = h; + return this; + } + + public TDMatHelper setLegs(LegsMaterialStats h) + { + legs = h; + return this; + } + + public TDMatHelper setBoots(BootsMaterialStats h) + { + boots = h; + return this; + } public TDMatHelper setGem(Item i) { |