From 57d24ab3a6ef7c23fa7fd7c238e423bb5d52f8c1 Mon Sep 17 00:00:00 2001 From: Forstride Date: Wed, 24 Jul 2019 01:58:38 -0400 Subject: [PATCH] Fixed reed/watergrass/mangrove root item placement (Again...), removed sweet berry bushes from Orchards --- .../common/biome/overworld/OrchardBiome.java | 1 - .../common/item/ItemWaterPlant.java | 7 +++++-- .../textures/blocks/redwood_door_top.png | Bin 377 -> 532 bytes .../biomesoplenty/textures/items/dead_door.png | Bin 224 -> 242 bytes .../textures/items/ethereal_door.png | Bin 243 -> 252 bytes .../textures/items/hellbark_door.png | Bin 224 -> 240 bytes .../textures/items/jacaranda_door.png | Bin 242 -> 242 bytes .../textures/items/mahogany_door.png | Bin 264 -> 242 bytes .../biomesoplenty/textures/items/palm_door.png | Bin 251 -> 242 bytes .../textures/items/redwood_door.png | Bin 231 -> 253 bytes .../textures/items/umbran_door.png | Bin 216 -> 242 bytes .../textures/items/willow_door.png | Bin 314 -> 242 bytes 12 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java index eb043cfd7..15aa2de8f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java @@ -56,7 +56,6 @@ public class OrchardBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.RANDOM_SELECTOR, new MultipleRandomFeatureConfig(new Feature[]{BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F}, BOPBiomeFeatures.FLOWERING_OAK_TREE, IFeatureConfig.NO_FEATURE_CONFIG), Placement.COUNT_EXTRA_HEIGHTMAP, new AtSurfaceWithExtraConfig(2, 0.3F, 1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(BOPBiomeFeatures.MEADOW_FLOWERS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(15))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(new StandardGrassFeature(NoFeatureConfig::deserialize), IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.SWEET_BERRY_BUSH, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(2))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.ROSE_BUSH.getDefaultState()), Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.bush.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(8))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.REED, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); diff --git a/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java b/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java index 837454887..fc1ab82d3 100644 --- a/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java +++ b/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java @@ -1,5 +1,6 @@ package biomesoplenty.common.item; +import biomesoplenty.api.block.BOPBlocks; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -54,11 +55,13 @@ public class ItemWaterPlant extends BlockItem BlockState blockstate = worldIn.getBlockState(blockpos); Material material = blockstate.getMaterial(); IFluidState ifluidstate = worldIn.getFluidState(blockpos); - if ((ifluidstate.getFluid() == Fluids.WATER || material == Material.ICE) && worldIn.isAirBlock(blockpos1)) { + Block ground = worldIn.getBlockState(blockpos.down()).getBlock(); + if ((ifluidstate.getFluid() == Fluids.WATER || material == Material.ICE) && worldIn.isAirBlock(blockpos1) && (ground == Blocks.DIORITE || ground == Blocks.GRANITE || ground == Blocks.ANDESITE || ground == Blocks.STONE || ground == Blocks.DIRT || ground == Blocks.COARSE_DIRT || ground == Blocks.GRASS_BLOCK || ground == Blocks.GRAVEL || ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.mud || ground == BOPBlocks.dried_sand)) + { // special case for handling block placement with water lilies net.minecraftforge.common.util.BlockSnapshot blocksnapshot = net.minecraftforge.common.util.BlockSnapshot.getBlockSnapshot(worldIn, blockpos1); - worldIn.setBlockState(blockpos1, Blocks.LILY_PAD.getDefaultState(), 11); + worldIn.setBlockState(blockpos1, this.getBlock().getDefaultState(), 11); if (net.minecraftforge.event.ForgeEventFactory.onBlockPlace(playerIn, blocksnapshot, net.minecraft.util.Direction.UP)) { blocksnapshot.restore(true, false); return new ActionResult(ActionResultType.FAIL, itemstack); diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png index e38f047db825a527c687cac35da5331f73d04aee..a9cfe8da89521dc8dcb52a5972cbd725733bcc8f 100644 GIT binary patch delta 483 zcmV<90UZAM0+a-hBnkm@Qb$4nuFf3kks%v@!2kdb!2!6DYwZ940jWtuK~y+TO_EPa zBViE5yE_^&O&cXfRK$fOpty1+WG9HTn9XeF3bW8lcnNQyM-WdSh#*;r1ewtpgQ#e9 zk`C!^laBHC<%PB%Un=#Fs(MvzAN{OYmNh+-Lki9R0W$3Yavq*vkMVc$w_ft|US`mL z?%RJ}Tcv{0@BCIP2wuXTOhT9>J5(x8j^i?QhLBD;pUX9ZZsNo&x)}#!$(xin4QdB|Hv35Lu9(PJd#eOVn_?b$fGs-TET@6GoY)R{LW5z1tBzm!VGH7oN$}X zWpSb?0T>Qcq8$&SDk-R>mP3>@%4NQPugqUQyfng|99MF$V8~>22Yw<4G|5M&sh2*ea?GXqG?LQ@qMPhmAV;3jNN`0?stkh> z(>9s#d3*O}YwxW5!{k|3=C@PWbbEd`UT`P60~^vCb5pF91t4#mL0l~NPYzate`Hr5 Z+n*)c08a_{Gd}1o;AxB#|)~f5HF&4#EKyC`y0;000aSL z05la=0M?ka$LUbOTiOKJYXx97kpZ9t)O8)bfD6qApw{6`K-;!Xt9S#~z_iq^#ZLfF zilq^$WH8;(13p6;shB9QsPoUtP$?I33TQH_(gr^YazmM_Vt}i(0jqq2k&3oln4c7Y z(~*ZCfHN7;(gmX|zyhUF z05)5fEtv=9p#rQf;OFOqV;Da(y8w*Q0mWXxYQV>jpWql99~odx2iUxT%tr<&2Iv_o t+dx^w1B$(XkrJUyykO&&olt!Y3;=N_P&F4JgkAsu002ovPDHLkV1n31OlJT9 delta 175 zcmeyw_<(VO%0xqn`ojzie1{p2=dVa%U|^6aag8Vm&QB{TPb^AhC`ioAE78kKEm1Jh zGt@IpagPWBs)_S-aSXBWPnL)|aR2z<`qE52N1o6=&IC4xoe2&d{Y)xHTr`Xm9_)26 zW!{h&@FRg+S%krO!Rn<_eH%Y6JY~pul}DikM4#z@VYcYADv){bKs93ugQ3JK84d{v ZhVoAK*rh3JuL7-N@O1TaS?83{1OP+sKQ#aV diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png b/src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png index eb5b6a54825396d666ebcd35a4af6627afb37735..91c309df38d46b59cb21ffa0294620dacd5291c7 100644 GIT binary patch delta 187 zcmV;s07U=u0sH}wNq@lr01m+cxRGn^0001yNkl*y##dALD+>q15-lYs?FqX1+Djn(o0(fLp&7@&9|EhQbwA|4DfFOUO>_JWm#8<;+J zVi$@FvATepmkW+z{EJtQfH69t*b7(<`1<)99Ao1n1FY!)n=}`Y`N#mpfLU{9LRrKE pioJjljZh|DuzKSmXf!e~001o`Roj1n>cRj3002ovPDHLkV1ieXOnU$T delta 178 zcmV;j08Rh=0rLTnNq@os01m75#2^~KC&JZ0|wp; gAOncO2t8>G0CIIR3O=GBs{jB107*qoM6N<$g6~s4{{R30 diff --git a/src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png b/src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png index 0efbb7def337c2f44e4bf7bdc9af888c216e381d..d1e04c550caafba15c48331a4d4e7bd610da03f2 100644 GIT binary patch delta 189 zcmV;u07C!Z0q_BkBnkm@Qb$4nuFf3kks%v@!T+7 r2JwJmFJMF?l!+JIfA$orkAVRI(C|k_#l^TG00000NkvXXu0mjfknl;i delta 175 zcmeys_<(VO%0xqn`ojzie1{p2=dVa%U|^6aag8Vm&QB{TPb^AhC`ioAE78kKEm1Jh zGt@IpagPWBs)_S-aSXBWPnL*r2=w~3f8#PWN1o6=&IC4xoe2&d{Y*Pl;70GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3 zR|8P6-P6S}#KJ#WqTm3>(t`_BO#kiQyOeWEyYvsWr;A=RGf!Zg{oMB-|I;Q$MLXds zY|UGvuQ@~>X?A?ZTExIT#f|Ys&e_%L8a@RuhKYA{`g0sM?Af36EXTl&U8I_EHRJkw zds>roYEl|ZWfML#8Ocj7kPvty%#ax*2AYbv|=#;mJW~sp`=aSq|CrT*vaSs03ftBz{xIG Qa{vGU07*qoM6N<$g8ZCUJOBUy diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png b/src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png index c19a2af6caba44ea7ca6231724f25c29a53652a4..87f8f406aa9d4e37d7d1ea4e5a0f6f07a96178e1 100644 GIT binary patch delta 214 zcmV;{04e{70`dWnB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic z000ic0Tn1pfB*mhhe5f Qr~m)}07*qoM6N<$g3A|BP5=M^ delta 236 zcmV_0M}Bm?kiLIy;qgOVMaDKntQ!GsSo{11!)aDFf|@*W84xTf!C)XRNRkVv m>jee|28IhyUJ}%V>;(Y74>B2k4tw|j0000WSR^8f$< delta 223 zcmV<503iSJ0s8@vB!3BTNLh0L01m?d01m?e$8V@)00023Nkl8|20Jxctdqfk;Q*xJuKK1O-nI{v$N)$#1KOUSPc;4V_1Z{Voi|+J_ivWh>e@C zGBj?!N}LOLgt#!oy5mh57#J8BzP$TJo(pgR+N1-r4M=cMCD{P1fruVZBpLAV^DmNI Z007v_OmdN5o{j(j002ovPDHLkV1jLNT73Wj diff --git a/src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png b/src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png index 16f713cdf23cc72fd2a498af0495f05660c017ec..9820916af2fc031df693893746ed4c53a1debe56 100644 GIT binary patch delta 225 zcmV<703QG60sR4xB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib z000ib0l1NC?EnA(l1W5CR5(v#7;wM{rNJOxU-rMfnlPCC;rnj}0Zvw|?4m7K;rf`M zG}!>ffJ3j|L0QBD6a(zUguqS&VRV2?9K#DBzask=rU_Xb8Cu{C16-Pr0nvfjeB?G5 zqXVK1sI^fAV|0Mm09*lw45%9hpmc!CR$SsJ27uB5E?aSl6CH@S07hnlGVy|i7av3Q bF)#oCnfE~(q>aGF00000NkvXXu0mjfDCAY# delta 203 zcmV;+05t#o0p|gbB!3BTNLh0L01m?d01m?e$8V@)0001)NkleWm|ul7a*^mG3yqNVE&YCHU~lqZqL7#VZWWi3<-f-g^F?I0Kv{#0WVE zzX9mr<%>@YNqUNS!-ZfN5DHYHqjARhn+!9~-^37S!J-yx$VAtBnldmjK)gkk3vdCf zE43UkU|?Wiz?W>X0RY3vD=d7EzWo3I002ovPDHLk FV1gF$SCRk# diff --git a/src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png b/src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png index abbff5963e6c97178e078c6a590d1af9711afeb6..f9177ddc44c6b2896f87954acb2db9bbffbc2a9c 100644 GIT binary patch delta 214 zcmV;{04e|20rCNmB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic z000ic0Tn1pfB*mhhe^rd;s*iyI09BYzF9l%G QRsaA107*qoM6N<$f_Dy5y8r+H delta 188 zcmV;t07L)s0oVbMB!3BTNLh0L01m?d01m?e$8V@)0001rNkl}L7;3Pip{pRwhV_4AI2R93=9km?=>D{h5|rvK<&= qLnIyG1Jv~b0|NuYljn~}G5`S2c_@yb@hNct00000mWXx zYQV?$pWzrA9~odx2iUxT%tr<&2AI29Ls`TFioJl55}{1IV8y~+P<;#x0LT(ii+X9V Q=l}o!07*qoM6N<$f}#;p)&Kwi delta 287 zcmV+)0pR}f0lET^B!3BTNLh0L01m?d01m?e$8V@)0002&Nkl1*a?OF}IVCiAg_GsFEQEVizebyuL>3o1IYqcaY5`TE_^+1lJ5Jl<~0K`!! zPO_1dZ`Vp?c|yBmfFgCuSWT-FaCcYMD$5gMvo3c-(kiniGC9i=dUYQZsZ&{=5CC+K zYF&W4N_QfR)x^8{0^HqLOZITF$cbhzglmdde*vv5a{K6%!B7AI002ovPDHLkV1g~6eE|Rf