Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd

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

@@ -59,6 +59,7 @@ public class EndFeatures {
 	public static final EndFeature NEEDLEGRASS = new EndFeature("needlegrass", new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 3), 2);
 	public static final EndFeature SHADOW_BERRY = new EndFeature("shadow_berry", new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), 1);
 	public static final EndFeature BUSHY_GRASS = new EndFeature("bushy_grass", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 8, false), 20);
+	public static final EndFeature BUSHY_GRASS_WG = new EndFeature("bushy_grass_wg", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 5), 10);
 	
 	// Vines //
 	public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3);

src/main/java/ru/betterend/world/biome/BlossomingSpires.java

@@ -17,6 +17,7 @@ public class BlossomingSpires extends EndBiome {
 				.addFeature(EndFeatures.TENANEA_BUSH)
 				.addFeature(EndFeatures.BULB_VINE)
 				.addFeature(EndFeatures.BUSHY_GRASS)
+				.addFeature(EndFeatures.BUSHY_GRASS_WG)
 				.addFeature(EndFeatures.TWISTED_MOSS)
 				.addFeature(EndFeatures.TWISTED_MOSS_WOOD)
 				.addMobSpawn(EntityType.ENDERMAN, 50, 1, 4));

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

@@ -1,6 +1,98 @@
 {
-	"parent": "betterend:block/wall_moss_01",
+	"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
 	"textures": {
-		"texture": "betterend:block/twisted_moss"
+		"texture": "betterend:block/twisted_moss",
-	}
+		"texture2": "betterend:block/twisted_moss_2",
-}
+		"particle": "#texture"
+	},
+	"elements": [ 	 
+		{
+			"__comment": "PlaneY1",
+			"from": [ 3, 15, 0 ],
+			"to": [ 19, 15.001, 16 ],
+			"rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 },
+			"shade": false,
+			"faces": {
+				"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 1, 11, 0 ],
+			"to": [ 17, 11.001, 16 ],
+			"rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 },
+			"shade": false,
+			"faces": {
+				"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture2" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 1, -10, 0 ],
+			"to": [ 17, 6, 0.001 ],
+			"rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ -3, 13.5, 0 ],
+			"to": [ 13, 13.501, 16 ],
+			"rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 },
+			"shade": false,
+			"faces": {
+				"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 1, 1, 0 ],
+			"to": [ 17, 1.001, 16 ],
+			"rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 },
+			"shade": false,
+			"faces": {
+				"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture2" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ -1, -9, 0 ],
+			"to": [ 15, 7, 0.001 ],
+			"rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ -1.5, 16, 0 ],
+			"to": [ 14.5, 16.001, 16 ],
+			"rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 },
+			"shade": false,
+			"faces": {
+				"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ -2, 0.5, 0 ],
+			"to": [ 14, 0.501, 16 ],
+			"rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 },
+			"shade": false,
+			"faces": {
+				"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture2" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		}
+	]
+}

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

@@ -1,6 +1,65 @@
 {
-	"parent": "betterend:block/wall_moss_02",
+	"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
 	"textures": {
-		"texture": "betterend:block/twisted_moss"
+		"texture": "betterend:block/twisted_moss",
-	}
+		"texture2": "betterend:block/twisted_moss_2",
-}
+		"particle": "#texture"
+	},
+	"elements": [ 	 
+		{
+			"__comment": "PlaneY1",
+			"from": [ 3, 15, 0 ],
+			"to": [ 19, 15.001, 16 ],
+			"rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 },
+			"shade": false,
+			"faces": {
+				"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 0, -15, 0 ],
+			"to": [ 16, 1, 0.001 ],
+			"rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ -2, -12, 0 ],
+			"to": [ 14, 4, 0.001 ],
+			"rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 0, -9, 0 ],
+			"to": [ 16, 7, 0.001 ],
+			"rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 0, -3, 0 ],
+			"to": [ 16, 13, 0.001 ],
+			"rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		}
+	]
+}

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

@@ -1,6 +1,65 @@
 {
-	"parent": "betterend:block/wall_moss_03",
+	"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
 	"textures": {
-		"texture": "betterend:block/twisted_moss"
+		"texture": "betterend:block/twisted_moss",
-	}
+		"texture2": "betterend:block/twisted_moss_2",
-}
+		"particle": "#texture"
+	},
+	"elements": [ 	 
+		{
+			"__comment": "PlaneY1",
+			"from": [ -1, 0, 0 ],
+			"to": [ 15, 16, 0.001 ],
+			"rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 2, -3, 0 ],
+			"to": [ 18, 13, 0.001 ],
+			"rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 0, -8, 0 ],
+			"to": [ 16, 8, 0.001 ],
+			"rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ -3, -12, 0 ],
+			"to": [ 13, 4, 0.001 ],
+			"rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }
+			}
+		},
+		{
+			"__comment": "PlaneY1",
+			"from": [ 3, -15, 0 ],
+			"to": [ 19, 1, 0.001 ],
+			"rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 },
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 }
+			}
+		}
+	]
+}