Removed terrain json blockstates, plants for "savanna" biome

src/main/java/ru/betterend/blocks/EndPathBlock.java

@@ -2,6 +2,9 @@ package ru.betterend.blocks;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.Maps;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Block;
@@ -13,10 +16,13 @@ import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.ItemStack;
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.loot.context.LootContextParameters;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.registry.Registry;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import ru.betterend.blocks.basis.BlockBaseNotFull;
+import ru.betterend.patterns.Patterns;
 
 public class EndPathBlock extends BlockBaseNotFull {
 	private static final VoxelShape SHAPE = Block.createCuboidShape(0, 0, 0, 16, 15, 16);
@@ -47,4 +53,18 @@ public class EndPathBlock extends BlockBaseNotFull {
 	public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) {
 		return SHAPE;
 	}
+	
+	@Override
+	public String getModelPattern(String block) {
+		String name = Registry.BLOCK.getId(this).getPath();
+		Map<String, String> map = Maps.newHashMap();
+		map.put("%top%", name + "_top");
+		map.put("%side%", name.replace("_path", "") + "_side");
+		return Patterns.createJson(Patterns.BLOCK_PATH, map);
+	}
+	
+	@Override
+	public Identifier statePatternId() {
+		return Patterns.STATE_ROTATED_TOP;
+	}
 }

src/main/java/ru/betterend/blocks/EndTerrainBlock.java

@@ -2,8 +2,11 @@ package ru.betterend.blocks;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
+import com.google.common.collect.Maps;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.block.Block;
@@ -23,13 +26,16 @@ import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 import net.minecraft.world.chunk.light.ChunkLightProvider;
 import ru.betterend.blocks.basis.BlockBase;
+import ru.betterend.patterns.Patterns;
 
 public class EndTerrainBlock extends BlockBase {
 	private Block pathBlock;
@@ -78,11 +84,28 @@ public class EndTerrainBlock extends BlockBase {
 		BlockState blockState = worldView.getBlockState(blockPos);
 		if (blockState.isOf(Blocks.SNOW) && (Integer) blockState.get(SnowBlock.LAYERS) == 1) {
 			return true;
-	      } else if (blockState.getFluidState().getLevel() == 8) {
+		}
+		else if (blockState.getFluidState().getLevel() == 8) {
 			return false;
-	      } else {
+		}
+		else {
 			int i = ChunkLightProvider.getRealisticOpacity(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getOpacity(worldView, blockPos));
 			return i < 5;
 		}
 	}
+	
+	@Override
+	public String getModelPattern(String block) {
+		String name = Registry.BLOCK.getId(this).getPath();
+		Map<String, String> map = Maps.newHashMap();
+		map.put("%top%", "betterend:block/" + name + "_top");
+		map.put("%side%", "betterend:block/" + name + "_side");
+		map.put("%bottom%", "minecraft:block/end_stone");
+		return Patterns.createJson(Patterns.BLOCK_TOP_SIDE_BOTTOM, map);
+	}
+	
+	@Override
+	public Identifier statePatternId() {
+		return Patterns.STATE_ROTATED_TOP;
+	}
 }

src/main/java/ru/betterend/patterns/Patterns.java

