From eb14cc5256aa3f44f09c4c9367884c8ead20f69c Mon Sep 17 00:00:00 2001 From: Artem226 Date: Thu, 24 Mar 2016 11:20:14 +0300 Subject: [PATCH] Thauminite golems Thauminite golems, gears and plates --- java/tb/common/item/TBResource.java | 4 +++- java/tb/init/TBItems.java | 16 +++++++++++++++- java/tb/init/TBThaumonomicon.java | 7 +++++++ java/tb/utils/TBConfig.java | 3 +++ resources/assets/thaumicbases/lang/en_US.lang | 8 +++++++- resources/assets/thaumicbases/lang/ru_RU.lang | 8 +++++++- .../textures/entity/golem/mat_thauminite.png | Bin 0 -> 5550 bytes .../textures/items/thauminite/gear.png | Bin 0 -> 683 bytes .../textures/items/thauminite/plate.png | Bin 0 -> 557 bytes 9 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 resources/assets/thaumicbases/textures/entity/golem/mat_thauminite.png create mode 100644 resources/assets/thaumicbases/textures/items/thauminite/gear.png create mode 100644 resources/assets/thaumicbases/textures/items/thauminite/plate.png diff --git a/java/tb/common/item/TBResource.java b/java/tb/common/item/TBResource.java index f9f7a26..e282675 100644 --- a/java/tb/common/item/TBResource.java +++ b/java/tb/common/item/TBResource.java @@ -28,7 +28,9 @@ public TBResource() "aurelia_petal", "briar_seedbag", "tobacco_leaves", - "bloodycloth" + "bloodycloth", + "thauminite/gear", + "thauminite/plate" }; public static Icon[] icons = new Icon[names.length]; diff --git a/java/tb/init/TBItems.java b/java/tb/init/TBItems.java index c309bb2..751cc99 100644 --- a/java/tb/init/TBItems.java +++ b/java/tb/init/TBItems.java @@ -1,5 +1,7 @@ package tb.init; +import java.awt.Color; + import DummyCore.Items.ItemRegistry; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -34,6 +36,9 @@ import tb.common.item.TBResource; import tb.common.item.TBTobacco; import tb.core.TBCore; +import tb.utils.TBConfig; +import thaumcraft.api.golems.EnumGolemTrait; +import thaumcraft.api.golems.parts.GolemMaterial; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; import thaumcraft.common.items.wands.WandRodPrimalOnUpdate; @@ -98,8 +103,14 @@ public static void setup() WAND_CAP_THAUMINITE = new WandCap("thauminite",0.85F,1,new ItemStack(resource,1,2),6,new ResourceLocation("thaumicbases","items/thauminite/wand_cap_thauminite_uv")); WAND_ROD_THAUMIUM = new WandRod("tbthaumium", 450, new ItemStack(resource,1,3), 6, new WandRodPrimalOnUpdate(), new ResourceLocation("thaumicbases","items/wand_rod_thaumium_uv")); WAND_ROD_VOID = new WandRod("tbvoid", 750, new ItemStack(resource,1,4), 16, new WandRodPrimalOnUpdate(), new ResourceLocation("thaumicbases","items/wand_rod_void_uv")); - + + if(TBConfig.enableTBGolemMaterials) + { + GolemMaterial.register(thauminiteGolemMaterial); + } + } + public static ToolMaterial thauminite = EnumHelper.addToolMaterial("THAUMINITE", 3, 974, 7F, 2.8F, 15); public static ArmorMaterial thauminiteA = EnumHelper.addArmorMaterial("ATHAUMINITE", "thaumicbases:textures/items/armor/thauminite/thauminite", 27, new int[]{3, 8, 6, 3}, 17); @@ -161,5 +172,8 @@ public static void setup() public static WandRod WAND_ROD_VOID; + public static GolemMaterial thauminiteGolemMaterial = new GolemMaterial("THAUMINITE", new String[]{"TB.Thauminite"}, new ResourceLocation("thaumicbases","textures/entity/golem/mat_thauminite.png"), new Color(75,101,220).getRGB(), 26, 12, 5, new ItemStack(resource,1,10), new ItemStack(resource,1,9), new EnumGolemTrait[]{EnumGolemTrait.BLASTPROOF, EnumGolemTrait.FIREPROOF, EnumGolemTrait.LIGHT}); + + public static final Class core = TBCore.class; } diff --git a/java/tb/init/TBThaumonomicon.java b/java/tb/init/TBThaumonomicon.java index 9afbd01..b0b1c08 100644 --- a/java/tb/init/TBThaumonomicon.java +++ b/java/tb/init/TBThaumonomicon.java @@ -9,6 +9,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import tb.api.RevolverUpgrade; @@ -217,7 +218,9 @@ public static void setup() '#',tiG }); + ShapedOreRecipe thauminiteGP[] = new ShapedOreRecipe[]{new ShapedOreRecipe(new ItemStack(TBItems.resource, 3, 10), new Object[] { "TTT", Character.valueOf('T'), new ItemStack(TBItems.resource,1,1) }), new ShapedOreRecipe(new ItemStack(TBItems.resource, 1, 9), new Object[] { "BBB", "BIB", "BBB", Character.valueOf('I'), "ingotIron", Character.valueOf('B'), new ItemStack(TBItems.resource,1,0) })}; + ShapedArcaneRecipe thauminiteCaps = new ShapedArcaneRecipe("CAP_thauminite", new ItemStack(TBItems.resource,1,2), primals(25), new Object[]{ "###", "#@#", @@ -1159,6 +1162,7 @@ public static void setup() new ResearchPage(TBRecipes.recipes.get("thauminiteIngot")), new ResearchPage(TBRecipes.recipes.get("thauminiteNugget")), new ResearchPage(TBRecipes.recipes.get("thauminiteBlock")), + new ResearchPage(thauminiteGP), new ResearchPage(toolsRec) ).registerResearchItem(); @@ -2292,6 +2296,9 @@ public static void setup() CraftingManager.getInstance().getRecipeList().add(voidShearsRec); CraftingManager.getInstance().getRecipeList().add(voidFlint); + GameRegistry.addRecipe(thauminiteGP[0]); + GameRegistry.addRecipe(thauminiteGP[1]); + add(revolverRec); add(accuracyRec); add(atropodsRec); diff --git a/java/tb/utils/TBConfig.java b/java/tb/utils/TBConfig.java index b867113..6f6ca85 100644 --- a/java/tb/utils/TBConfig.java +++ b/java/tb/utils/TBConfig.java @@ -38,6 +38,8 @@ public void load(Configuration config) { enableTTCompathability = cfg.getBoolean("enableTTCompathability", "General", true, "Allow the mod to register it's enchantments in the Thaumic Tinkerer's enchanter? Set to false if Thaumic Tinkerer is crashing you."); allowHSNicknameChange = cfg.getBoolean("allowHerobrinesScytheNicknameChange", "General", true, "Will the Scythe of the white eyed one change the player's nickname to Herobrine while he is holding it."); + + enableTBGolemMaterials = cfg.getBoolean("enableTBGolemMaterials", "Golems", true, "Does Thaumic Bases add golem materials?"); } static Configuration cfg; @@ -70,4 +72,5 @@ public void load(Configuration config) { public static boolean allowHSNicknameChange; + public static boolean enableTBGolemMaterials; } diff --git a/resources/assets/thaumicbases/lang/en_US.lang b/resources/assets/thaumicbases/lang/en_US.lang index d249721..311b38b 100644 --- a/resources/assets/thaumicbases/lang/en_US.lang +++ b/resources/assets/thaumicbases/lang/en_US.lang @@ -95,6 +95,8 @@ tile.enderPlanks.name=Ender Wood Planks #items item.resourcenuggetthauminite.name=Thauminite Nugget item.resourcethauminite.thauminite_ingot.name=Thauminite Ingot +item.resourcethauminite.gear.name=Thauminite Gear +item.resourcethauminite.plate.name=Thauminite Plate item.resourcethaumium_wand_core.name=Thaumium Wand Core item.resourcevoid_wand_core.name=Void Wand Core item.resourceaurelia_petal.name=Aurelia Petal @@ -758,4 +760,8 @@ tc.research_text.TB.SINSTONE=Do you dare follow it? tc.research_name.TB.METALLURGY=Magical Metallurgy tc.research_text.TB.METALLURGY=Where metals meet magic tc.research_name.TB.ARCANEEAR=Arcane Ear -tc.research_text.TB.ARCANEEAR=Shhh, do you hear something? \ No newline at end of file +tc.research_text.TB.ARCANEEAR=Shhh, do you hear something? + +#Golems +golem.material.thauminite=Thauminite +golem.material.text.thauminite=This golem is crafted from thauminite. It shares many characteristics with thaumium, but has a diamond structure. It is sturdier and more resistant to damage, but lighter. \ No newline at end of file diff --git a/resources/assets/thaumicbases/lang/ru_RU.lang b/resources/assets/thaumicbases/lang/ru_RU.lang index 1758d6f..6324bc6 100644 --- a/resources/assets/thaumicbases/lang/ru_RU.lang +++ b/resources/assets/thaumicbases/lang/ru_RU.lang @@ -95,6 +95,8 @@ tile.enderPlanks.name=Доски края #items item.resourcenuggetthauminite.name=Кусочек Тауминита item.resourcethauminite.thauminite_ingot.name=Слиток Тауминита +item.resourcethauminite.gear.name=Тауминитовая Шестерня +item.resourcethauminite.plate.name=Тауминитовая Пластина item.resourcethaumium_wand_core.name=Таум-металлический стержень item.resourcevoid_wand_core.name=Пустотный стержень item.resourceaurelia_petal.name=Лепесток Аурелии @@ -676,4 +678,8 @@ tc.research_text.TB.ROD_primal_staff=Хранилище энергии синг #Chat notifications tb.txt.linkStarted=Связывание начато -tb.txt.linkEstabilished=Связь установлена \ No newline at end of file +tb.txt.linkEstabilished=Связь установлена + +#Golems +golem.material.thauminite=Тауминит +golem.material.text.thauminite=Голем сделан из тауминита. Тауминит похож на таум-метал, но он прочнее и легче, так как имеет структуру алмаза. \ No newline at end of file diff --git a/resources/assets/thaumicbases/textures/entity/golem/mat_thauminite.png b/resources/assets/thaumicbases/textures/entity/golem/mat_thauminite.png new file mode 100644 index 0000000000000000000000000000000000000000..325e2921cf2956522407e0a565ad7a4ef956c900 GIT binary patch literal 5550 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 literal 0 HcmV?d00001 diff --git a/resources/assets/thaumicbases/textures/items/thauminite/gear.png b/resources/assets/thaumicbases/textures/items/thauminite/gear.png new file mode 100644 index 0000000000000000000000000000000000000000..efb6d7cd3012c54a3890b5d412af2b5555fbbb60 GIT binary patch literal 683 zcmV;c0#yBpP)&wbmY*+#){paM^<;P?u9)hK%N_!XgWXc+pCY6|<=ad8($_!;gb?6psO8Tn zr|x5^A1USEqU$9AaBLqS-4;G+U>QYXgBK`oyvA`%9M>cmh>$*W54V}eH5*u#-Z=q4 zZ|{&COifbSULrSsf=D<_cPNC~Xt0(yP%<~D{hXt=vm!b)PzEMsGJBW8<{~4*#~Dhc zsMYK2wOX7U9p(DfEXB1~#8cBmqe*!P5La??c=93sKnTyXNvBe*=kqMDu8R4E1@V1z zlUPp={y>x-e}IAXl{Ul&U|9`Jy^NGD!sn+e5MV%2{;taBBaukpSi9_+bzD=$w)bd@ zsB6E(*2)W+9=}64)Q{shWHK3U&(2EMwz)Yo!&ad{SGR(>r%~VeifJ}Phlp_{Cx=eo zqPRZCivrl!y}jk>DxZhn=q=_ma7^qgvCS#)e+zgS8S#|u$je}gAIK;riW8M*if zt+EVenbP(WnpQk~2MB@X__6gZb_(xFrl%l0hG(lddo?ybJYz7K!!Ul+YN_qAHlSYp zBAP}?`u#x+y(|Ek7>(naDwXX;n$4=fvt+Yb#kQN`zn&=)NyuO@Dv$JI{{R!j`7QHi RlO{55f_!AM55izmW zyX(Ds@13EDVi7siFx5z-bM&2=fqz}@x_R{A#73hjstFN~Y9i-A&I8T~DfNU`wOC@e|DSwg`f^C4~r+gU9q)7>%d6@-BU-Da50i zDMp7kBFLWvnvD=5{o*YyuMj5`){%3hTQ3-5yLHBmK~d}wW1`SYd^KZ;9icsE-7f*C zs(XkOh&JS${<4E1(Kna4w50SC!q8laCwqjUMK$4zF(R@}AmSO?Z+!mvin^H-h8l4m z=L$qh%#_9AJt74;=WT+v{ecY&4iAn=DKH*QDa$e0Rfsl}e!}$55j)ikvs+$yfA7dt vGdZm{Lo-EHaUz&1B0`E8QzPiw@n6($I4=N!A!Rw_00000NkvXXu0mjfbj|Lz literal 0 HcmV?d00001