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 0000000..325e292 Binary files /dev/null and b/resources/assets/thaumicbases/textures/entity/golem/mat_thauminite.png differ 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 0000000..efb6d7c Binary files /dev/null and b/resources/assets/thaumicbases/textures/items/thauminite/gear.png differ diff --git a/resources/assets/thaumicbases/textures/items/thauminite/plate.png b/resources/assets/thaumicbases/textures/items/thauminite/plate.png new file mode 100644 index 0000000..2536d81 Binary files /dev/null and b/resources/assets/thaumicbases/textures/items/thauminite/plate.png differ