From b729ac7544a36f5e34fcaaa65aa1cdaa9d24306a Mon Sep 17 00:00:00 2001 From: Forstride Date: Mon, 1 Jan 2024 12:55:47 -0500 Subject: [PATCH] Reclassified vanilla Swamp as a neutral temperature biome --- .../20dae170dba4c8eb919766d5be31700d182da0d9 | 6 +++--- .../9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 | 4 +++- .../tags/items/cooling_consumed_items.json | 3 +-- .../tags/items/heating_consumed_items.json | 3 +-- .../tags/worldgen/biome/neutral_biomes.json | 1 + .../tags/worldgen/biome/warm_biomes.json | 1 - .../client/handler/TooltipHandler.java | 8 ++++---- .../assets/toughasnails/lang/en_us.json | 2 +- .../textures/block/rain_collector_top.png | Bin 495 -> 313 bytes .../toughasnails/textures/gui/icons.png | Bin 2647 -> 2646 bytes .../provider/TANBiomeTagsProvider.java | 4 ++-- .../datagen/provider/TANItemTagsProvider.java | 2 ++ 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 index 15e543fd..d7972a4a 100644 --- a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 +++ b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 @@ -1,8 +1,8 @@ -// 1.20.4 2023-12-30T10:10:46.3659207 Tags for minecraft:worldgen/biome mod id toughasnails +// 1.20.4 2024-01-01T12:37:49.2281638 Tags for minecraft:worldgen/biome mod id toughasnails 2b52a1f084a28479a2e448b5ca6be229c52b6aa9 data/toughasnails/tags/worldgen/biome/cold_biomes.json 92158999e9537d3b7c9cd1a65cc1aa65bf673c2d data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json 8548cd9e18e161a303323283cb2c7ab2f2ff2cb0 data/toughasnails/tags/worldgen/biome/hot_biomes.json 775e0f72e6757e7740bc9110927f01e0fc675071 data/toughasnails/tags/worldgen/biome/icy_biomes.json -83dc2f96a764a157bdb7f23ea0f3a4d92a761358 data/toughasnails/tags/worldgen/biome/neutral_biomes.json +9128966f06f646c3a8f85e09692e7ce97009d009 data/toughasnails/tags/worldgen/biome/neutral_biomes.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/purified_water_biomes.json -c852764e89c93c82574fb9dbc68fdde3b9e030a2 data/toughasnails/tags/worldgen/biome/warm_biomes.json +92b547e23992c4f327b30052a1b36aab5b36d767 data/toughasnails/tags/worldgen/biome/warm_biomes.json diff --git a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 index f532b516..cb431f2b 100644 --- a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 +++ b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 @@ -1,8 +1,10 @@ -// 1.20.4 2023-12-31T06:07:30.3349516 Tags for minecraft:item mod id toughasnails +// 1.20.4 2024-01-01T12:51:21.0396063 Tags for minecraft:item mod id toughasnails f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/items/cooling_armor.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/cooling_consumed_items.json 7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/items/cooling_held_items.json d7e37bc0c1468593bf2403c8bab7e97c17edde8e data/toughasnails/tags/items/drinks.json eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/items/heating_armor.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/heating_consumed_items.json efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/items/heating_held_items.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/100_hydration_drinks.json 9c0dc65d9f036f654b10088e08368b1a58a41237 data/toughasnails/tags/items/hydration/10_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json b/common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json index d6649e77..f72d209d 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json @@ -1,4 +1,3 @@ { - "values": [ - ] + "values": [] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json b/common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json index d6649e77..f72d209d 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json @@ -1,4 +1,3 @@ { - "values": [ - ] + "values": [] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json b/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json index e7847b0b..cfc336d5 100644 --- a/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json +++ b/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json @@ -2,6 +2,7 @@ "values": [ "minecraft:the_void", "minecraft:dripstone_caves", + "minecraft:swamp", "minecraft:plains", "minecraft:sunflower_plains", "minecraft:dark_forest", diff --git a/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json b/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json index 613684fc..c83dc8de 100644 --- a/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json +++ b/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json @@ -2,7 +2,6 @@ "values": [ "minecraft:soul_sand_valley", "minecraft:lush_caves", - "minecraft:swamp", "minecraft:mangrove_swamp", "minecraft:jungle", "minecraft:sparse_jungle", diff --git a/common/src/main/java/toughasnails/client/handler/TooltipHandler.java b/common/src/main/java/toughasnails/client/handler/TooltipHandler.java index 6eccae9b..e92cfae5 100644 --- a/common/src/main/java/toughasnails/client/handler/TooltipHandler.java +++ b/common/src/main/java/toughasnails/client/handler/TooltipHandler.java @@ -85,7 +85,7 @@ public int getHeight() @Override public int getWidth(Font font) { - return (this.amount / 2) * 9; + return (this.amount / 2) * 8; } @Override @@ -97,18 +97,18 @@ public void renderImage(Font font, int x, int y, GuiGraphics gui) { int dropletHalf = i * 2 + 1; - int startX = x + i * 8 - 1; + int startX = x + i * 8; int startY = y; // Args: poseStack, x, y, u, v, width, height, texWidth, texHeight // Draw a full droplet if (this.amount > dropletHalf) { - gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 0, 32 + 9, 9, 9, 256, 256); + gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 0, 41, 8, 8, 256, 256); } else if (this.amount == dropletHalf) // Draw a half droplet { - gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 9, 32 + 9, 9, 9, 256, 256); + gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 8, 41, 8, 8, 256, 256); } } diff --git a/common/src/main/resources/assets/toughasnails/lang/en_us.json b/common/src/main/resources/assets/toughasnails/lang/en_us.json index 4760a956..b2b4e786 100644 --- a/common/src/main/resources/assets/toughasnails/lang/en_us.json +++ b/common/src/main/resources/assets/toughasnails/lang/en_us.json @@ -37,7 +37,7 @@ "item.toughasnails.dirty_water_canteen": "Dirty Water Canteen", "item.toughasnails.empty_canteen": "Empty Canteen", "item.toughasnails.glow_berry_juice": "Glow Berry Juice", - "item.toughasnails.leaf_boots": "Leaf Boots", + "item.toughasnails.leaf_boots": "Leaf Greaves", "item.toughasnails.leaf_chestplate": "Leaf Poncho", "item.toughasnails.leaf_helmet": "Leaf Veil", "item.toughasnails.leaf_leggings": "Leaf Pants", diff --git a/common/src/main/resources/assets/toughasnails/textures/block/rain_collector_top.png b/common/src/main/resources/assets/toughasnails/textures/block/rain_collector_top.png index 13d932bc0ff7a952ba2fd25a7674d3ef13686fb1..d88f1d42c1fe780c797301347fa9c050f4733cfb 100644 GIT binary patch delta 268 zcmaFQypw5yBnLAC1A~SxfAB;_g?jY>pAc7nfB(pci1frnU0ov+6AODgrL@86tVl5E!UsMPA{+dsb;W6sLO&tVJW-#ASe=o|)5S3j3^ HP66=ap*hEf1{>QNTKj)oqq(7>)&kunC=ErIAjKB* zcYM#wYd(X|-T8iZ&)xf8(rUGqmZFf)rQri>s`ycM)a$C;Zg@1yx z@H3mGmf2$Qn_6b|`o3jT+b*u!)@U~EYdEysYSnt(?wTL-WHPb)PRGB?Ae+h@E*6V+ z-M&oVyW1OQ`C^ikN~NGO&DSE(fM zbUL+Kxojs#&E(~+=PaLML4l@Ckbi?HfX~lPgD(Yx@z|MSLTDjYfYf9K7+(tB2P0<& z3@E-f0}fIFsWD4|n1Kr$3gVuT4D&xTQCtJ(VR-^3imd-VBYC+3iI~3Px&@FS3lo(r zdWNZ}S*Um7u>uej5ac6O diff --git a/common/src/main/resources/assets/toughasnails/textures/gui/icons.png b/common/src/main/resources/assets/toughasnails/textures/gui/icons.png index 237cf1907e852fd73cff154e4b775873a80a133c..928093c576768be55d65539a0040b4afca91967a 100644 GIT binary patch delta 2173 zcmcgpdo+}L7yiBP4C6Y6BiBabGC844$!R);q2y~M5=G+ZqRWw}sDtvp?mD?lxph-i zQn?GcG-jscQZdZbC`uEOT$>n|G0gFOfA`P#&)IA3z4m(ce)f9Se!4UTnq@o)3Qp%k zCdiO)s&GQKU241CcW^tW`d!25Kl#4{=_d5<8yt6CAxn`UazG{cxEiBr4)uHdw zHXZs>8L{rW)TEd9${8>bMGmF{6E{smbZXCzy%ftwQzH7C-rm@720k!aKhachUBO>} z<$Y&5ZH;Z*HHy_mmlMMwU%IPC9zVg_7nSzbM9(^q1pTl-U8nK&?7pj7pxh!mr0w*A z)sv$PuiX^h<10y&q%q{^z!0# z^59<3b@V8U^}_mlFt|Uy<6}-8A5hl%KFrWU30G@V0suZ7x1U8;WndWJE3kTCyqCFq z0;Qx#&txi5GZ?f{loD%=<_%u!N<;^5XR~KA&_R}|I7XvGs_gFS!H^}^DvihT1F(eP z7%%LcOGwmK_2gqw$eWpM;*HctbGs~)znux$G1=uHcU{@;^=DhRP7IyAqkglzNTtz+ zk;Vxp5ZbyR6dm#-0)-?k1%LdUIpkx3*_i9`Y}u6cq654-{8 z{V)`8W&hgVXt8h2H&3trug7DIj+I#31{$IRJjFTnFP9O&b-yVPns?O@HJ?=$dz&O? zYz=ri*zgi+S;D@8%Ciga-uF zt_rQL+qVY>jN*@6fk6?(-nYY0xmp+$#5_>xOODNX>1^w?l|5m^$@R8T10hNL zH+V;oUu)Hn6{Li&Gjan}Cr0M9ew5nKu)csB)!i!(9f!QZ2oEBWR_7}FANnFkD3hyr zd*X3j?KO`0X1+!i$dc*t>^||NO2SrTdfJs+BfqH1Zn~6`t#7FZ_G~D8%YzB954T)} zZ8(9Na_>Q>freie4a0twZ8=P21R2S8Rw?1hCWK9-o@aV&ddKE^386z;uQ8jsWOwPk zsABATS>VIHg)Oqloy%r8ZR_Bq4fYl>(v>y!4-~YlSsEQ*g;xgm!jk34eu1>ANNMb_ z-GtEAZM8ADpwg$C6iHeUTTdc&7h?d_S@=635SS}b;y~$KZ{EaVuwTM9zbdOs{%=(J@{CoHCr-#>>G5940fpQFKZx4L~Iwj@p^ z^mgh;xN@ry8XSyIh^2Lb)FD+OU;p>K4WV?dbuxIyu{U8H$PJ&Nxc!&ZbN8tnmAbjz z2aP>v8m=7jeQ|woH1%DxVkTQ(B_W2^A*IuJfBGSE;)Menh&LB=Fw_O+2heLk zWG)a`9L{Hv=(E$uX!#CKL3;YR+o3o;8t%5M>nB7&JO*@C$msYuw8EBRx2@AI>M#H&}^zfxFk&^s{3vFs}aDovFQ2RUXW7*oNE@p4q z+Yc)11jV6Jy72WehLGt z^Z12^y3Ius^rI#@We0o3DrTdt705GfojfxH*P1U8fzd-E*Rz?zoI*|{_b&hdvto;%+iU1NzJ485_QKs zW`de_izB+Lt$GvL+ds0FM*ZQNUeCs3)J`_-4x2wDvFYE=&SGP3h&&MA#hc39zY0*9 zx6tG3!iUf%ONp7J4L-};*ySk=a4=JMe&AIlc&<><*FiSlnNkmAs#5h9Q9iQ3m z3>=N%2Xjf4n7WCiHEQz$v&9N>W)j(>XkXx{kn}cuKIOrldE6~_ V!rA8evOcgB+Z}gqEphOV`3DVj=Mw+` delta 2174 zcmchUYdDk%8^@n##*7ihInktPHRv$NDN#IVa?CoG(=ctl5;n>)hk2f96zO1Mmx)EO zqphfPpf)nfqLY-2@-mGarwQXQnL#sa-_Lz|KkR*7_m}_w{$JPsx_>;~KHb}IK`^nX z2iypo&3~F-P;AV$UfLQiYPY*Ut?k;$RvH7mNjo)`F8n`1QRbvpdPPkz0ReHHh8 z3RN}qpHQ-B$JV3HNBn8?7N_@QV)RAzE6IDQG$e4sa@!lT=cI@g23Mw1Z*!^{K{i;9jNM z>N-6n5>bEs6Cd`aHWRy)2g#$)dq1o_N#vE>qPk^m&=eg5ElFxWMQ4$HRFRNk?+4Kj z<(JB=JDpGXdxZkq>A#g@z$0KN(8obTP#C1oeJ3RoX{tGAEUA|&@QJ$)U&|50A@U** zIBCz^7Uag=yUu)pp>#VC*jRJ)$H7>D&Au7rr3&F*4zyVTxlQPsd=|D7^hggysRNA( zAFroD>^<^_UKoOx2Qd|5w;FQ&=3a{2pt;xH0!J@s?&HM_7nK+}=9=l|PDM`yW}#JR zh05FRvi0P$iM?|bZjX&K{MoU3kwEBO{zJcgeusUHEba>G)v3y{#PxqnfE?`_su43C z`^l)YL$DKyaciGyt!tYyJ$Wzzqxj1&c;Q{rq8hQz9w{Bn6sQW>j7IBtX0YzHXFdNI?&JC zTIl9gWfhqeH3}Rm61vOZ{pv!v-rpx|DfUDWAC(P0RbIWYq5IRfrL*V#LL24#B=a?X;*ES(|dNthi4T2Z*R z3NHYJ1vMKNBd4k?yRP8Y z4`>NOl`1&zZUm1gQm*DN38D?awld;s7rM>>HAv}fX_U%DQljVF7BCwRo5#t+_MJ+- z6P31tyjTly!p^9*?P3+QQZ+Rvc_4yJP}Tvsyhv>>es;fge7)KT5^%=Cb&vPk0C0-Y%2***=kA^?g!C80hL28RrfAF-lzN5p0ET!CjCo#!P{U|UqqNRetI z)0N#|dv=6X=mEkZ#i-6rBY_Xx6Q=UzF_n>-6h&9zmmx&y4ti|Rk;usUaniQ=id%+T z!i0J=XT0B;$k?y^)a7y<;68u)f>6D@d#wX!+;9&tBp_;cT6Q;Ot}**3B=P5?2n3^X zGPkv?s0m}Ao>|%m5xxxPcnS2dZZ5$40V! ziFkg6yh5j&v0@j(_PAsf!9)Rp`zFD`UT&?Nxa_NJ3XcN5e34*&n!puKk7C7(6BCkL zsX88CP@v)b8E=E&oyvb}lKt-34LC@%G8Vtyor2JvG&3+cO+zYX$hPInXN>3IgSy{( zOvgIR7RO(|EV$Tj$w!MDNe=)UhP z{5|ns)Zp*7`u7UJ-+#;hQNU?rm1Zt0=!asz`q;X9CNt>pq=N4?TkEzr6P2oafmP}j z99CIpt|5B#*1*%WmYueXxhnGxTq{0x&ndG#FeP)~M6Vsqn|wy~1c^3;=t6zg71uj% zr35W;$>3QD@$k;zTOUQ2zcP9dGDF#Z_}XG}=^?Dcs~E%ENrK;}vfBeC!kvE^2oLOW z?9DEl32Lrrm^`fYh8m{A8|2>pCujhkBlAOF-3V!<&AFc%Np=H-`)me2b3%t z`XQRn0Z*@1( zvFg9W@;E&-;(jp?h;{m55}9(WdhzseV}47#C+Q~@y&F73M|+PH9^LqQuN