@@ -45,6 +45,7 @@ public class Patterns {
 	public final static Identifier STATE_CHAIN = BetterEnd.makeID("patterns/blockstate/chain.json");
 	public final static Identifier STATE_CHANDELIER = BetterEnd.makeID("patterns/blockstate/chandelier.json");
 	public final static Identifier STATE_FURNACE = BetterEnd.makeID("patterns/blockstate/furnace.json");
+	public final static Identifier STATE_ROTATED_TOP = BetterEnd.makeID("patterns/blockstate/rotated_top.json");
 	
 	//Models Block
 	public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/empty.json");
@@ -100,6 +101,8 @@ public class Patterns {
 	public final static Identifier BLOCK_CHANDELIER_CEIL = BetterEnd.makeID("patterns/block/chandelier_ceil.json");
 	public final static Identifier BLOCK_FURNACE = BetterEnd.makeID("patterns/block/furnace.json");
 	public final static Identifier BLOCK_FURNACE_GLOW = BetterEnd.makeID("patterns/block/furnace_glow.json");
+	public final static Identifier BLOCK_TOP_SIDE_BOTTOM = BetterEnd.makeID("patterns/block/top_side_bottom.json");
+	public final static Identifier BLOCK_PATH = BetterEnd.makeID("patterns/block/path.json");
 	
 	//Models Item
 	public final static Identifier ITEM_WALL = BetterEnd.makeID("patterns/item/pattern_wall.json");

src/main/java/ru/betterend/registry/EndBlocks.java

@@ -121,7 +121,8 @@ public class EndBlocks {
 	public static final Block SHADOW_GRASS = registerBlock("shadow_grass", new ShadowGrassBlock());
 	public static final Block PINK_MOSS = registerBlock("pink_moss", new EndTerrainBlock(MaterialColor.PINK));
 	public static final Block AMBER_MOSS = registerBlock("amber_moss", new EndTerrainBlock(MaterialColor.ORANGE));
-	public static final Block JUNGLE_MOSS = registerBlock("jungle_moss", new EndTerrainBlock(MaterialColor.ORANGE));
+	public static final Block JUNGLE_MOSS = registerBlock("jungle_moss", new EndTerrainBlock(MaterialColor.GREEN));
+	public static final Block RUTISCUS = registerBlock("rutiscus", new EndTerrainBlock(MaterialColor.ORANGE));
 	
 	// Roads //
 	public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new EndPathBlock(END_MYCELIUM));
@@ -133,6 +134,7 @@ public class EndBlocks {
 	public static final Block PINK_MOSS_PATH = registerBlock("pink_moss_path", new EndPathBlock(PINK_MOSS));
 	public static final Block AMBER_MOSS_PATH = registerBlock("amber_moss_path", new EndPathBlock(AMBER_MOSS));
 	public static final Block JUNGLE_MOSS_PATH = registerBlock("jungle_moss_path", new EndPathBlock(JUNGLE_MOSS));
+	public static final Block RUTISCUS_PATH = registerBlock("rutiscus_path", new EndPathBlock(RUTISCUS));
 	
 	public static final Block MOSSY_OBSIDIAN = registerBlock("mossy_obsidian", new MossyObsidian());
 	
@@ -222,6 +224,10 @@ public class EndBlocks {
 	public static final Block SALTEAGO = registerBlock("salteago", new TerrainPlantBlock(END_MOSS));
 	public static final Block VAIOLUSH_FERN = registerBlock("vaiolush_fern", new TerrainPlantBlock(END_MOSS));
 	public static final Block FRACTURN = registerBlock("fracturn", new TerrainPlantBlock(END_MOSS));
+	public static final Block ORANGO = registerBlock("orango", new TerrainPlantBlock(RUTISCUS));
+	public static final Block AERIDIUM = registerBlock("aeridium", new TerrainPlantBlock(RUTISCUS));
+	public static final Block LUTEBUS = registerBlock("lutebus", new TerrainPlantBlock(RUTISCUS));
+	public static final Block LAMELLARIUM = registerBlock("lamellarium", new TerrainPlantBlock(RUTISCUS));
 	
 	public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlueVineSeedBlock());
 	public static final Block BLUE_VINE = registerBlockNI("blue_vine", new BlueVineBlock());

src/main/resources/assets/betterend/blockstates/aeridium.json

@@ -0,0 +1,8 @@
+{
+	"variants": {
+		"": [
+			{ "model": "betterend:block/aeridium_01" },
+			{ "model": "betterend:block/aeridium_02" }
+		]
+	}
+}

src/main/resources/assets/betterend/blockstates/cave_moss.json

@@ -1,21 +0,0 @@
-{
-	"variants": {
-		"": [
-				{
-					"model": "betterend:block/cave_moss"
-				},
-				{
-					"model": "betterend:block/cave_moss",
-					"y": 90
-				},
-				{
-					"model": "betterend:block/cave_moss",
-					"y": 180
-				},
-				{
-					"model": "betterend:block/cave_moss",
-					"y": 270
-				}
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/cave_moss_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/cave_moss_path" },
-			{ "model": "betterend:block/cave_moss_path", "y": 90 },
-			{ "model": "betterend:block/cave_moss_path", "y": 180 },
-			{ "model": "betterend:block/cave_moss_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/chorus_nylium.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-				{ "model": "betterend:block/chorus_nylium" },
-				{ "model": "betterend:block/chorus_nylium", "y": 90 },
-				{ "model": "betterend:block/chorus_nylium", "y": 180 },
-				{ "model": "betterend:block/chorus_nylium", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/chorus_nylium_path" },
-			{ "model": "betterend:block/chorus_nylium_path", "y": 90 },
-			{ "model": "betterend:block/chorus_nylium_path", "y": 180 },
-			{ "model": "betterend:block/chorus_nylium_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/crystal_moss.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-				{ "model": "betterend:block/crystal_moss" },
-				{ "model": "betterend:block/crystal_moss", "y": 90 },
-				{ "model": "betterend:block/crystal_moss", "y": 180 },
-				{ "model": "betterend:block/crystal_moss", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/crystal_moss_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/crystal_moss_path" },
-			{ "model": "betterend:block/crystal_moss_path", "y": 90 },
-			{ "model": "betterend:block/crystal_moss_path", "y": 180 },
-			{ "model": "betterend:block/crystal_moss_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/end_moss.json

@@ -1,21 +0,0 @@
-{
-	"variants": {
-		"": [
-				{
-					"model": "betterend:block/end_moss"
-				},
-				{
-					"model": "betterend:block/end_moss",
-					"y": 90
-				},
-				{
-					"model": "betterend:block/end_moss",
-					"y": 180
-				},
-				{
-					"model": "betterend:block/end_moss",
-					"y": 270
-				}
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/end_moss_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/end_moss_path" },
-			{ "model": "betterend:block/end_moss_path", "y": 90 },
-			{ "model": "betterend:block/end_moss_path", "y": 180 },
-			{ "model": "betterend:block/end_moss_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/end_mycelium.json

@@ -1,21 +0,0 @@
-{
-	"variants": {
-		"": [
-				{
-					"model": "betterend:block/end_mycelium"
-				},
-				{
-					"model": "betterend:block/end_mycelium",
-					"y": 90
-				},
-				{
-					"model": "betterend:block/end_mycelium",
-					"y": 180
-				},
-				{
-					"model": "betterend:block/end_mycelium",
-					"y": 270
-				}
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/end_mycelium_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/end_mycelium_path" },
-			{ "model": "betterend:block/end_mycelium_path", "y": 90 },
-			{ "model": "betterend:block/end_mycelium_path", "y": 180 },
-			{ "model": "betterend:block/end_mycelium_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/jungle_moss.json

@@ -1,21 +0,0 @@
-{
-	"variants": {
-		"": [
-				{
-					"model": "betterend:block/jungle_moss"
-				},
-				{
-					"model": "betterend:block/jungle_moss",
-					"y": 90
-				},
-				{
-					"model": "betterend:block/jungle_moss",
-					"y": 180
-				},
-				{
-					"model": "betterend:block/jungle_moss",
-					"y": 270
-				}
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/jungle_moss_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/jungle_moss_path" },
-			{ "model": "betterend:block/jungle_moss_path", "y": 90 },
-			{ "model": "betterend:block/jungle_moss_path", "y": 180 },
-			{ "model": "betterend:block/jungle_moss_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/lamellarium.json

@@ -0,0 +1,10 @@
+{
+	"variants": {
+		"": [
+			{ "model": "betterend:block/lamellarium_01" },
+			{ "model": "betterend:block/lamellarium_02" },
+			{ "model": "betterend:block/lamellarium_03" },
+			{ "model": "betterend:block/lamellarium_04" }
+		]
+	}
+}

src/main/resources/assets/betterend/blockstates/lutebus.json

@@ -0,0 +1,8 @@
+{
+	"variants": {
+		"": [
+			{ "model": "betterend:block/lutebus_01" },
+			{ "model": "betterend:block/lutebus_02" }
+		]
+	}
+}

src/main/resources/assets/betterend/blockstates/orango.json

@@ -0,0 +1,10 @@
+{
+	"variants": {
+		"": [
+			{ "model": "betterend:block/orango_01" },
+			{ "model": "betterend:block/orango_02" },
+			{ "model": "betterend:block/orango_03" },
+			{ "model": "betterend:block/orango_04" }
+		]
+	}
+}

src/main/resources/assets/betterend/blockstates/pink_moss.json

@@ -1,21 +0,0 @@
-{
-	"variants": {
-		"": [
-				{
-					"model": "betterend:block/pink_moss"
-				},
-				{
-					"model": "betterend:block/pink_moss",
-					"y": 90
-				},
-				{
-					"model": "betterend:block/pink_moss",
-					"y": 180
-				},
-				{
-					"model": "betterend:block/pink_moss",
-					"y": 270
-				}
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/pink_moss_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/pink_moss_path" },
-			{ "model": "betterend:block/pink_moss_path", "y": 90 },
-			{ "model": "betterend:block/pink_moss_path", "y": 180 },
-			{ "model": "betterend:block/pink_moss_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/shadow_grass.json

@@ -1,21 +0,0 @@
-{
-	"variants": {
-		"": [
-				{
-					"model": "betterend:block/shadow_grass"
-				},
-				{
-					"model": "betterend:block/shadow_grass",
-					"y": 90
-				},
-				{
-					"model": "betterend:block/shadow_grass",
-					"y": 180
-				},
-				{
-					"model": "betterend:block/shadow_grass",
-					"y": 270
-				}
-		]
-	}
-}

src/main/resources/assets/betterend/blockstates/shadow_grass_path.json

@@ -1,10 +0,0 @@
-{
-	"variants": {
-		"": [
-			{ "model": "betterend:block/shadow_grass_path" },
-			{ "model": "betterend:block/shadow_grass_path", "y": 90 },
-			{ "model": "betterend:block/shadow_grass_path", "y": 180 },
-			{ "model": "betterend:block/shadow_grass_path", "y": 270 }
-		]
-	}
-}

src/main/resources/assets/betterend/models/block/aeridium_01.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cross",
+    "textures": {
+        "cross": "betterend:block/aeridium"
+    }
+}

src/main/resources/assets/betterend/models/block/aeridium_02.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/cross_inverted",
+    "textures": {
+        "cross": "betterend:block/aeridium"
+    }
+}

src/main/resources/assets/betterend/models/block/cave_moss.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/cave_moss_side",
-		"north": "betterend:block/cave_moss_side",
-		"particle": "betterend:block/cave_moss_side",
-		"south": "betterend:block/cave_moss_side",
-		"up": "betterend:block/cave_moss_top",
-		"west": "betterend:block/cave_moss_side"
-	}
-}

src/main/resources/assets/betterend/models/block/cave_moss_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/cave_moss_path_top",
-        "side": "betterend:block/cave_moss_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/block/chorus_nylium.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/chorus_nylium_side",
-		"north": "betterend:block/chorus_nylium_side",
-		"particle": "betterend:block/chorus_nylium_side",
-		"south": "betterend:block/chorus_nylium_side",
-		"up": "betterend:block/chorus_nylium_top",
-		"west": "betterend:block/chorus_nylium_side"
-	}
-}

src/main/resources/assets/betterend/models/block/chorus_nylium_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/chorus_nylium_path_top",
-        "side": "betterend:block/chorus_nylium_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/block/crystal_moss.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/crystal_moss_side",
-		"north": "betterend:block/crystal_moss_side",
-		"particle": "betterend:block/crystal_moss_side",
-		"south": "betterend:block/crystal_moss_side",
-		"up": "betterend:block/crystal_moss_top",
-		"west": "betterend:block/crystal_moss_side"
-	}
-}

src/main/resources/assets/betterend/models/block/crystal_moss_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/crystal_moss_path_top",
-        "side": "betterend:block/crystal_moss_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/block/end_moss.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/end_moss_side",
-		"north": "betterend:block/end_moss_side",
-		"particle": "betterend:block/end_moss_side",
-		"south": "betterend:block/end_moss_side",
-		"up": "betterend:block/end_moss_top",
-		"west": "betterend:block/end_moss_side"
-	}
-}

src/main/resources/assets/betterend/models/block/end_moss_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/end_moss_path_top",
-        "side": "betterend:block/end_moss_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/block/end_mycelium.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/end_mycelium_side",
-		"north": "betterend:block/end_mycelium_side",
-		"particle": "betterend:block/end_mycelium_side",
-		"south": "betterend:block/end_mycelium_side",
-		"up": "betterend:block/end_mycelium_top",
-		"west": "betterend:block/end_mycelium_side"
-	}
-}

src/main/resources/assets/betterend/models/block/end_mycelium_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/end_mycelium_path_top",
-        "side": "betterend:block/end_mycelium_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/block/jungle_moss.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/jungle_moss_side",
-		"north": "betterend:block/jungle_moss_side",
-		"particle": "betterend:block/jungle_moss_side",
-		"south": "betterend:block/jungle_moss_side",
-		"up": "betterend:block/jungle_moss_top",
-		"west": "betterend:block/jungle_moss_side"
-	}
-}

src/main/resources/assets/betterend/models/block/jungle_moss_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/jungle_moss_path_top",
-        "side": "betterend:block/jungle_moss_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/block/lamellarium_01.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cross",
+    "textures": {
+        "cross": "betterend:block/lamellarium"
+    }
+}

src/main/resources/assets/betterend/models/block/lamellarium_02.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/crop_block",
+    "textures": {
+        "texture": "betterend:block/lamellarium"
+    }
+}

src/main/resources/assets/betterend/models/block/lamellarium_03.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/cross_inverted",
+    "textures": {
+        "cross": "betterend:block/lamellarium"
+    }
+}

src/main/resources/assets/betterend/models/block/lamellarium_04.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/crop_block_inverted",
+    "textures": {
+        "texture": "betterend:block/lamellarium"
+    }
+}

src/main/resources/assets/betterend/models/block/lutebus_01.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cross",
+    "textures": {
+        "cross": "betterend:block/lutebus"
+    }
+}

src/main/resources/assets/betterend/models/block/lutebus_02.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/cross_inverted",
+    "textures": {
+        "cross": "betterend:block/lutebus"
+    }
+}

src/main/resources/assets/betterend/models/block/orango_01.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cross",
+    "textures": {
+        "cross": "betterend:block/orango"
+    }
+}

src/main/resources/assets/betterend/models/block/orango_02.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/crop_block",
+    "textures": {
+        "texture": "betterend:block/orango"
+    }
+}

src/main/resources/assets/betterend/models/block/orango_03.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/cross_inverted",
+    "textures": {
+        "cross": "betterend:block/orango"
+    }
+}

src/main/resources/assets/betterend/models/block/orango_04.json

@@ -0,0 +1,6 @@
+{
+    "parent": "betterend:block/crop_block_inverted",
+    "textures": {
+        "texture": "betterend:block/orango"
+    }
+}

src/main/resources/assets/betterend/models/block/pink_moss.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/pink_moss_side",
-		"north": "betterend:block/pink_moss_side",
-		"particle": "betterend:block/pink_moss_side",
-		"south": "betterend:block/pink_moss_side",
-		"up": "betterend:block/pink_moss_top",
-		"west": "betterend:block/pink_moss_side"
-	}
-}

src/main/resources/assets/betterend/models/block/pink_moss_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/pink_moss_path_top",
-        "side": "betterend:block/pink_moss_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/block/shadow_grass.json

@@ -1,12 +0,0 @@
-{
-	"parent": "block/cube",
-	"textures": {
-		"down": "block/end_stone",
-		"east": "betterend:block/shadow_grass_side",
-		"north": "betterend:block/shadow_grass_side",
-		"particle": "betterend:block/shadow_grass_side",
-		"south": "betterend:block/shadow_grass_side",
-		"up": "betterend:block/shadow_grass_top",
-		"west": "betterend:block/shadow_grass_side"
-	}
-}

src/main/resources/assets/betterend/models/block/shadow_grass_path.json

@@ -1,7 +0,0 @@
-{   "parent": "betterend:block/path",
-    "textures": {
-        "top": "betterend:block/shadow_grass_path_top",
-        "side": "betterend:block/shadow_grass_side",
-        "bottom": "block/end_stone"
-    }
-}

src/main/resources/assets/betterend/models/item/aeridium.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:block/aeridium"
+	}
+}

