Amaranita additional blocks & lang, texture refactoring

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

@@ -5,8 +5,8 @@ import net.minecraft.block.Blocks;
 import net.minecraft.block.MaterialColor;
 import ru.betterend.blocks.basis.EndPillarBlock;
 
-public class AmaranitaHyphaeBlock extends EndPillarBlock {
+public class AmaranitaStemBlock extends EndPillarBlock {
-	public AmaranitaHyphaeBlock() {
+	public AmaranitaStemBlock() {
 		super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).materialColor(MaterialColor.LIME));
 	}
 }

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

@@ -6,8 +6,8 @@ import net.minecraft.block.Material;
 import net.minecraft.sound.BlockSoundGroup;
 import ru.betterend.blocks.basis.BlockBase;
 
-public class MossyGlowshroomHymenophoreBlock extends BlockBase {
+public class GlowingHymenophoreBlock extends BlockBase {
-	public MossyGlowshroomHymenophoreBlock() {
+	public GlowingHymenophoreBlock() {
 		super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WART_BLOCK).luminance(15));
 	}
 }

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

@@ -1,7 +1,11 @@
 package ru.betterend.blocks;
 
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
+import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.math.BlockPos;
@@ -13,6 +17,15 @@ import ru.betterend.registry.EndBlocks;
 public class LargeAmaranitaBlock extends EndPlantBlock {
 	public static final EnumProperty<TripleShape> SHAPE = BlockProperties.TRIPLE_SHAPE;
 	
+	public LargeAmaranitaBlock() {
+		super(FabricBlockSettings.of(Material.PLANT)
+				.luminance((state) -> (state.get(SHAPE) == TripleShape.TOP) ? 15 : 0)
+				.breakByTool(FabricToolTags.SHEARS)
+				.sounds(BlockSoundGroup.GRASS)
+				.breakByHand(true)
+				.noCollision());
+	}
+	
 	@Override
 	protected boolean isTerrain(BlockState state) {
 		return state.getBlock() == EndBlocks.SANGNUM;

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

@@ -11,7 +11,7 @@ import ru.betterend.blocks.AeterniumAnvil;
 import ru.betterend.blocks.AeterniumBlock;
 import ru.betterend.blocks.AmaranitaCapBlock;
 import ru.betterend.blocks.AmaranitaHymenophoreBlock;
-import ru.betterend.blocks.AmaranitaHyphaeBlock;
+import ru.betterend.blocks.AmaranitaStemBlock;
 import ru.betterend.blocks.AmberBlock;
 import ru.betterend.blocks.AncientEmeraldIceBlock;
 import ru.betterend.blocks.AuroraCrystalBlock;
@@ -70,7 +70,7 @@ import ru.betterend.blocks.MengerSpongeWetBlock;
 import ru.betterend.blocks.MissingTileBlock;
 import ru.betterend.blocks.MossyBoneBlock;
 import ru.betterend.blocks.MossyGlowshroomCapBlock;
-import ru.betterend.blocks.MossyGlowshroomHymenophoreBlock;
+import ru.betterend.blocks.GlowingHymenophoreBlock;
 import ru.betterend.blocks.MossyGlowshroomSaplingBlock;
 import ru.betterend.blocks.MossyObsidian;
 import ru.betterend.blocks.MurkweedBlock;
@@ -175,7 +175,7 @@ public class EndBlocks {
 	// Wooden Materials And Trees //
 	public static final Block MOSSY_GLOWSHROOM_SAPLING = registerBlock("mossy_glowshroom_sapling", new MossyGlowshroomSaplingBlock());
 	public static final Block MOSSY_GLOWSHROOM_CAP = registerBlock("mossy_glowshroom_cap", new MossyGlowshroomCapBlock());
-	public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new MossyGlowshroomHymenophoreBlock());
+	public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new GlowingHymenophoreBlock());
 	public static final Block MOSSY_GLOWSHROOM_FUR = registerBlock("mossy_glowshroom_fur", new FurBlock(MOSSY_GLOWSHROOM_SAPLING, 15, 16));
 	public static final WoodenMaterial MOSSY_GLOWSHROOM = new WoodenMaterial("mossy_glowshroom", MaterialColor.GRAY, MaterialColor.WOOD);
 	
@@ -260,8 +260,10 @@ public class EndBlocks {
 	
 	public static final Block SMALL_AMARANITA_MUSHROOM = registerBlock("small_amaranita_mushroom", new SmallAmaranitaBlock());
 	public static final Block LARGE_AMARANITA_MUSHROOM = registerBlockNI("large_amaranita_mushroom", new LargeAmaranitaBlock());
-	public static final Block AMARANITA_HYPHAE = registerBlock("amaranita_hyphae", new AmaranitaHyphaeBlock());
+	public static final Block AMARANITA_STEM = registerBlock("amaranita_stem", new AmaranitaStemBlock());
+	public static final Block AMARANITA_HYPHAE = registerBlock("amaranita_hyphae", new AmaranitaStemBlock());
 	public static final Block AMARANITA_HYMENOPHORE = registerBlock("amaranita_hymenophore", new AmaranitaHymenophoreBlock());
+	public static final Block AMARANITA_LANTERN = registerBlock("amaranita_lantern", new GlowingHymenophoreBlock());
 	public static final Block AMARANITA_FUR = registerBlock("amaranita_fur", new FurBlock(MOSSY_GLOWSHROOM_SAPLING, 15, 4));
 	public static final Block AMARANITA_CAP = registerBlock("amaranita_cap", new AmaranitaCapBlock());
 	

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

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "betterend:block/amaranita_lantern" }
+	}
+}

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

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "axis=x": { "model": "betterend:block/amaranita_stem", "x": 90, "y": 90 },
+    "axis=y": { "model": "betterend:block/amaranita_stem" },
+    "axis=z": { "model": "betterend:block/amaranita_stem", "x": 90 }
+  }
+}

