diff --git a/build.gradle b/build.gradle index b7756e80..9db4cbf8 100644 --- a/build.gradle +++ b/build.gradle @@ -113,11 +113,13 @@ propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") propertyDefaultIfUnset("curseForgeRelations", "") propertyDefaultIfUnset("minimizeShadowedDependencies", true) + // Deprecated properties (kept for backwards compat) propertyDefaultIfUnset("gradleTokenModId", "") propertyDefaultIfUnset("gradleTokenModName", "") propertyDefaultIfUnset("gradleTokenGroupName", "") + propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 307f4b60..78834596 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -675,8 +675,8 @@ public class TinkerTools { ModifyBuilder.registerModifier( new ModAntiSpider("ModAntiSpider", 15, new ItemStack[] { spidereyeball }, new int[] { 1 })); - ItemStack obsidianPlate = new ItemStack(TinkerTools.largePlate, 1, 6); - ModifyBuilder.registerModifier(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); + ItemStack reinforcement = new ItemStack(TinkerTools.materials, 1, 43); + ModifyBuilder.registerModifier(new ModReinforced(new ItemStack[] { reinforcement }, 16, 1)); TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); } diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index d52ccfdc..4b30cf6d 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -492,7 +492,7 @@ public class ToolProxyClient extends ToolProxyCommon { TConstructClientRegistry .registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 26)); TConstructClientRegistry - .registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.largePlate, 1, 6)); + .registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 43)); TConstructClientRegistry .registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston)); diff --git a/src/main/java/tconstruct/tools/items/MaterialItem.java b/src/main/java/tconstruct/tools/items/MaterialItem.java index 675dc08c..d334c43c 100644 --- a/src/main/java/tconstruct/tools/items/MaterialItem.java +++ b/src/main/java/tconstruct/tools/items/MaterialItem.java @@ -25,7 +25,7 @@ public class MaterialItem extends CraftingItem { "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall", "SearedBrick", "ArditeDust", "CobaltDust", "AluminumDust", "ManyullynDust", - "AluBrassDust" }; + "AluBrassDust", "Reinforcement" }; static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", "copperingot", "tiningot", @@ -34,5 +34,5 @@ public class MaterialItem extends CraftingItem { "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball", "searedbrick_nether", "ardite_dust", "cobalt_dust", "aluminum_dust", "manyullyn_dust", - "alubrass_dust" }; + "alubrass_dust", "reinforcement" }; } diff --git a/src/main/resources/assets/tinker/lang/cs_CZ.lang b/src/main/resources/assets/tinker/lang/cs_CZ.lang index 60bc3d8c..a32afdc3 100644 --- a/src/main/resources/assets/tinker/lang/cs_CZ.lang +++ b/src/main/resources/assets/tinker/lang/cs_CZ.lang @@ -311,6 +311,7 @@ item.tconstruct.Materials.CobaltDust.name=Kobaltový prášek item.tconstruct.Materials.AluminumDust.name=Hliníkový prášek item.tconstruct.Materials.ManyullynDust.name=Manyullynový prášek item.tconstruct.Materials.AluBrassDust.name=Mosazný hliníkový prášek +item.tconstruct.Materials.Reinforcement.name=Reinforcement item.tconstruct.ArmorPattern.helmet.name=Odlitek helmy item.tconstruct.ArmorPattern.chestplate.name=Odlitek brnění diff --git a/src/main/resources/assets/tinker/lang/de_DE.lang b/src/main/resources/assets/tinker/lang/de_DE.lang index 6c00ae84..a94dd866 100644 --- a/src/main/resources/assets/tinker/lang/de_DE.lang +++ b/src/main/resources/assets/tinker/lang/de_DE.lang @@ -311,6 +311,7 @@ item.tconstruct.Materials.CobaltDust.name=Kobaltpulver item.tconstruct.Materials.AluminumDust.name=Aluminumpulver item.tconstruct.Materials.ManyullynDust.name=Manyullynpulver item.tconstruct.Materials.AluBrassDust.name=Duraluminiumpulver +item.tconstruct.Materials.Reinforcement.name=Verstärkung item.tconstruct.ArmorPattern.helmet.name=Helmgussform item.tconstruct.ArmorPattern.chestplate.name=Brustpanzergussform @@ -495,7 +496,7 @@ item.tconstruct.bucket.Silver.name=Eimer mit geschmolzenem Silber item.tconstruct.bucket.Shiny.name=Eimer mit geschmolzenem Platin item.tconstruct.bucket.Invar.name=Eimer mit geschmolzenem Invar item.tconstruct.bucket.Electrum.name=Eimer mit geschmolzenem Elektrum -item.tconstruct.bucket.Lumium.nameEimer mit geschmolzenem Lumium +item.tconstruct.bucket.Lumium.name=Eimer mit geschmolzenem Lumium item.tconstruct.bucket.Signalum.name=Eimer mit geschmolzenem Signalum item.tconstruct.bucket.Mithril.name=Eimer mit geschmolzenem Manaangereichertem Metall item.tconstruct.bucket.Enderium.name=Eimer mit geschmolzenem Enderium diff --git a/src/main/resources/assets/tinker/lang/en_US.lang b/src/main/resources/assets/tinker/lang/en_US.lang index 3912445d..2d0ad011 100644 --- a/src/main/resources/assets/tinker/lang/en_US.lang +++ b/src/main/resources/assets/tinker/lang/en_US.lang @@ -346,6 +346,7 @@ item.tconstruct.Materials.CobaltDust.name=Cobalt Dust item.tconstruct.Materials.AluminumDust.name=Aluminum Dust item.tconstruct.Materials.ManyullynDust.name=Manyullyn Dust item.tconstruct.Materials.AluBrassDust.name=Aluminum Brass Dust +item.tconstruct.Materials.Reinforcement.name=Reinforcement item.tconstruct.ArmorPattern.helmet.name=Helmet Cast item.tconstruct.ArmorPattern.chestplate.name=Chestplate Cast diff --git a/src/main/resources/assets/tinker/lang/fr_FR.lang b/src/main/resources/assets/tinker/lang/fr_FR.lang index b72112b8..56b08fc9 100644 --- a/src/main/resources/assets/tinker/lang/fr_FR.lang +++ b/src/main/resources/assets/tinker/lang/fr_FR.lang @@ -311,6 +311,7 @@ item.tconstruct.Materials.CobaltDust.name=Poussière de cobalt item.tconstruct.Materials.AluminumDust.name=Poussière d'aluminum item.tconstruct.Materials.ManyullynDust.name=Poussière de manyullyn item.tconstruct.Materials.AluBrassDust.name=Poussière de laiton d'aluminium +item.tconstruct.Materials.Reinforcement.name=Renforcement item.tconstruct.ArmorPattern.helmet.name=Moule de casque item.tconstruct.ArmorPattern.chestplate.name=Moule de plastron diff --git a/src/main/resources/assets/tinker/lang/it_IT.lang b/src/main/resources/assets/tinker/lang/it_IT.lang index 7cb3d634..9bb5509f 100644 --- a/src/main/resources/assets/tinker/lang/it_IT.lang +++ b/src/main/resources/assets/tinker/lang/it_IT.lang @@ -302,6 +302,7 @@ item.tconstruct.Materials.CobaltDust.name=Polvere di coblato item.tconstruct.Materials.AluminumDust.name=Polvere di alluminio item.tconstruct.Materials.ManyullynDust.name=Polvere di manyullyn item.tconstruct.Materials.AluBrassDust.name=Polvere di ottone +item.tconstruct.Materials.Reinforcement.name=Rinforzo item.tconstruct.ArmorPattern.helmet.name=Stampo per elmo item.tconstruct.ArmorPattern.chestplate.name=Stampo per corazza diff --git a/src/main/resources/assets/tinker/lang/ja_JP.lang b/src/main/resources/assets/tinker/lang/ja_JP.lang index 3f8b041c..c3044bd8 100644 --- a/src/main/resources/assets/tinker/lang/ja_JP.lang +++ b/src/main/resources/assets/tinker/lang/ja_JP.lang @@ -302,6 +302,7 @@ item.tconstruct.Materials.CobaltDust.name=コバルトの粉 item.tconstruct.Materials.AluminumDust.name=アルミの粉 item.tconstruct.Materials.ManyullynDust.name=マニュリンの粉 item.tconstruct.Materials.AluBrassDust.name=アルミ黄銅の粉 +item.tconstruct.Materials.Reinforcement.name=補強 item.tconstruct.ArmorPattern.helmet.name=ヘルメットの鋳型 item.tconstruct.ArmorPattern.chestplate.name=チェストプレートの鋳型 diff --git a/src/main/resources/assets/tinker/lang/ko_KR.lang b/src/main/resources/assets/tinker/lang/ko_KR.lang index 9282998b..c2bf1e4c 100644 --- a/src/main/resources/assets/tinker/lang/ko_KR.lang +++ b/src/main/resources/assets/tinker/lang/ko_KR.lang @@ -303,6 +303,7 @@ item.tconstruct.Materials.CobaltDust.name=코발트 가루 item.tconstruct.Materials.AluminumDust.name=알루미늄 가루 item.tconstruct.Materials.ManyullynDust.name=마뉼린 가루 item.tconstruct.Materials.AluBrassDust.name=알루미늄 청동 가루 +item.tconstruct.Materials.Reinforcement.name=강화 item.tconstruct.ArmorPattern.helmet.name=투구 주형 item.tconstruct.ArmorPattern.chestplate.name=갑옷 주형 diff --git a/src/main/resources/assets/tinker/lang/pl_PL.lang b/src/main/resources/assets/tinker/lang/pl_PL.lang index 3763895e..0ac9758c 100644 --- a/src/main/resources/assets/tinker/lang/pl_PL.lang +++ b/src/main/resources/assets/tinker/lang/pl_PL.lang @@ -138,6 +138,7 @@ item.tconstruct.Materials.ManyullynNugget.name=Samorodek manialinu item.tconstruct.Materials.BronzeNugget.name=Samorodek brązu item.tconstruct.Materials.AlumiteNugget.name=Samorodek alumitu item.tconstruct.Materials.SteelNugget.name=Samorodek stali +item.tconstruct.Materials.Reinforcement.name=Reinforcement item.tconstruct.crystal.essence.name=Kryształ esencji diff --git a/src/main/resources/assets/tinker/lang/pt_BR.lang b/src/main/resources/assets/tinker/lang/pt_BR.lang index 18fc3d9b..fc28adf9 100644 --- a/src/main/resources/assets/tinker/lang/pt_BR.lang +++ b/src/main/resources/assets/tinker/lang/pt_BR.lang @@ -303,6 +303,7 @@ item.tconstruct.Materials.CobaltDust.name=Pó de Cobalto item.tconstruct.Materials.AluminumDust.name=Pó de Alumínio item.tconstruct.Materials.ManyullynDust.name=Pó de Manyullyn item.tconstruct.Materials.AluBrassDust.name=Pó de Alumínio-Bronze +item.tconstruct.Materials.Reinforcement.name=Reforço item.tconstruct.ArmorPattern.helmet.name=Molde de Elmo item.tconstruct.ArmorPattern.chestplate.name=Molde do Peitoral diff --git a/src/main/resources/assets/tinker/lang/pt_PT.lang b/src/main/resources/assets/tinker/lang/pt_PT.lang index f45d610d..002ff886 100644 --- a/src/main/resources/assets/tinker/lang/pt_PT.lang +++ b/src/main/resources/assets/tinker/lang/pt_PT.lang @@ -302,6 +302,7 @@ item.tconstruct.Materials.CobaltDust.name=Pó de Cobalto item.tconstruct.Materials.AluminumDust.name=Pó de Alumínio item.tconstruct.Materials.ManyullynDust.name=Pó de Manyullyn item.tconstruct.Materials.AluBrassDust.name=Pó de Alumínio-Bronze +item.tconstruct.Materials.Reinforcement.name=Reforço item.tconstruct.ArmorPattern.helmet.name=Molde de Elmo item.tconstruct.ArmorPattern.chestplate.name=Molde do Peitoral diff --git a/src/main/resources/assets/tinker/lang/ru_RU.lang b/src/main/resources/assets/tinker/lang/ru_RU.lang index e5521965..fb48be57 100644 --- a/src/main/resources/assets/tinker/lang/ru_RU.lang +++ b/src/main/resources/assets/tinker/lang/ru_RU.lang @@ -313,6 +313,7 @@ item.tconstruct.Materials.CobaltDust.name=Кобальтовая пыль item.tconstruct.Materials.AluminumDust.name=Алюминиевая пыль item.tconstruct.Materials.ManyullynDust.name=Мануллиновая пыль item.tconstruct.Materials.AluBrassDust.name=Пыль алюминиевой латуни +item.tconstruct.Materials.Reinforcement.name=Укрепитель item.tconstruct.ArmorPattern.helmet.name=Слепок шлема item.tconstruct.ArmorPattern.chestplate.name=Слепок кирасы diff --git a/src/main/resources/assets/tinker/lang/zh_CN.lang b/src/main/resources/assets/tinker/lang/zh_CN.lang index e69e83ee..df72c505 100644 --- a/src/main/resources/assets/tinker/lang/zh_CN.lang +++ b/src/main/resources/assets/tinker/lang/zh_CN.lang @@ -346,6 +346,7 @@ item.tconstruct.Materials.CobaltDust.name=钴粉 item.tconstruct.Materials.AluminumDust.name=铝粉 item.tconstruct.Materials.ManyullynDust.name=玛玉灵粉 item.tconstruct.Materials.AluBrassDust.name=铝黄铜粉 +item.tconstruct.Materials.Reinforcement.name=加固板 item.tconstruct.ArmorPattern.helmet.name=头盔铸模 item.tconstruct.ArmorPattern.chestplate.name=胸甲铸模 diff --git a/src/main/resources/assets/tinker/lang/zh_TW.lang b/src/main/resources/assets/tinker/lang/zh_TW.lang index 236e099d..f777eb73 100644 --- a/src/main/resources/assets/tinker/lang/zh_TW.lang +++ b/src/main/resources/assets/tinker/lang/zh_TW.lang @@ -264,6 +264,7 @@ item.tconstruct.Materials.CobaltDust.name=鈷粉 item.tconstruct.Materials.AluminumDust.name=鋁粉 item.tconstruct.Materials.ManyullynDust.name=瑪玉靈粉 item.tconstruct.Materials.AluBrassDust.name=鋁黃銅粉 +item.tconstruct.Materials.Reinforcement.name=強化 item.tconstruct.ArmorPattern.helmet.name=頭盔鑄模 item.tconstruct.ArmorPattern.chestplate.name=胸甲鑄模 diff --git a/src/main/resources/assets/tinker/manuals/en_US/materials.xml b/src/main/resources/assets/tinker/manuals/en_US/materials.xml index dfcf24d0..7685bb53 100644 --- a/src/main/resources/assets/tinker/manuals/en_US/materials.xml +++ b/src/main/resources/assets/tinker/manuals/en_US/materials.xml @@ -908,7 +908,7 @@ Stackable: No Reinforced -Adding an obsidian plate to the tool seems to help with its durability. +Adding a reinforced plate to the tool seems to help with its durability. Effects: - Adds the material trait Reinforced to the tool diff --git a/src/main/resources/assets/tinker/manuals/it_IT/materials.xml b/src/main/resources/assets/tinker/manuals/it_IT/materials.xml index 78f9972e..96a1cbf7 100644 --- a/src/main/resources/assets/tinker/manuals/it_IT/materials.xml +++ b/src/main/resources/assets/tinker/manuals/it_IT/materials.xml @@ -921,7 +921,7 @@ Potenziabile: No Rinforzato -Aggiungendo piastre di ossidiana sembra aiutare la resistenza di un attrezzo. +Aggiungendo piastre di rinforzo sembra aiutare la resistenza di un attrezzo. Effetti: - Da l'abilità Rinforzato all'attrezzo diff --git a/src/main/resources/assets/tinker/manuals/ru_RU/materials.xml b/src/main/resources/assets/tinker/manuals/ru_RU/materials.xml index a9099fe5..832a9911 100644 --- a/src/main/resources/assets/tinker/manuals/ru_RU/materials.xml +++ b/src/main/resources/assets/tinker/manuals/ru_RU/materials.xml @@ -929,7 +929,7 @@ Shift+ПКМ: Поставить предмет Укрепление -Добавление обсидиановой пластины к инструменту, кажется, увеличивает его прочность. +Добавление Укреплённой пластины на инструмент, кажется, увеличивает его прочность. Эффекты: - Добавляет инструменту особенность "Укрепление" diff --git a/src/main/resources/assets/tinker/manuals/zh_CN/materials.xml b/src/main/resources/assets/tinker/manuals/zh_CN/materials.xml index 1f6afa31..f51a347d 100644 --- a/src/main/resources/assets/tinker/manuals/zh_CN/materials.xml +++ b/src/main/resources/assets/tinker/manuals/zh_CN/materials.xml @@ -918,7 +918,7 @@ Shift+右击:放置物品 增强 -将黑曜石大板加入工具似乎能增强它的耐磨 +附上一个耐久强化大板有助于提升工具的耐久,让它变得更坚硬。 效果: - 增强工具材料的耐磨 diff --git a/src/main/resources/assets/tinker/textures/items/materials/material_reinforcement.png b/src/main/resources/assets/tinker/textures/items/materials/material_reinforcement.png new file mode 100644 index 00000000..d8673254 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/materials/material_reinforcement.png differ