From e33525cd99c55bcb47d18e1e04fe55bbbdac6c9b Mon Sep 17 00:00:00 2001 From: Forstride Date: Tue, 7 Jul 2020 06:23:02 -0400 Subject: [PATCH] Added recipe for Nether Crystal Blocks, tweaked cattail textures --- .../common/biome/nether/UndergardenBiome.java | 1 + .../biome/nether/VisceralHeapBiome.java | 1 + .../biomesoplenty/textures/block/cattail.png | Bin 356 -> 386 bytes .../textures/block/tall_cattail_bottom.png | Bin 306 -> 362 bytes .../textures/block/tall_cattail_top.png | Bin 346 -> 368 bytes .../building_blocks/nether_crystal_block.json | 32 +++++++++ .../blocks/nether_crystal_block.json | 61 ++++++++++++++++-- .../recipes/nether_crystal_block.json | 15 +++++ 8 files changed, 103 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/nether_crystal_block.json create mode 100644 src/main/resources/data/biomesoplenty/recipes/nether_crystal_block.json diff --git a/src/main/java/biomesoplenty/common/biome/nether/UndergardenBiome.java b/src/main/java/biomesoplenty/common/biome/nether/UndergardenBiome.java index f9d5cfdc1..d4d67399e 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/UndergardenBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/UndergardenBiome.java @@ -62,6 +62,7 @@ public class UndergardenBiome extends NetherBiomeBOP //Entities this.addSpawn(EntityClassification.MONSTER, new SpawnListEntry(EntityType.GHAST, 50, 4, 4)); this.addSpawn(EntityClassification.MONSTER, new SpawnListEntry(EntityType.MAGMA_CUBE, 2, 4, 4)); + this.addSpawn(EntityClassification.MONSTER, new Biome.SpawnListEntry(EntityType.HOGLIN, 9, 3, 4)); this.addSpawn(EntityClassification.CREATURE, new SpawnListEntry(EntityType.STRIDER, 60, 1, 2)); this.addWeight(BOPClimates.NETHER, 10); diff --git a/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java b/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java index 893d5442e..ce71ce560 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java @@ -10,6 +10,7 @@ import net.minecraft.client.audio.BackgroundMusicTracks; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluids; +import net.minecraft.particles.ParticleTypes; import net.minecraft.util.SoundEvents; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cattail.png b/src/main/resources/assets/biomesoplenty/textures/block/cattail.png index e7c88fc43a55e1e0e14ef4643e2a17fd984a516f..b45d5cdcdd8420256880dd1bb354b80ddb3a747e 100644 GIT binary patch delta 322 zcmV-I0log@0)hjONq?{a01mJLPRsp10003ONkl64qnST-45M+SvDv-LRhp#ct zWB$Sbq6Pg_{)4^n`|Ur5owAG!FbS|~D1f<2Bue`~$TAR{nTMSLr1|}(JB(lh-YmPy z`1i|CummxHRTwGkVM!8%C319t6oL=J0=~-sg(J04#F5pZC^XBbS^)Ji$G&ilLW~xOBT(BGW z+f2g@$^?>Lr)9bVFM$+PnE}thr7Y3;dN*BxXCMV`qBMK53V)bEnLu*LZl){n5=ene zB&qxlWTMS34OaDwu7kxS55ur9K!cA2>+L?!7e8d8dbg?a*)R{bC#_)#uz;Y7#)yZm z;bj7@5F|;$5}{&_5HV|ksxNKw4&@p$Yg5<<{tu$q2e`MFw*^^SSVE9DO!msg6uz;O_ z1VHG`M@l$v4@C+ip0|5VwC3QtJH{e*YFDN7my;MH2N8?L5r0r@J9#HImkFR7i+v}8 z4v9?QwAsfbiapUUkGoO(si3pBF+gK`vQ~(4kLIM^` zM||6nvL#yUb|io??(uM>pG%}0cCvyT32|+SROUzo1w9JUPu`01+;ZvE|@S j1ptx(TigWXMHWQf0{s60@gTKj00000NkvXXu0mjfql0>2 delta 228 zcmV-R)5DyL_t(IPh))W-~j_Nu;}smf1+dyBb3WvT=z^M5E84zP)V09F@Vn7kM6L{?#l5|9`+LrC@l$c4xN!vL6#*la^~ z84O@`0Z22lVsyih`2@WHax%Kj$b75@U~?)Az`O_p1YLj(2wlbkNCA2%Bil$Y5b*^Z z48Saa$>a0_$S`a!0s)XX%rXoE{(kuhWuXFGE`l3?tN_G@*#a^U#zt2IqEWIlvI2As e=m6pc1_l6;J#rX$j+D9p0000q_E3@FcSkFQ0#5+UxbefOhbh* z0A2$?fR~#S%EAs%48Ug-GC)=bHvpG&KY#rWWkCSCIusY6JNLz>Unn#TAgjX~29mkD za96zf^bN|w4p0n$IrsVG%Z$i|paW!Y!3{un?(et%7T^_>)$WDIo=@$wO0_a{M7zS@XeS@;F0}KO@os12j z%cB^8?&R%PUog&N{=!f>eHA0JII@>8T!8LmW*&AZ3j)yP@qdQFe;XmZQ3?WJrwIxQ zf;k`n(!_Y=9a#L(p+gJ~ZQ=j_?RXC6g8;Jp`}glLT>x@2vdyf*5G61%kUYp>5C#Fb z0mzy_Hoz2s0L)gHn4O&+7=r-Z0FVNhA;_B10n9}(fZ+vn1t0+PGt5?mYZ({-zanuJ ULv_0E00000Ne4wvM6N<$f;bX#4*&oF diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/nether_crystal_block.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/nether_crystal_block.json new file mode 100644 index 000000000..af9341fce --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/nether_crystal_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:nether_crystal_block" + ] + }, + "criteria": { + "has_nether_crystal": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:nether_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:nether_crystal_block" + } + } + }, + "requirements": [ + [ + "has_nether_crystal", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/nether_crystal_block.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/nether_crystal_block.json index 2474bb60c..361f96c50 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/nether_crystal_block.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/nether_crystal_block.json @@ -5,13 +5,60 @@ "rolls": 1, "entries": [ { - "type": "minecraft:item", - "name": "biomesoplenty:nether_crystal_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "biomesoplenty:nether_crystal_block" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2.0, + "max": 4.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + }, + { + "function": "minecraft:limit_count", + "limit": { + "max": 4, + "min": 1 + } + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "biomesoplenty:nether_crystal" + } + ] } ] } diff --git a/src/main/resources/data/biomesoplenty/recipes/nether_crystal_block.json b/src/main/resources/data/biomesoplenty/recipes/nether_crystal_block.json new file mode 100644 index 000000000..caef709a2 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/nether_crystal_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:nether_crystal" + } + }, + "result": { + "item": "biomesoplenty:nether_crystal_block" + } +} \ No newline at end of file