Added potted charred saplings and removed old files, closes #26

Author: raltsmc

src/main/java/raltsmc/desolation/init/client/DesolationClient.java

@@ -44,6 +44,7 @@ public void onInitializeClient() {
         BlockRenderLayerMap.INSTANCE.putBlock(DesolationBlocks.CHARRED_BRANCHES, RenderLayer.getTranslucent());
         BlockRenderLayerMap.INSTANCE.putBlock(DesolationBlocks.ASH_BRAMBLE, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(DesolationBlocks.CHARRED_SAPLING, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(DesolationBlocks.POTTED_CHARRED_SAPLING, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(DesolationBlocks.SCORCHED_TUFT, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(DesolationBlocks.CINDERFRUIT_PLANT, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(DesolationBlocks.CHARRED_TRAPDOOR, RenderLayer.getCutout());

src/main/java/raltsmc/desolation/registry/DesolationBlocks.java

@@ -30,6 +30,7 @@ public final class DesolationBlocks {
     public static final Block CHARRED_LOG = register(new PillarBlock(FabricBlockSettings.of(Material.WOOD).hardness(1.8f).sounds(BlockSoundGroup.BASALT).breakByTool(FabricToolTags.AXES)), "charred_log", true);
     public static final Block CHARRED_PLANKS = register(new Block(FabricBlockSettings.of(Material.WOOD, MapColor.GRAY).strength(2.0F, 3.0F).sounds(BlockSoundGroup.WOOD)), "charred_planks", true);
     public static final Block CHARRED_SAPLING = register(new CharredSaplingBlock(new CharredSaplingGenerator(() -> DesolationConfiguredFeatures.TREE_CHARRED), FabricBlockSettings.copyOf(Blocks.OAK_SAPLING)), "charred_sapling", true);
+    public static final Block POTTED_CHARRED_SAPLING = register(new FlowerPotBlock(CHARRED_SAPLING, Settings.of(Material.DECORATION).breakInstantly().nonOpaque()), "potted_charred_sapling", false);
     // TODO add signs (and add them to non_flammable_wood, wall_signs, and standing_signs tags) (and add loot table +recipe)
     //public static final Block CHARRED_SIGN = register(new SignBlock(FabricBlockSettings.of(Material.WOOD,MaterialColor.GRAY).noCollision().strength(1.0f).sounds(BlockSoundGroup.WOOD)));
     public static final Block CHARRED_SLAB = register(new SlabBlock(FabricBlockSettings.of(Material.WOOD, MapColor.GRAY).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)), "charred_slab", true);

src/main/resources/assets/desolation/blockstates/potted_charred_sapling.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "desolation:block/potted_charred_sapling"
+    }
+  }
+}

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

@@ -12,7 +12,6 @@
   "item.desolation.air_filter": "Air Filter",
   "item.desolation.mask": "Mask",
   "item.desolation.goggles": "Goggles",
-  "item.desolation.mask_and_goggles": "Mask and Goggles",
   "item.desolation.ash_scuttler_spawn_egg": "Ash Scuttler Spawn Egg",
   "item.desolation.blackened_spawn_egg": "Blackened Spawn Egg",
   "item.desolation.music_disc_ashes": "Music Disc",
@@ -24,6 +23,7 @@
   "block.desolation.activated_charcoal_block": "Block of Activated Charcoal",
   "block.desolation.charred_log": "Charred Log",
   "block.desolation.charred_sapling": "Charred Sapling",
+  "block.desolation.potted_charred_sapling": "Potted Charred Sapling",
   "block.desolation.charred_planks": "Charred Planks",
   "block.desolation.charred_pressure_plate": "Charred Pressure Plate",
   "block.desolation.charred_trapdoor": "Charred Trapdoor",

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

@@ -12,7 +12,6 @@
   "item.desolation.air_filter": "Воздушный Фильтр",
   "item.desolation.mask": "Маска",
   "item.desolation.goggles": "Защитные Очки",
-  "item.desolation.mask_and_goggles": "Противогаз",
   "item.desolation.ash_scuttler_spawn_egg": "Яйцо Призыва Пепельного Щитовика",
   "item.desolation.blackened_spawn_egg": "Яйцо Призыва Сожжённого Скелета",
   "item.desolation.music_disc_ashes": "Пластинка",

src/main/resources/assets/desolation/lang/zh_cn.json

@@ -12,7 +12,6 @@
   "item.desolation.air_filter": "空气过滤器",
   "item.desolation.mask": "面罩",
   "item.desolation.goggles": "护目镜",
-  "item.desolation.mask_and_goggles": "面罩与护目镜",
   "item.desolation.ash_scuttler_spawn_egg": "灰烬迅捷虫刷怪蛋",
   "item.desolation.blackened_spawn_egg": "炭骨刷怪蛋",
   "block.desolation.ash": "灰烬",

src/main/resources/assets/desolation/models/block/potted_charred_sapling.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/flower_pot_cross",
+  "textures": {
+    "plant": "desolation:block/charred_sapling"
+  }
+}

src/main/resources/assets/desolation/models/item/mask_and_goggles.json

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    },
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "desolation:charred_sapling"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}