src/main/resources/assets/betterend/lang/en_us.json

@@ -676,5 +676,28 @@
 	"item.betterend.thallasium_shovel_head": "Thallasium Shovel Head",
 	"item.betterend.thallasium_sword_blade": "Thallasium Sword Blade",
 	"item.betterend.thallasium_sword_handle": "Thallasium Sword Handle",
-	"block.betterend.aeternium_anvil": "Aeternium Anvil"
+	"block.betterend.aeternium_anvil": "Aeternium Anvil",
+	
+	"biome.betterend.dragon_graveyards": "Dragon Graveyards",
+	"biome.betterend.dry_shrubland": "Dry Shrubland",
+	"block.betterend.aeridium": "Aeridium",
+	"block.betterend.amaranita_cap": "Amaranita Cap",
+	"block.betterend.amaranita_fur": "Amaranita Fur",
+	"block.betterend.amaranita_hymenophore": "Amaranita Hymenophore",
+	"block.betterend.amaranita_hyphae": "Amaranita Hyphae",
+	"block.betterend.amaranita_lantern": "Amaranita Lantern",
+	"block.betterend.amaranita_stem": "Amaranita Stem",
+	"block.betterend.clawfern": "Clawfern",
+	"block.betterend.globulagus": "Globulagus",
+	"block.betterend.lamellarium": "Lamellarium",
+	"block.betterend.large_amaranita_mushroom": "Large Amaranita Mushroom",
+	"block.betterend.lutebus": "Lutebus",
+	"block.betterend.mossy_bone": "Mossy Bone",
+	"block.betterend.mossy_obsidian": "Mossy Obsidian",
+	"block.betterend.orango": "Orango",
+	"block.betterend.rutiscus": "Rutiscus",
+	"block.betterend.rutiscus_path": "Rutiscus Path",
+	"block.betterend.sangnum": "Sangnum",
+	"block.betterend.sangnum_path": "Sangnum Path",
+	"block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom"
 }

src/main/resources/assets/betterend/lang/ru_ru.json

