diff --git a/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java b/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java index e0abafdc..c368f1ef 100644 --- a/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java +++ b/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java @@ -59,7 +59,8 @@ public class BlockSmallJellyshroom extends BlockAttached implements IRenderTypea public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { Direction direction = (Direction) state.get(FACING); BlockPos blockPos = pos.offset(direction.getOpposite()); - return sideCoversSmallSquare(world, blockPos, direction) && world.getBlockState(blockPos).isOpaque(); + BlockState support = world.getBlockState(blockPos); + return sideCoversSmallSquare(world, blockPos, direction) && support.isOpaque() && support.getLuminance() == 0; } @Override diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index c20dd69d..2347774a 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -254,6 +254,7 @@ public class EndBlocks { public static final Block TWISTED_VINE = registerBlock("twisted_vine", new BlockVine()); public static final Block BULB_VINE_SEED = registerBlock("bulb_vine_seed", new BlockBulbVineSeed()); public static final Block BULB_VINE = registerBlock("bulb_vine", new BlockBulbVine()); + public static final Block JUNGLE_VINE = registerBlock("jungle_vine", new BlockVine()); // Mob-Related public static final Block SILK_MOTH_NEST = registerBlock("silk_moth_nest", new BlockSilkMothNest()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 33e5ca03..35d64f26 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -89,6 +89,7 @@ public class EndFeatures { public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); public static final EndFeature TWISTED_VINE = new EndFeature("twisted_vine", new VineFeature(EndBlocks.TWISTED_VINE, 24), 3); public static final EndFeature BULB_VINE = new EndFeature("bulb_vine", new VineFeature(EndBlocks.BULB_VINE, 24), 5); + public static final EndFeature JUNGLE_VINE = new EndFeature("jungle_vine", new VineFeature(EndBlocks.JUNGLE_VINE, 24), 5); // Ceil plants public static final EndFeature SMALL_JELLYSHROOM_CEIL = new EndFeature("small_jellyshroom_ceil", new SingleInvertedScatterFeature(EndBlocks.SMALL_JELLYSHROOM, 8), 8); @@ -104,8 +105,8 @@ public class EndFeatures { public static final EndFeature TWISTED_MOSS_WOOD = new EndFeature("twisted_moss_wood", new WallPlantOnLogFeature(EndBlocks.TWISTED_MOSS, 6), 25); public static final EndFeature BULB_MOSS = new EndFeature("bulb_moss", new WallPlantFeature(EndBlocks.BULB_MOSS, 6), 1); public static final EndFeature BULB_MOSS_WOOD = new EndFeature("bulb_moss_wood", new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, 6), 15); - public static final EndFeature SMALL_JELLYSHROOM_WALL = new EndFeature("small_jellyshroom_wall", new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 6), 4); - public static final EndFeature SMALL_JELLYSHROOM_WOOD = new EndFeature("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 6), 8); + public static final EndFeature SMALL_JELLYSHROOM_WALL = new EndFeature("small_jellyshroom_wall", new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 4); + public static final EndFeature SMALL_JELLYSHROOM_WOOD = new EndFeature("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 8); // Water // public static final EndFeature BUBBLE_CORAL = new EndFeature("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 6), 10); diff --git a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java index a5ffe6c2..9506418f 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java +++ b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java @@ -21,6 +21,7 @@ public class BiomeUmbrellaJungle extends EndBiome { .addFeature(EndFeatures.SMALL_JELLYSHROOM_WALL) .addFeature(EndFeatures.SMALL_JELLYSHROOM_WOOD) .addFeature(EndFeatures.SMALL_JELLYSHROOM_CEIL) + .addFeature(EndFeatures.JUNGLE_VINE) .addFeature(EndFeatures.CHARNIA_CYAN) .addFeature(EndFeatures.CHARNIA_GREEN) .addFeature(EndFeatures.CHARNIA_LIGHT_BLUE) diff --git a/src/main/resources/assets/betterend/blockstates/jungle_vine.json b/src/main/resources/assets/betterend/blockstates/jungle_vine.json new file mode 100644 index 00000000..ed2bf59d --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/jungle_vine.json @@ -0,0 +1,16 @@ +{ + "variants": { + "shape=top": [ + { "model": "betterend:block/jungle_vine_middle_1" }, + { "model": "betterend:block/jungle_vine_middle_2" } + ], + "shape=middle": [ + { "model": "betterend:block/jungle_vine_middle_1" }, + { "model": "betterend:block/jungle_vine_middle_2" } + ], + "shape=bottom": [ + { "model": "betterend:block/jungle_vine_bottom_1" }, + { "model": "betterend:block/jungle_vine_bottom_2" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 745046de..e3165444 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -521,5 +521,6 @@ "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss Tall", "block.betterend.umbrella_tree_cluster": "Umbrella Tree Cluster", - "block.betterend.umbrella_tree_cluster_empty": "Empty Umbrella Tree Cluster" + "block.betterend.umbrella_tree_cluster_empty": "Empty Umbrella Tree Cluster", + "block.betterend.jungle_vine": "Jungle Vine" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index d56eb055..0b007db6 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -523,5 +523,6 @@ "block.betterend.twisted_umbrella_moss": "Закрученный зонтичный мох", "block.betterend.twisted_umbrella_moss_tall": "Высокий закрученный зонтичный мох", "block.betterend.umbrella_tree_cluster": "Кластер зонтичного дерева", - "block.betterend.umbrella_tree_cluster_empty": "Пустой кластер хонтичного дерева" + "block.betterend.umbrella_tree_cluster_empty": "Пустой кластер хонтичного дерева", + "block.betterend.jungle_vine": "Лоза джунглей" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/jungle_vine.json b/src/main/resources/assets/betterend/materialmaps/block/jungle_vine.json new file mode 100644 index 00000000..1fc9123d --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/jungle_vine.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/jungle_vine.json b/src/main/resources/assets/betterend/materialmaps/item/jungle_vine.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/jungle_vine.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_1.json b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_1.json new file mode 100644 index 00000000..d0a016af --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/jungle_vine_bottom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_2.json b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_2.json new file mode 100644 index 00000000..0f6531f6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/jungle_vine_bottom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_middle_1.json b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_1.json new file mode 100644 index 00000000..a6761519 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/jungle_vine" + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_middle_2.json b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_2.json new file mode 100644 index 00000000..6c0d14c2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/jungle_vine" + } +} diff --git a/src/main/resources/assets/betterend/models/item/jungle_vine.json b/src/main/resources/assets/betterend/models/item/jungle_vine.json new file mode 100644 index 00000000..24123820 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/jungle_vine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/jungle_vine_bottom" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/jungle_vine.png b/src/main/resources/assets/betterend/textures/block/jungle_vine.png new file mode 100644 index 00000000..8d71387d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/jungle_vine.png differ diff --git a/src/main/resources/assets/betterend/textures/block/jungle_vine_bottom.png b/src/main/resources/assets/betterend/textures/block/jungle_vine_bottom.png new file mode 100644 index 00000000..e584bf10 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/jungle_vine_bottom.png differ