From 3aff68ec9d0fde4fbad70e088b76d00a5a28fcff Mon Sep 17 00:00:00 2001 From: supermassimo Date: Mon, 7 Jun 2021 14:21:36 -0300 Subject: [PATCH] added Cobweb Leaves properties --- build.gradle | 2 +- .../therealeststu/dtbop/DTBOPRegistries.java | 8 +- .../blocks/leaves/CobwebLeavesProperties.java | 53 +++++++++ .../trees/dtbop/jo_codes/infested.txt | 112 ++++++++++++++++++ .../resources/trees/dtbop/jo_codes/silk.txt | 112 ++++++++++++++++++ .../dtbop/leaves_properties/dark_poplar.json | 2 +- .../trees/dtbop/leaves_properties/poplar.json | 3 +- .../trees/dtbop/leaves_properties/silk.json | 1 + .../leaves_properties/spruce_poplar.json | 3 +- .../trees/dtbop/world_gen/default.json | 62 ++++++++++ .../trees/dtbop/world_gen/default_.json | 26 ---- 11 files changed, 351 insertions(+), 33 deletions(-) create mode 100644 src/main/java/therealeststu/dtbop/blocks/leaves/CobwebLeavesProperties.java create mode 100644 src/main/resources/trees/dtbop/jo_codes/infested.txt create mode 100644 src/main/resources/trees/dtbop/jo_codes/silk.txt create mode 100644 src/main/resources/trees/dtbop/world_gen/default.json delete mode 100644 src/main/resources/trees/dtbop/world_gen/default_.json diff --git a/build.gradle b/build.gradle index fd3b6505..028b1368 100644 --- a/build.gradle +++ b/build.gradle @@ -99,7 +99,7 @@ dependencies { // Compile Dynamic Trees, of course. //implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-${config.mc_version}:${config.dynamic_trees_version}") - implementation fg.deobf("blank:DynamicTrees-1.16.5:0.10.0-Beta14") + implementation fg.deobf("blank:DynamicTrees-1.16.5:0.10.0-Beta14.8") // Compile Dynamic Trees Plus runtimeOnly fg.deobf("com.ferreusveritas.dynamictreesplus:DynamicTreesPlus-${config.mc_version}:${config.dynamic_trees_plus_version}") diff --git a/src/main/java/therealeststu/dtbop/DTBOPRegistries.java b/src/main/java/therealeststu/dtbop/DTBOPRegistries.java index 04568a5c..f13e1741 100644 --- a/src/main/java/therealeststu/dtbop/DTBOPRegistries.java +++ b/src/main/java/therealeststu/dtbop/DTBOPRegistries.java @@ -1,9 +1,13 @@ package therealeststu.dtbop; import biomesoplenty.api.block.BOPBlocks; +import com.ferreusveritas.dynamictrees.DynamicTrees; import com.ferreusveritas.dynamictrees.api.cells.CellKit; import com.ferreusveritas.dynamictrees.api.registry.TypeRegistryEvent; import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; +import com.ferreusveritas.dynamictrees.blocks.leaves.PalmLeavesProperties; +import com.ferreusveritas.dynamictrees.blocks.leaves.SolidLeavesProperties; +import com.ferreusveritas.dynamictrees.blocks.leaves.WartProperties; import com.ferreusveritas.dynamictrees.blocks.rootyblocks.RootyBlock; import com.ferreusveritas.dynamictrees.growthlogic.GrowthLogicKit; import com.ferreusveritas.dynamictrees.systems.DirtHelper; @@ -15,6 +19,7 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import therealeststu.dtbop.blocks.leaves.CobwebLeavesProperties; import therealeststu.dtbop.cells.DTBOPCellKits; import therealeststu.dtbop.genfeature.AlternativeLeavesGenFeature; import therealeststu.dtbop.genfeature.DTBOPGenFeatures; @@ -40,7 +45,8 @@ public static void onCellKitRegistry (final com.ferreusveritas.dynamictrees.api. } @SubscribeEvent - public static void registerLeavesPropertiesTypes (final TypeRegistryEvent event) { + public static void registerLeavesPropertiesTypes(TypeRegistryEvent event) { + event.registerType(new ResourceLocation(DynamicTreesBOP.MOD_ID, "cobweb"), CobwebLeavesProperties.TYPE); } @SubscribeEvent diff --git a/src/main/java/therealeststu/dtbop/blocks/leaves/CobwebLeavesProperties.java b/src/main/java/therealeststu/dtbop/blocks/leaves/CobwebLeavesProperties.java new file mode 100644 index 00000000..2826350e --- /dev/null +++ b/src/main/java/therealeststu/dtbop/blocks/leaves/CobwebLeavesProperties.java @@ -0,0 +1,53 @@ +package therealeststu.dtbop.blocks.leaves; + +import com.ferreusveritas.dynamictrees.api.registry.TypedRegistry; +import com.ferreusveritas.dynamictrees.blocks.leaves.DynamicLeavesBlock; +import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; +import com.ferreusveritas.dynamictrees.blocks.leaves.SolidLeavesProperties; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.LeavesBlock; +import net.minecraft.block.SoundType; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.IWorldReader; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; +import net.minecraftforge.common.util.ForgeSoundType; + +import javax.annotation.Nullable; + +public class CobwebLeavesProperties extends LeavesProperties { + public static final TypedRegistry.EntryType TYPE = TypedRegistry.newType(CobwebLeavesProperties::new); + + public CobwebLeavesProperties(ResourceLocation registryName) { + super(registryName); + } + + protected String getBlockRegistryNameSuffix() { + return "_web"; + } + + @Override + protected DynamicLeavesBlock createDynamicLeaves(AbstractBlock.Properties properties) { + return new DynamicLeavesBlock(this, properties){ + + @Override + public void fallOn(World world, BlockPos pos, Entity entity, float fallDistance) {} + + @Override + public void entityInside(BlockState state, World world, BlockPos pos, Entity entity) { + entity.makeStuckInBlock(state, new Vector3d(0.25D, 0.05F, 0.25D)); + } + + @Override + public SoundType getSoundType(BlockState state, IWorldReader world, BlockPos pos, @Nullable Entity entity) { + return new ForgeSoundType(1.0F, 1.0F, ()->SoundEvents.VINE_STEP, ()->SoundEvents.VINE_STEP, ()->SoundEvents.VINE_STEP, ()->SoundEvents.GRASS_HIT, ()->SoundEvents.VINE_STEP); + } + + }; + } +} diff --git a/src/main/resources/trees/dtbop/jo_codes/infested.txt b/src/main/resources/trees/dtbop/jo_codes/infested.txt new file mode 100644 index 00000000..f82b0055 --- /dev/null +++ b/src/main/resources/trees/dtbop/jo_codes/infested.txt @@ -0,0 +1,112 @@ +2:JJJ0JR7Jxx+nXv +2:JJJ0Jxx769JxPX +2:JJJJJx+Xz+nv +2:JJJJOOP07+vU +2:JJJJOOP17+j6v +2:JJJJOR+Z+h9P +2:JJJJOR+mPfuPf +2:JJJJxOP0+vz69Z +2:JJJJxxx+X187+Xj +2:JJJJxxx+Xvz86 +2:JJJJxxx+Xz98+fqP +2:JJJORxx987Jx+nv +2:JJORJOP097JJx+nv +2:JJOROOZ8PvhLJ +2:JJRJOOP178 +2:JJRJOOP18707 +3:JJJOJxx6+uvX0nb6UP +3:JJJOOOOP0+fXuvfSPbh +3:JJJOOOOP07+uvfWnXnbJ +3:JJJOOWJ68xPz8+bOPvtOPf +3:JJJOWPXzP0OOPy+fvj9uOPXb +3:JJOJOOWPXuPz9+bx88XkJzPX +3:JJxJJOP1+fXtJJx+fX +3:JJxJOOOP0+vfS+mh6XbvtJJP +3:JJxJOOOP069vb8hJOPX +3:JJxxJxWPv00x76+vb9pLx86RJN +3:JOJOJOOP0+vXb9pJ8hJOePfS +3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 +3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 +3:JOORLJx+XvtJOXePfkJJxx67f +3:JORJJxx+XvnZJJOPz+nv +3:JORJxxxx+XfvV9pfmMJJPbJJP +4:JJJOJxx+Xz89v0hPtuPf +4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv +4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ +4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 +4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN +4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK +4:JOJJxxOP0+vz68h7ZPSKJJ +4:JOJOJxxx+Xf0z89vbPSJntJpOPX +4:JOJOOOOK+f186t86WPnkxOPy88 +4:JOJx0xP076xJnS+qpx16779ZZ17 +4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff +4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP +4:JOOOOOOP0nvz6i9+fU8mbPU7v +4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b +4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ +4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv +5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 +5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 +5:JOJxJOR+Z+h9x96RRPSWWJ9XhM +5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ +5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf +5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 +5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 +5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX +5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 +5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX +5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX +5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R +5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 +5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf +5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK +5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 +6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv +6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff +6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp +6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv +6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff +6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ +6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR +6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX +6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv +6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX +6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP +6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP +6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q +6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP +6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r +6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t +7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 +7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P +7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P +7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 +7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt +7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf +7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 +7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn +7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin +7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z +7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv +7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv +7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn +7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 +7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn +7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v +8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 +8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX +8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv +8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 +8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ +8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf +8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn +8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 +8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH +8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f +8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv +8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf +8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 +8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n +8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf +8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/jo_codes/silk.txt b/src/main/resources/trees/dtbop/jo_codes/silk.txt new file mode 100644 index 00000000..f82b0055 --- /dev/null +++ b/src/main/resources/trees/dtbop/jo_codes/silk.txt @@ -0,0 +1,112 @@ +2:JJJ0JR7Jxx+nXv +2:JJJ0Jxx769JxPX +2:JJJJJx+Xz+nv +2:JJJJOOP07+vU +2:JJJJOOP17+j6v +2:JJJJOR+Z+h9P +2:JJJJOR+mPfuPf +2:JJJJxOP0+vz69Z +2:JJJJxxx+X187+Xj +2:JJJJxxx+Xvz86 +2:JJJJxxx+Xz98+fqP +2:JJJORxx987Jx+nv +2:JJORJOP097JJx+nv +2:JJOROOZ8PvhLJ +2:JJRJOOP178 +2:JJRJOOP18707 +3:JJJOJxx6+uvX0nb6UP +3:JJJOOOOP0+fXuvfSPbh +3:JJJOOOOP07+uvfWnXnbJ +3:JJJOOWJ68xPz8+bOPvtOPf +3:JJJOWPXzP0OOPy+fvj9uOPXb +3:JJOJOOWPXuPz9+bx88XkJzPX +3:JJxJJOP1+fXtJJx+fX +3:JJxJOOOP0+vfS+mh6XbvtJJP +3:JJxJOOOP069vb8hJOPX +3:JJxxJxWPv00x76+vb9pLx86RJN +3:JOJOJOOP0+vXb9pJ8hJOePfS +3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 +3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 +3:JOORLJx+XvtJOXePfkJJxx67f +3:JORJJxx+XvnZJJOPz+nv +3:JORJxxxx+XfvV9pfmMJJPbJJP +4:JJJOJxx+Xz89v0hPtuPf +4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv +4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ +4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 +4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN +4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK +4:JOJJxxOP0+vz68h7ZPSKJJ +4:JOJOJxxx+Xf0z89vbPSJntJpOPX +4:JOJOOOOK+f186t86WPnkxOPy88 +4:JOJx0xP076xJnS+qpx16779ZZ17 +4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff +4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP +4:JOOOOOOP0nvz6i9+fU8mbPU7v +4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b +4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ +4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv +5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 +5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 +5:JOJxJOR+Z+h9x96RRPSWWJ9XhM +5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ +5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf +5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 +5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 +5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX +5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 +5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX +5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX +5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R +5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 +5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf +5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK +5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 +6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv +6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff +6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp +6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv +6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff +6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ +6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR +6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX +6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv +6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX +6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP +6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP +6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q +6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP +6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r +6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t +7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 +7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P +7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P +7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 +7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt +7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf +7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 +7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn +7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin +7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z +7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv +7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv +7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn +7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 +7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn +7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v +8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 +8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX +8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv +8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 +8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ +8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf +8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn +8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 +8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH +8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f +8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv +8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf +8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 +8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n +8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf +8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/leaves_properties/dark_poplar.json b/src/main/resources/trees/dtbop/leaves_properties/dark_poplar.json index 7159946a..9b4dcca4 100644 --- a/src/main/resources/trees/dtbop/leaves_properties/dark_poplar.json +++ b/src/main/resources/trees/dtbop/leaves_properties/dark_poplar.json @@ -1,6 +1,6 @@ { "primitive_leaves": "minecraft:dark_oak_leaves", - "cell_kit": "dtbyg:poplar", + "cell_kit": "dtbop:poplar", "smother": 9, "light_requirement": 13 } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/leaves_properties/poplar.json b/src/main/resources/trees/dtbop/leaves_properties/poplar.json index 26dbe0e3..513dd47f 100644 --- a/src/main/resources/trees/dtbop/leaves_properties/poplar.json +++ b/src/main/resources/trees/dtbop/leaves_properties/poplar.json @@ -1,7 +1,6 @@ { "primitive_leaves": "minecraft:birch_leaves", - "cell_kit": "dtbyg:poplar", - "color": "@birch", + "cell_kit": "dtbop:poplar", "smother": 9, "light_requirement": 13 } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/leaves_properties/silk.json b/src/main/resources/trees/dtbop/leaves_properties/silk.json index 6abc3b71..6afb9f57 100644 --- a/src/main/resources/trees/dtbop/leaves_properties/silk.json +++ b/src/main/resources/trees/dtbop/leaves_properties/silk.json @@ -1,4 +1,5 @@ { + "type": "dtbop:cobweb", "primitive_leaves": "cobweb", "cell_kit": "dtbop:sparse" } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/leaves_properties/spruce_poplar.json b/src/main/resources/trees/dtbop/leaves_properties/spruce_poplar.json index 702475df..b57f6818 100644 --- a/src/main/resources/trees/dtbop/leaves_properties/spruce_poplar.json +++ b/src/main/resources/trees/dtbop/leaves_properties/spruce_poplar.json @@ -1,7 +1,6 @@ { "primitive_leaves": "minecraft:spruce_leaves", - "cell_kit": "dtbyg:poplar", - "color": "@spruce", + "cell_kit": "dtbop:poplar", "smother": 9, "light_requirement": 13 } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/world_gen/default.json b/src/main/resources/trees/dtbop/world_gen/default.json new file mode 100644 index 00000000..cb93551c --- /dev/null +++ b/src/main/resources/trees/dtbop/world_gen/default.json @@ -0,0 +1,62 @@ +[ + { + "__comment": "Cancel standard tree features from the overworld.", + "select": { "name": "biomesoplenty.*", "type": "overworld" }, + "cancellers": { + "type": "tree", + "namespace": "biomesoplenty" + } + }, + + { + "select": { "name": "biomesoplenty:tropics" }, + "apply": { + "species" : { + "random" : { + "dtbop:palm" : 3, + "dtbop:flowering_oak_bush" : 1, + "dtbop:jungle_twiglet" : 1 + } + }, + "density": [ 5 ], + "chance": 1.0, + "forestness" : 0.5 + } + }, + + { + "select": { "name": "biomesoplenty:silkglade" }, + "apply": { + "species" : { + "random" : { + "dtbop:dead" : 4, + "dtbop:poplar" : 2, + "dtbop:infested" : 1, + "dtbop:oak_bush" : 1, + "dtbop:infested_bush" : 1, + "swamp_oak": 1 + } + }, + "density": [ 1 ], + "chance": 0.8, + "forestness" : 0.2 + } + }, + { + "select": { "name": "biomesoplenty:silkglade_nest" }, + "apply": { + "species" : { + "random" : { + "dtbop:dead" : 1, + "dtbop:silk" : 2, + "dtbop:infested" : 1, + "dtbop:silk_bush" : 4, + "dtbop:infested_bush" : 3 + } + }, + "density": [ 2 ], + "chance": 1, + "forestness" : 0.2 + } + } +] \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/world_gen/default_.json b/src/main/resources/trees/dtbop/world_gen/default_.json deleted file mode 100644 index dec53920..00000000 --- a/src/main/resources/trees/dtbop/world_gen/default_.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "__comment": "Cancel standard tree features from the overworld.", - "select": { "name": "biomesoplenty.*", "type": "overworld" }, - "cancellers": { - "type": "tree", - "namespace": "biomesoplenty" - } - }, - - { - "select": { "name": "biomesoplenty:tropics" }, - "apply": { - "species" : { - "random" : { - "dtbop:palm" : 3, - "dtbop:flowering_oak_bush" : 1, - "dtbop:jungle_twiglet" : 1 - } - }, - "density": [ 5 ], - "chance": 1.0, - "forestness" : 0.5 - } - } -] \ No newline at end of file