@@ -696,5 +696,28 @@
 	"item.betterend.thallasium_shovel_head": "Навершие талласиевой лопаты",
 	"item.betterend.thallasium_sword_blade": "Лезвие талласиевого меча",
 	"item.betterend.thallasium_sword_handle": "Рукоятка талласиевого меча",
-	"block.betterend.aeternium_anvil": "Этериевая наковальня"
+	"block.betterend.aeternium_anvil": "Этериевая наковальня",
+	
+	"biome.betterend.dragon_graveyards": "Драконье кладбище",
+	"biome.betterend.dry_shrubland": "Сухая степь",
+	"block.betterend.aeridium": "Аэридиум",
+	"block.betterend.amaranita_cap": "Шляпка амаранита",
+	"block.betterend.amaranita_fur": "Волоски амаранита",
+	"block.betterend.amaranita_hymenophore": "Гименофор амаранита",
+	"block.betterend.amaranita_hyphae": "Гифа амаранита",
+	"block.betterend.amaranita_lantern": "Фонарь амаранита",
+	"block.betterend.amaranita_stem": "Стебель амаранита",
+	"block.betterend.clawfern": "Когтелист",
+	"block.betterend.globulagus": "Глобулагус",
+	"block.betterend.lamellarium": "Ламеллариум",
+	"block.betterend.large_amaranita_mushroom": "Большой амаранит",
+	"block.betterend.lutebus": "Лютебус",
+	"block.betterend.mossy_bone": "Мшистые кости",
+	"block.betterend.mossy_obsidian": "Мшистый обсидиан",
+	"block.betterend.orango": "Оранго",
+	"block.betterend.rutiscus": "Рутискус",
+	"block.betterend.rutiscus_path": "Тропа из рутискуса",
+	"block.betterend.sangnum": "Сагнум",
+	"block.betterend.sangnum_path": "Тропа из сагнума",
+	"block.betterend.small_amaranita_mushroom": "Маленький амаранит"
 }

src/main/resources/assets/betterend/materialmaps/block/amaranita_lantern.json

@@ -0,0 +1,3 @@
+{
+	"defaultMaterial": "betterend:glow_all"
+}

src/main/resources/assets/betterend/materialmaps/block/large_amaranita_mushroom.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/large_amaranita_cap_bottom",
+				"material": "betterend:glow_green_2"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materials/glow_green_2.json

@@ -0,0 +1,10 @@
+{
+	"layers": [
+		{
+			"vertexSource": "canvas:shaders/material/default.vert",
+			"fragmentSource": "betterend:shaders/material/glow_green_2.frag",
+			"disableAo": true,
+			"disableDiffuse": true
+		}
+	]
+}

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

@@ -1,12 +1,6 @@
 {
-	"parent": "block/cube",
+	"parent": "block/cube_all",
 	"textures": {
-		"down": "betterend:block/amaranita_hyphae_top",
+		"all": "betterend:block/amaranita_hyphae_side"
-		"east": "betterend:block/amaranita_hyphae_side",
-		"north": "betterend:block/amaranita_hyphae_side",
-		"particle": "betterend:block/amaranita_hyphae_side",
-		"south": "betterend:block/amaranita_hyphae_side",
-		"up": "betterend:block/amaranita_hyphae_top",
-		"west": "betterend:block/amaranita_hyphae_side"
 	}
 }

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

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

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

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

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

@@ -33,29 +33,6 @@
 				"east": { "uv": [ 3, 0, 13, 2 ], "texture": "#side" }
 			}
 		},
-		{
-			"__comment": "Box4",
-			"from": [ 6, 0, 6 ],
-			"to": [ 10, 4, 10 ],
-			"faces": {
-				"north": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" },
-				"south": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" },
-				"west": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" },
-				"east": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" }
-			}
-		},
-		{
-			"__comment": "Box4",
-			"from": [ 5, 4, 5 ],
-			"to": [ 11, 7, 11 ],
-			"faces": {
-				"down": { "uv": [ 5, 2, 11, 8 ], "texture": "#stem" },
-				"north": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" },
-				"south": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" },
-				"west": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" },
-				"east": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" }
-			}
-		},
 		{
 			"__comment": "PlaneX6",
 			"from": [ 2, 3, 1 ],
@@ -91,6 +68,28 @@
 				"north": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" },
 				"south": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" }
 			}