src/main/resources/assets/betterend/models/item/cave_moss.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/cave_moss"
-}

src/main/resources/assets/betterend/models/item/cave_moss_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/cave_moss_path"
-}

src/main/resources/assets/betterend/models/item/chorus_nylium.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/chorus_nylium"
-}

src/main/resources/assets/betterend/models/item/chorus_nylium_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/chorus_nylium_path"
-}

src/main/resources/assets/betterend/models/item/crystal_moss.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/crystal_moss"
-}

src/main/resources/assets/betterend/models/item/crystal_moss_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/crystal_moss_path"
-}

src/main/resources/assets/betterend/models/item/end_moss.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/end_moss"
-}

src/main/resources/assets/betterend/models/item/end_moss_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/end_moss_path"
-}

src/main/resources/assets/betterend/models/item/end_mycelium.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/end_mycelium"
-}

src/main/resources/assets/betterend/models/item/end_mycelium_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/end_mycelium_path"
-}

src/main/resources/assets/betterend/models/item/jungle_moss.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/jungle_moss"
-}

src/main/resources/assets/betterend/models/item/jungle_moss_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/jungle_moss_path"
-}

src/main/resources/assets/betterend/models/item/lamellarium.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:block/lamellarium"
+	}
+}

src/main/resources/assets/betterend/models/item/lutebus.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:block/lutebus"
+	}
+}

