From 8eb8eec0f8f19f8a07b272cdc19390e24ea4e4d4 Mon Sep 17 00:00:00 2001 From: NorthWestWind Date: Tue, 9 Mar 2021 22:33:58 +0800 Subject: [PATCH] Week #15 Update --- build.gradle | 2 +- .../moreboots/handler/MoreBootsHandler.java | 3 ++ .../moreboots/handler/Utils.java | 9 ++++- .../moreboots/init/ItemInit.java | 5 ++- src/main/resources/META-INF/mods.toml | 2 +- .../assets/moreboots/lang/en_us.json | 4 ++ .../textures/items/lava_sponge_boots.png | Bin 0 -> 1908 bytes .../models/armor/lava_sponge_layer_1.png | Bin 0 -> 2733 bytes .../textures/models/armor/sponge_layer_1.png | Bin 0 -> 2153 bytes update.json | 35 ++++++++++-------- 10 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/assets/moreboots/textures/items/lava_sponge_boots.png create mode 100644 src/main/resources/assets/moreboots/textures/models/armor/lava_sponge_layer_1.png create mode 100644 src/main/resources/assets/moreboots/textures/models/armor/sponge_layer_1.png diff --git a/build.gradle b/build.gradle index e6571a6..fcd17fb 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.9.0-1.16.x' +version = '1.10.0-1.16.x' group = 'ml.northwestwind.moreboots' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'moreboots' diff --git a/src/main/java/ml/northwestwind/moreboots/handler/MoreBootsHandler.java b/src/main/java/ml/northwestwind/moreboots/handler/MoreBootsHandler.java index 82ff963..8b3fc53 100644 --- a/src/main/java/ml/northwestwind/moreboots/handler/MoreBootsHandler.java +++ b/src/main/java/ml/northwestwind/moreboots/handler/MoreBootsHandler.java @@ -460,6 +460,9 @@ public void onLivingUpdate(final LivingEvent.LivingUpdateEvent event) { } else if (boots.getItem().equals(ItemInit.SPONGE_BOOTS)) { boolean absorbed = Utils.absorb(entity.world, new BlockPos(entity.getPositionVec())); if (absorbed) boots.damageItem(1, entity, ent -> ent.playSound(SoundEvents.BLOCK_GRASS_BREAK, 1, 1)); + } else if (boots.getItem().equals(ItemInit.LAVA_SPONGE_BOOTS)) { + boolean absorbed = Utils.absorb(entity.world, new BlockPos(entity.getPositionVec()), FluidTags.LAVA); + if (absorbed) boots.damageItem(1, entity, ent -> ent.playSound(SoundEvents.BLOCK_GRASS_BREAK, 1, 1)); } } diff --git a/src/main/java/ml/northwestwind/moreboots/handler/Utils.java b/src/main/java/ml/northwestwind/moreboots/handler/Utils.java index 7cbd4c8..2f95d36 100644 --- a/src/main/java/ml/northwestwind/moreboots/handler/Utils.java +++ b/src/main/java/ml/northwestwind/moreboots/handler/Utils.java @@ -9,6 +9,7 @@ import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.tags.FluidTags; +import net.minecraft.tags.ITag; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.Tuple; @@ -114,7 +115,7 @@ public static Object bytesToObj(byte[] bytes) { return obj; } - public static boolean absorb(World worldIn, BlockPos pos) { + public static boolean absorb(World worldIn, BlockPos pos, ITag.INamedTag tag) { Queue> queue = Lists.newLinkedList(); queue.add(new Tuple<>(pos, 0)); int i = 0; @@ -129,7 +130,7 @@ public static boolean absorb(World worldIn, BlockPos pos) { BlockState blockstate = worldIn.getBlockState(blockpos1); FluidState fluidstate = worldIn.getFluidState(blockpos1); Material material = blockstate.getMaterial(); - if (fluidstate.isTagged(FluidTags.WATER)) { + if (fluidstate.isTagged(tag)) { if (blockstate.getBlock() instanceof IBucketPickupHandler && ((IBucketPickupHandler)blockstate.getBlock()).pickupFluid(worldIn, blockpos1, blockstate) != Fluids.EMPTY) { ++i; if (j < 6) { @@ -160,4 +161,8 @@ public static boolean absorb(World worldIn, BlockPos pos) { return i > 0; } + + public static boolean absorb(World worldIn, BlockPos pos) { + return absorb(worldIn, pos, FluidTags.WATER); + } } diff --git a/src/main/java/ml/northwestwind/moreboots/init/ItemInit.java b/src/main/java/ml/northwestwind/moreboots/init/ItemInit.java index 949d548..bba951b 100644 --- a/src/main/java/ml/northwestwind/moreboots/init/ItemInit.java +++ b/src/main/java/ml/northwestwind/moreboots/init/ItemInit.java @@ -67,6 +67,7 @@ public class ItemInit { public static final Item STORAGE_BOOTS = new StorageBootsItem(ModArmorMaterial.STORAGE, "storage_boots", 6); public static final Item GLIDER = registerBoots(ModArmorMaterial.GLIDER, "gliding_boots"); public static final Item SPONGE_BOOTS = registerBoots(ModArmorMaterial.SPONGE, "sponge_boots"); + public static final Item LAVA_SPONGE_BOOTS = registerBoots(ModArmorMaterial.LAVA_SPONGE, "lava_sponge_boots", true); public static final Item QUARTZ_INGOT = new ItemBase("quartz_ingot"); public static final Item METAL_MIX = new ItemBase("metal_mix"); @@ -116,6 +117,7 @@ public static void registerItems(final RegistryEvent.Register event) { event.getRegistry().register(STORAGE_BOOTS); event.getRegistry().register(GLIDER); event.getRegistry().register(SPONGE_BOOTS); + event.getRegistry().register(LAVA_SPONGE_BOOTS); event.getRegistry().register(QUARTZ_INGOT); event.getRegistry().register(METAL_MIX); @@ -203,7 +205,8 @@ public enum ModArmorMaterial implements IArmorMaterial { LOKI(Reference.MODID + ":loki", 20, 1, 12, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0f, 0.0f, () -> Ingredient.EMPTY), STORAGE(Reference.MODID + ":storage", 10, 1, 8, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.0f, 0.0f, () -> Ingredient.fromItems(Items.CHEST)), GLIDER(Reference.MODID + ":gliding", 20, 1, 10, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.0f, 0.0f, () -> Ingredient.fromItems(Items.PHANTOM_MEMBRANE)), - SPONGE(Reference.MODID + ":sponge", 10, 1, 6, SoundEvents.BLOCK_GRASS_BREAK, 0.0f, 0.0f, () -> Ingredient.fromItems(Items.SPONGE, Items.WET_SPONGE)); + SPONGE(Reference.MODID + ":sponge", 10, 1, 6, SoundEvents.BLOCK_GRASS_BREAK, 0.0f, 0.0f, () -> Ingredient.fromItems(Items.SPONGE, Items.WET_SPONGE)), + LAVA_SPONGE(Reference.MODID + ":sponge", 10, 1, 6, SoundEvents.BLOCK_GRASS_BREAK, 0.0f, 0.0f, () -> Ingredient.fromItems(Items.SPONGE)); private static final int[] MAX_DAMAGE_ARRAY = new int[] { 16, 16, 16, 16 }; private final String name; private final float maxDamageFactor; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 054f2be..f21538d 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -5,7 +5,7 @@ issueTrackerURL="https://github.com/North-West-Wind/MoreBoots/issues" [[mods]] modId="moreboots" -version="1.9.0" +version="1.10.0" displayName="More Boots" updateJSONURL="https://github.com/North-West-Wind/MoreBoots/raw/main/update.json" displayURL="https://github.com/North-West-Wind/MoreBoots" diff --git a/src/main/resources/assets/moreboots/lang/en_us.json b/src/main/resources/assets/moreboots/lang/en_us.json index 4907569..6033411 100644 --- a/src/main/resources/assets/moreboots/lang/en_us.json +++ b/src/main/resources/assets/moreboots/lang/en_us.json @@ -43,6 +43,7 @@ "item.moreboots.storage_boots": "Storage Boots", "item.moreboots.gliding_boots": "Glider", "item.moreboots.sponge_boots": "Sponge Boots", + "item.moreboots.lava_sponge_boots": "Lava Sponge Boots", "item.moreboots.quartz_ingot": "Quartz Ingot", "item.moreboots.metal_mix": "Metal Mix", @@ -103,6 +104,7 @@ "tooltip.moreboots.storage_boots": "\u00A77\u00A7oExtra storage", "tooltip.moreboots.gliding_boots": "\u00A77\u00A7oGlides while moving in the air", "tooltip.moreboots.sponge_boots": "\u00A77\u00A7oAbsorbs water around", + "tooltip.moreboots.lava_sponge_boots": "\u00A77\u00A7oAbsorbs lava around", "itemGroup.morebootstab": "More Boots", "death.attack.stomp": "%1$s was stomped by %2$s", @@ -192,6 +194,8 @@ "advancements.moreboots.gliding_boots.description": "Obtain the Glider", "advancements.moreboots.sponge_boots.title": "Absorption, but Water", "advancements.moreboots.sponge_boots.description": "Obtain the Sponge Boots", + "advancements.moreboots.lava_sponge_boots.title": "Absorption, but Lava", + "advancements.moreboots.lava_sponge_boots.description": "Obtain the Lava Sponge Boots", "key.categories.moreboots": "More Boots", "key.moreboots.teleport": "Ender Boots Teleport", diff --git a/src/main/resources/assets/moreboots/textures/items/lava_sponge_boots.png b/src/main/resources/assets/moreboots/textures/items/lava_sponge_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..c7c283001f881dc587909b79e61084ef071b04c7 GIT binary patch literal 1908 zcmbVNTWs4@7^H;P{fniM^#IOS(1E(p6c+ipHfU_DNzjv5oCE zX&I0g%6qRX3TF1J>ahgQk=teb5 zwvW&G&i8-+<@`R@(Y~){)AmgSLDWRr!ZG~b;@lgn@U!7M0{Hc)(e{!>5SyQH?h4}F zleGj~DZ&?XZwrD_3cVSIujRV6?j@1(P``hDkf43|uR7*3tJ1=2^EVKcc&t^1B$_J&xi^A4SB`L+idyBU4 zSAa^}wjnW0E|+uV+%DZrF`Ouh49hb-Ph$ja^=UT9)0)*-VhBS^HdVt`b&YfwK|=4b z0~A)e;zHIa(`r^ROgLan9vBSgVjY(XKt(R&j2<&nFs{f9%)l(vYzt$#GS*1zwr-{M zdr+5`?=XNv8;zE2tf?iNEt|0H)?VyJF(7NAt$3dSnHaS69#e*`y;x?W)<2*0%7%JQW#Z{vK8~iU=k)@<=W&!qD&4LtU3@t^Gk}Yw3xE}5e`$YMmwTKlDD7A9ei16H3=~L1(Z|x9=n-h(PjIyC z^RZqJ=VLt{SlWNURPiYUnFr=^&Zbj7Qk!bw#P$_W&q4Tlagiev z(EC;edF_+Y6X@&3E6a~9UY^n?uRS@Ans(LCwGVwpD3h0Wj-kNGxKX#I4lbea_%izW z`1`e0FQ3XH^t)2`)2qbLU+1dcL;rMNLJbQaPqTB%+rJ@q{RuSe-S%cpkRyIsoE;rQ z2gW*4%SKO^KGeLI)MmcDH8C->h+x-^r#=*d`O5Ion{~Ha0^cv8)6Lh>Bi;7YSkp7V zPS+6Uf^XzLxVZJqQpe{{Qxd2e*gEOq=LoWIL>k$i@2p;)d6*cUPA?q)v|*R?UyQW2 KhtKZm8vGZEfr{Y( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreboots/textures/models/armor/lava_sponge_layer_1.png b/src/main/resources/assets/moreboots/textures/models/armor/lava_sponge_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..92793073d342a025d8bd0266bcb95567ee2a7df5 GIT binary patch literal 2733 zcmc&$dsGuw9v&h^z%A&)VO>hsG3Y^%NoFR=WHK5A0s?Bnvz14AOlBqzNit~?B(O?F zsz**;YYVMP(So>2J!@MERTLyz&w>bQU8?Q6RuKiM*kVOdJZg8stJ*`mp8m5rXI}Sy z_xpXn-~H~rDNRttyy)rg2>`&0aj{WJ+%ufJKzBFpzI$iUo7}_09GhkZfEhl{%LS;Y zoDBeOr}QbQwp8T`f?|yVl4jM6z-}~iXaHEe#BL_3T*d~f8Li$V=MOeH_@JJa^H)lg zu+pqxbo$sr3zJ-^N}&pKDH+XQ5(X}|6C8n&v5}zNXfRm`yPQADOK|VbW+5LOh1hcC z{0L`2FjbiVDp(5xN(2~0Az}$Al?f0`B$mlSK@>)CA&d(V5rklb7$#5@9RKmTXck&S zBt>v#!)S1t5;6wH z$e3(a4vS1;%{tb`T6OHNP)~M06M!qNQaKr8N-aj?WC*J*dNr5EctNH_TT=?mj4+9@ zvUwJYiC)dg40L8=CKMKiw6T^HmNiUFRKkR0P@!;6j0{|`Qg5Q!d~5JiW0)w?#>n|7 zj3N*$f?!z+iV_G;h{X$GoPgmmsFJ1inu4jIsDyw;&pw0pJ19IG_1u)ayjdb zq?QqyO<7askjW7~!6ht#>2}Fs+Y6usj5=cffQVhpXDWX9q*y1gEZcUPgr&*n< zXpT`Mm5C4$M}bL2C?rC}I7Euo2t;YbYMh2q5w1p^&L1@s5v#Xy(_ApVmXev*$KMQk zaMV8pNjcYroKHCo!O;BiX8jcPc&^Cf%gp>vZRvzqXiE*$N9YD4CxbF_)u<(;pS#|!r{c|b8Hu2dH8`1#>z z$vyy>RvH%-k)pfYo0bvppE$EG=3a#7Ey2P_BD7GoMzDoavN`w2HZJCmwjU&f#F+ zdaxq$$_8E-(73E01HNo*X*t+?^X4hPIt&BKJDBZzN3vVpfUA8yUu`(YbNwSSXE|{4 z@rKPWOm`35P=^A%^17=4TA}{%q}lMpndn{jJ!Vfe(-UW0Yo3+Eu4QN4v zR%*QK^Xwb9X6`CE=F%f^&GrtM-YDOU4Zer<;z8>Q+(+J9I{gf<#LJ5pUtK&m!m;tn ztvNWr%b0Etu3WpUI&)J^y`RDwcVcaz{p(0W4iF-m^_5?bjtRuGUg5a_=Y0>&Jy+~f zD_F3=;dyOMW?LFkGzi>oxH$v3H~;({;05_YSC!`~5a>oNz+(BHc<*k%ru_5y1CmRH z+uvXw^}AGM6+cPc5+71iz=8vd43CxuE6>hbd-&_E%h`&z1AxmjZl4~?TK`h$z#<9N zpmJ-s&id(6&VIp2CH}>qythij-O7+hp2`b1fFD)mf2az1cUtJ#k(cLZ--lf7f9;6x z{LXI#d)S;&zUXYxU=Zz<)4e6k^}5fseeKbvEp&M0-Iy$o;nhC6>%I+l{QWyZiuN98 z*jBoG=ihqN%iG#7i&c)W7Tl^c_g;|STX8v#~HPL+VgUEd|qrX3}{*=M> zbn~jF$HzNeH}7_x9%yrfO z5eSK}tFw;YEAM@nT>D8sUU?`|o$K##tT=H=b*#Z2(K+zXd0scZnEh&dA^W{K(C6T{ zPb@*jfdh9Pjx}`C@W?^0p=-VuKPb~>bf@$M>e8}6_pV|8g#ksK!QM}f9?Mp}-}O#) T-)mLQKa_FNs;G}6bJqVCpETxV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/moreboots/textures/models/armor/sponge_layer_1.png b/src/main/resources/assets/moreboots/textures/models/armor/sponge_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..dd4927881d78410a8aa20e4c1cbf9cfeea686ccc GIT binary patch literal 2153 zcmbVO2~ZPP7+#QDq!x4pm9i{YTQS+}CP13 z@);OG8M(NIQj=Vp(afR&AU57+#)({#0o7!V-Xw*GlnHb&;%X|7 z5kst{gDx1&PFfQ^6ec!cunjlE2$$z@X#l7poH%oy#W0{;L%^hgG?FHUX0eD9Yt~T= zMeC@)p>`g>rGO2sT<+BIPFsvdrwW=$&S%{i3dlRrbY_8>gfmE*%Cit;az1Njn8O=0 zCbf__Ls>E@$}oIU>BA<2QmNx&MBpb%y-7n^=}+H~A(L>16hkNvML0Y@hbPKJQ4A4c z0zm{%i1B!XP&uX1YYW~5MG-9WZ77>H8l1uZ6|5mJEoCv{tj~HQoH?RkEMoJ4T-}Y4&0ZhN@>4xo~J@(1QaRgW-gu62uVUNC8p<4Q=b+I|75WRvpQb z{zG02!e~m%SaA!Pki$mnzoZ__+7CO*cF-00uU-zEy;0)BaJFwamd=L7emGkmX=3}F zg>7iTW!?J#!1bvtDIrtWc6Sb*dsQ;Jv1H2g?UgMXYK%Lkc-^WU{StC_-(D4x7_qvi z@*tL-W@RMfYfvHVPREm!M z38$8Ao_$v3?dGa@4{vm9eihny+6D05 z`xQ`rdFw<;^Qz*HPqb}wot@ILV{)Z$rRP?tYWjS#)!Wr}GIt5F;Z%zHagh6qQdQvi zEg?Lw%!ghFjbY2ey_W~moA@Wa*PcoLeAfK#-f+nZ0`2m3>BAA_hK=qM#GwsM5#H0w zuZ^y;&-JS=42qA-GxP~3A0MA+4E~1ywd;PrNeOG3FN7aIG_Cc=p}Qd zt&7`w=~7j&uhQ7&tH@q{e#WtD_ack7?sj*TOdIE=k|Q$zip{0Ui&S9h^B1`%6pMFV ztN_HHWrwQZ`N-+(R8vnevopZ0TA+|jKU-K@(^7HmNX_-?-|!1f&+mDwYLAt4-d;x@ z=<#Ta`@Q4!`pb(ZcNN!mq)~e&OqLY6ys~vo8nd@gJ@Yx=8jZF$1?y`*T-AhXk)g30j&Aub+Jed8gBIkxZAkNdP{`|7i zcI2jfZ2QE5M0L+<?QI}I;h)G($@`~WHGxwD|TBj{O{XHmUiw(Hqg zP;0jyy^t@G0g}#!24jey-J=qCdH1O_=8xj|(jWK7mxSEtf7Cd#N}&jGD{5JA`3bTI z2~NvkW`(@Y>wk=X=rYxccs{7g8b!j^*X9!Ou3tl|ed^09jvndl<=VSmJ-YtlMA}-Q zbIO+BQV&&W;S(k__KU4l+!6m{i5~m|Uwt5?FB!z4=O8LTcpFvh2D*|A2Kl?USk!q