+		},
+		{
+			"__comment": "PlaneX9",
+			"from": [ 2.25, 0, 2.25 ],
+			"to": [ 2.251, 16, 18.25 ],
+			"rotation": { "origin": [ 2.25, 0, 2.25 ], "axis": "y", "angle": 45 },
+			"shade": false,
+			"faces": {
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }
+			}
+		},
+		{
+			"__comment": "PlaneX9",
+			"from": [ 13.625, 0, 2.375 ],
+			"to": [ 13.626, 16, 18.375 ],
+			"rotation": { "origin": [ 13.625, 0, 2.375 ], "axis": "y", "angle": -45 },
+			"shade": false,
+			"faces": {
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }
+			}
 		}
 	]
 }

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

@@ -1,42 +1,30 @@
 {
 	"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
 	"textures": {
-		"particle": "betterend:block/amaranita_stem",
+		"particle": "betterend:block/amaranita_stem_roots",
-		"texture": "betterend:block/amaranita_stem",
+		"stem": "betterend:block/amaranita_stem_roots"
-		"texture1": "betterend:block/amaranita_roots"
 	},
 	"elements": [ 	 
 		{
-			"__comment": "Box1",
+			"__comment": "PlaneX9",
-			"from": [ 6, 0, 6 ],
+			"from": [ 2.25, 0, 2.25 ],
-			"to": [ 10, 16, 10 ],
+			"to": [ 2.251, 16, 18.25 ],
+			"rotation": { "origin": [ 2.25, 0, 2.25 ], "axis": "y", "angle": 45 },
+			"shade": false,
 			"faces": {
-				"north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
-				"south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }
-				"west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }
 			}
 		},
 		{
-			"__comment": "PlaneX2",
+			"__comment": "PlaneX9",
-			"from": [ 0, 0, 0 ],
+			"from": [ 13.625, 0, 2.375 ],
-			"to": [ 0.001, 16, 22.5 ],
+			"to": [ 13.626, 16, 18.375 ],
-			"rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 },
+			"rotation": { "origin": [ 13.625, 0, 2.375 ], "axis": "y", "angle": -45 },
 			"shade": false,
 			"faces": {
-				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" },
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
-				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }
-			}
-		},
-		{
-			"__comment": "PlaneX2",
-			"from": [ 16, 0, 0 ],
-			"to": [ 16.001, 16, 22.5 ],
-			"rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 },
-			"shade": false,
-			"faces": {
-				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" },
-				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }
 			}
 		}
 	]

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

@@ -1,19 +1,30 @@
 {
 	"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
 	"textures": {
-		"particle": "betterend:block/amaranita_stem",
+		"particle": "betterend:block/amaranita_stem_middle",
-		"texture": "betterend:block/amaranita_stem"
+		"stem": "betterend:block/amaranita_stem_middle"
 	},
 	"elements": [ 	 
 		{
-			"__comment": "Box1",
+			"__comment": "PlaneX9",
-			"from": [ 6, 0, 6 ],
+			"from": [ 2.25, 0, 2.25 ],
-			"to": [ 10, 16, 10 ],
+			"to": [ 2.251, 16, 18.25 ],
+			"rotation": { "origin": [ 2.25, 0, 2.25 ], "axis": "y", "angle": 45 },
+			"shade": false,
 			"faces": {
-				"north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
-				"south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }
-				"west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
+			}
-				"east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }
+		},
+		{
+			"__comment": "PlaneX9",
+			"from": [ 13.625, 0, 2.375 ],
+			"to": [ 13.626, 16, 18.375 ],
+			"rotation": { "origin": [ 13.625, 0, 2.375 ], "axis": "y", "angle": -45 },
+			"shade": false,
+			"faces": {
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }
 			}
 		}
 	]

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

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

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

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

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

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