From e4f56abdaafb392bf5468a0daca17ef7b603ac1f Mon Sep 17 00:00:00 2001 From: Ayutac Date: Mon, 2 May 2022 18:32:17 +0200 Subject: [PATCH] Renamed tinkerer to metallurgist and added custom texture --- src/main/java/techreborn/init/TRVillager.java | 22 +++++++++--------- .../assets/techreborn/lang/en_us.json | 2 +- .../villager/profession/metallurgist.png | Bin 0 -> 1598 bytes .../entity/villager/profession/tinkerer.png | Bin 1053 -> 0 bytes 4 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/entity/villager/profession/metallurgist.png delete mode 100644 src/main/resources/assets/techreborn/textures/entity/villager/profession/tinkerer.png diff --git a/src/main/java/techreborn/init/TRVillager.java b/src/main/java/techreborn/init/TRVillager.java index 8812f604e..92d24144d 100644 --- a/src/main/java/techreborn/init/TRVillager.java +++ b/src/main/java/techreborn/init/TRVillager.java @@ -19,42 +19,42 @@ import java.util.stream.Collectors; public class TRVillager { - public static final Identifier TINKERER_ID = new Identifier(TechReborn.MOD_ID, "tinkerer"); + public static final Identifier METALLURGIST_ID = new Identifier(TechReborn.MOD_ID, "metallurgist"); public static final Identifier ELECTRICIAN_ID = new Identifier(TechReborn.MOD_ID, "electrician"); - public static final PointOfInterestType TINKERER_POI = PointOfInterestHelper.register( - TINKERER_ID, 1, 1, TRContent.Machine.IRON_ALLOY_FURNACE.block); + public static final PointOfInterestType METALLURGIST_POI = PointOfInterestHelper.register( + METALLURGIST_ID, 1, 1, TRContent.Machine.IRON_ALLOY_FURNACE.block); public static final PointOfInterestType ELECTRICIAN_POI = PointOfInterestHelper.register( ELECTRICIAN_ID, 1, 1, TRContent.Machine.SOLID_FUEL_GENERATOR.block); - public static final VillagerProfession TINKERER_PROFESSION = Registry.register(Registry.VILLAGER_PROFESSION,TINKERER_ID, - VillagerProfessionBuilder.create().id(TINKERER_ID).workstation(TINKERER_POI).workSound(SoundEvents.ENTITY_VILLAGER_WORK_TOOLSMITH).build()); + public static final VillagerProfession METALLURGIST_PROFESSION = Registry.register(Registry.VILLAGER_PROFESSION, METALLURGIST_ID, + VillagerProfessionBuilder.create().id(METALLURGIST_ID).workstation(METALLURGIST_POI).workSound(SoundEvents.ENTITY_VILLAGER_WORK_TOOLSMITH).build()); public static final VillagerProfession ELECTRICIAN_PROFESSION = Registry.register(Registry.VILLAGER_PROFESSION,ELECTRICIAN_ID, VillagerProfessionBuilder.create().id(ELECTRICIAN_ID).workstation(ELECTRICIAN_POI).workSound(ModSounds.CABLE_SHOCK).build()); private TRVillager() {/* No instantiation. */} public static void registerVillagerTrades() { - // tinkerer - TradeUtils.registerTradesForLevel(TINKERER_PROFESSION, TradeUtils.Level.NOVICE, false, + // metallurgist + TradeUtils.registerTradesForLevel(METALLURGIST_PROFESSION, TradeUtils.Level.NOVICE, false, TradeUtils.createBuy(TRContent.RawMetals.TIN, 1, 6, 12, 2), TradeUtils.createBuy(TRContent.RawMetals.LEAD, 1, 4, 12, 2), TradeUtils.createSell(TRContent.Parts.RUBBER, 2, 3, 16, 2) ); - TradeUtils.registerTradesForLevel(TINKERER_PROFESSION, TradeUtils.Level.APPRENTICE, false, + TradeUtils.registerTradesForLevel(METALLURGIST_PROFESSION, TradeUtils.Level.APPRENTICE, false, TradeUtils.createSell(TRContent.Ingots.BRONZE, 2, 1, 12, 10), TradeUtils.createSell(TRContent.Ingots.BRASS, 5, 1, 12, 10), TradeUtils.createSell(TRContent.Parts.ELECTRONIC_CIRCUIT, 3, 2, 12, 10) ); - TradeUtils.registerTradesForLevel(TINKERER_PROFESSION, TradeUtils.Level.JOURNEYMAN, false, + TradeUtils.registerTradesForLevel(METALLURGIST_PROFESSION, TradeUtils.Level.JOURNEYMAN, false, TradeUtils.createSell(TRContent.Ingots.ELECTRUM, 7, 3, 12, 20), TradeUtils.createBuy(TRContent.Parts.CARBON_FIBER, 1, 3, 12, 20) ); - TradeUtils.registerTradesForLevel(TINKERER_PROFESSION, TradeUtils.Level.EXPERT, false, + TradeUtils.registerTradesForLevel(METALLURGIST_PROFESSION, TradeUtils.Level.EXPERT, false, TradeUtils.createSell(TRContent.Ingots.ADVANCED_ALLOY, 7, 4, 12, 20), TradeUtils.createBuy(TRContent.Ingots.NICKEL, 1, 1, 12, 30) ); - TradeUtils.registerTradesForLevel(TINKERER_PROFESSION, TradeUtils.Level.MASTER, false, + TradeUtils.registerTradesForLevel(METALLURGIST_PROFESSION, TradeUtils.Level.MASTER, false, TradeUtils.createSell(TRContent.Parts.ADVANCED_CIRCUIT, 7, 3, 12, 30) ); // electrician diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index 56ac66bd5..0379689dc 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -1112,6 +1112,6 @@ "gui.techreborn.block.progress.paused": "Idle (%s)", "_comment28": "Villagers", - "entity.minecraft.villager.tinkerer": "Tinkerer", + "entity.minecraft.villager.metallurgist": "Metallurgist", "entity.minecraft.villager.electrician": "Electrician" } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/entity/villager/profession/metallurgist.png b/src/main/resources/assets/techreborn/textures/entity/villager/profession/metallurgist.png new file mode 100644 index 0000000000000000000000000000000000000000..aaa5d32d27e6e3c4503f7c917b32adf38371ef9a GIT binary patch literal 1598 zcmV-E2EqA>P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1=C4HK~#8N?VC+# zTvZgu?;E>F=oqRkP7{OCMM7zm5Hy0ZSV6JbNJZU>McfE(r0C9#EAeCPPTVWj;wFNE zmMUnJ1hgvY#%P*xB+-ygNf))x`JcJ}@ywlf-@KW5^PE2OgUdPZ-uLxC_uP*eW`Ymi znlW)4fBIs0^^faj=(d8{T)Jk869uWqG3v+Xb_1#CGwVykVRh}g_=o29nL`s-Qh9D& zO$-zd>xzfX3O)<(Fm&*k_-W8q0Uu0@UeH0w3W$bydH&XUTiZK{x{yMdf^JZ<0?*4n z18NV`LOBd13sQWMB=lq0CBB zsnaWF=7BML*b0ThGW~U3)^HL|i{Q6!hC-$m)0)Cuk=s9=lNT6Yc-Yo7XNY?ptQ^~W z!{U0ZMvpgySPLjr_cG1}TAcP>*p?K1k4~dt%s4qCwX<^XHGynUn;p8M-2^Uy7S8`!gzjh?b5s|*+$laKh}#zy@6w#@)7 z9`;6|SS(6uN812s@vwO#w;2Gc)vERU3y1FX19l2Wt(CbNhp6u-dtjz_r zr7yJ0Ut)37Oe- z&l&xk126{f9n+q z2o@J+L*2{nZtsQJl4Jp3U^EMh%YzgEu^k2AWJ#jd0J}X52M`qymrg$%4O{>){;e;< z(c4UKJrn=~!;E=nxiU}z=!V8BKyg5e2Rb7Fhf6n~4e$+*TcU_-OB3%CUU}qb_{L{H zMz+VbbwgBE_{5Knj$)>_M@F{2JWjF&E|<$qH_qigKyQfX^VlVK0q_a+k=vahRs;kC zc4TBkN)!Vh0E~HEY_%7D9L8>tc4uct3Ic+AOioTpfq%ngKwOGk)%Hk@M*8~EypuMHXCmVU$M6e^c@ZB;YAdeF@^gG%HixP9fS_5AqGiMuw*eTmM7 zZc0)LX$t8?;GmG(jZjir0`S`FuZD%A_ZgJ=`T3SyYS-Q^)#`~51wU!U-(zU$v)!Ja z8U+Z^EPuCR&bv5+f*)XHPva*9u+uDTIgkpj{-k%#;;J5{S1Y z4#zzA@WdVF_qAW89zH=G+oJBZ`0goh0N}@E07&{X`J@4myYl4#d=>(K_Q5Ab7%ZW1 z27=-NZROIsSRIUR!4OEBraR&#b@4%Q0KO}_8z3%j2yik?8wr3i3hI`>{IGGX(dTINkcxsCK%ubOM_WIJKrr*ziy;C~ zx_#VM{R;zwHZ343TcYlv>v+9y62vkHf7AXynPQptJWhKRDEN9`iw6+R0^IAgc()D5 z`r0V?|0MRhhI51aAEq>Dc^Y0;3vk5%UpsvSgT8CyfI#-N_*O91|9*%E!QtsA>bZ~+ wKd z)65)?uemd|oivZuli1SH%-G|}oa1}1ubr8j3ni3LLJ1|5*)2i{Cw@G;BV6d$e^k7F zwJm_%&+o+k_dN-mQ~jv?`jUTtds%EOFB*ZiQAKc-wbi?lBuM}L^E(IBp$+#;%mP5p zMxHRL04vR!u%WlPF8Wyj?r}Y%A4(wr4OY?YPeg#zbO928MjqDyU6TM4b%8-J$r!-V zuYO_z4BI}c0A5UklSU9A2oMCAZ2?Yw0D=HPfFMAr@oo2m0BDt%TW4H|#LNf)9RAv$ zZ25XC0}I7yc{LkVD-SIM+|7GOPT ziWh5bd5$Blfw8ziCcs&7l7u-pd6NJpxLoGgE`YkaM*^4#jzs`O`^1o2uk@J(Rvi6? z$<=LS$gJsnPyvb-CFlF&5A) zaCq=j?#h1s@=+c^p6|+fQ;2k;OgC1M69g$3f;1r8RXrDhJ~|}V!8u5G)mC&@ZCmp{ zCcG&vMmSa@&qbj6RzaA2pGs~8#uKG`H_izFbv%XkrgS$RNizkWKHidPF1@TCZFY=R zCWv<6NpDk|I7XVL%uahr$BfmhOS;}a0rX4PQZie4vrdnl^yNXI({4!6bVjiP0#IE~ zJq!0^*5I)NLL@%U0!ViDlm&nQjciPQuKk^$+#;%K0nk@k085-e7FGb!5|&ANI|~pg zGX1)81V2*