src/main/resources/assets/betterend/models/item/orango.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:block/orango"
+	}
+}

src/main/resources/assets/betterend/models/item/pink_moss.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/pink_moss"
-}

src/main/resources/assets/betterend/models/item/pink_moss_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/pink_moss_path"
-}

src/main/resources/assets/betterend/models/item/shadow_grass.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/shadow_grass"
-}

src/main/resources/assets/betterend/models/item/shadow_grass_path.json

@@ -1,3 +0,0 @@
-{
-	"parent": "betterend:block/shadow_grass_path"
-}

src/main/resources/assets/betterend/patterns/block/path.json

@@ -0,0 +1,7 @@
+{   "parent": "betterend:block/path",
+    "textures": {
+        "top": "betterend:block/%top%",
+        "side": "betterend:block/%side%",
+        "bottom": "block/end_stone"
+    }
+}

src/main/resources/assets/betterend/patterns/block/top_side_bottom.json

@@ -0,0 +1,8 @@
+{
+	"parent": "minecraft:block/cube_bottom_top",
+	"textures": {
+		"bottom": "%bottom%",
+		"side": "%side%",
+		"top": "%top%"
+	}
+}

src/main/resources/assets/betterend/patterns/blockstate/rotated_top.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "": [
+			{ "model": "betterend:pattern/%block%" },
+			{ "model": "betterend:pattern/%block%", "y": 90 },
+			{ "model": "betterend:pattern/%block%", "y": 180 },
+			{ "model": "betterend:pattern/%block%", "y": 270 }
+		]
+    }
+}