Finish adding signs

Common/src/main/java/potionstudios/byg/BYG.java

@@ -14,6 +14,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SignBlock;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.levelgen.carver.WorldCarver;
 import net.minecraft.world.level.material.Material;
@@ -29,6 +30,7 @@
 import potionstudios.byg.config.ConfigVersionTracker;
 import potionstudios.byg.data.BYGDataProviders;
 import potionstudios.byg.mixin.access.*;
+import potionstudios.byg.reg.BlockRegistryObject;
 import potionstudios.byg.reg.RegistryObject;
 import potionstudios.byg.server.command.ReloadConfigsCommand;
 import potionstudios.byg.server.command.UpdateConfigsCommand;
@@ -84,11 +86,8 @@ public static void threadSafeCommonLoad() {
             BYGDataProviders.generateProviders();
         }
         BYGVillagerType.setVillagerForBYGBiomes();
-        BlockEntityTypeAccess builderAccess = (BlockEntityTypeAccess) BlockEntityType.CAMPFIRE;
-        Set<Block> validBlocks = new ObjectOpenHashSet<>(builderAccess.byg_getValidBlocks());
-        validBlocks.add(BYGBlocks.CRYPTIC_CAMPFIRE.get());
-        validBlocks.add(BYGBlocks.BORIC_CAMPFIRE.get());
-        builderAccess.byg_setValidBlocks(validBlocks);
+        appendBlocksToBlockEntities();
+
         DeltaFeatureAccess.byg_setCANNOT_REPLACE(
                 new ImmutableList.Builder<Block>()
                         .addAll(DeltaFeatureAccess.byg_getCANNOT_REPLACE())
@@ -110,6 +109,26 @@ public static void threadSafeCommonLoad() {
         );
     }
 
+    private static void appendBlocksToBlockEntities() {
+        BlockEntityTypeAccess campfireBuilderAccess = (BlockEntityTypeAccess) BlockEntityType.CAMPFIRE;
+        Set<Block> validCampfireBlocks = new ObjectOpenHashSet<>(campfireBuilderAccess.byg_getValidBlocks());
+        validCampfireBlocks.add(BYGBlocks.CRYPTIC_CAMPFIRE.get());
+        validCampfireBlocks.add(BYGBlocks.BORIC_CAMPFIRE.get());
+        campfireBuilderAccess.byg_setValidBlocks(validCampfireBlocks);
+
+        BlockEntityTypeAccess signBuilderAccess = (BlockEntityTypeAccess) BlockEntityType.SIGN;
+        Set<Block> signValidBlocks = new ObjectOpenHashSet<>(signBuilderAccess.byg_getValidBlocks());
+        for (BlockRegistryObject<Block> signBlock : BYGBlocks.SIGN_BLOCKS) {
+            Block block = signBlock.get();
+            if (block instanceof SignBlock) {
+                signValidBlocks.add(block);
+            } else {
+                throw new IllegalArgumentException("Attempting to add block to sign block entity that is not a type of SignBlock");
+            }
+        }
+        signBuilderAccess.byg_setValidBlocks(signValidBlocks);
+    }
+
     public static void threadSafeLoadFinish() {
         LOGGER.debug("BYG: \"Load Complete Event\" Starting...");
         BYGCompostables.compostablesBYG();

Common/src/main/java/potionstudios/byg/BYGConstants.java

@@ -6,7 +6,7 @@ public class BYGConstants {
     public static final int EXPERIMENTAL_WARNING_VERSION = 5;
     public static final int CONFIG_VERSION = 4;
     public static final boolean BIOMEPEDIA = true;
-    public static final boolean SIGNS = false;
+    public static final boolean SIGNS = true;
     public static final boolean DEV_ENVIRONMENT = Boolean.parseBoolean(System.getProperty("bygDev", "false"));
     public static final boolean GENERATE_DATA = Boolean.parseBoolean(System.getProperty("bygGenerateData", "false"));
     public static boolean ENABLE_OVERWORLD_TREES = true;

Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java

@@ -346,7 +346,7 @@ public static void renderTypes(Consumer<Map<Block, RenderType>> mapConsumer) {
         map.put(BYGBlocks.POISON_IVY.get(), RenderType.cutoutMipped());
         map.put(BYGBlocks.SKYRIS_VINE.get(), RenderType.cutoutMipped());
 
-        for (final var potBlock : BYGBlocks.flowerPotBlocks)
+        for (final var potBlock : BYGBlocks.FLOWER_POT_BLOCKS)
             map.put(potBlock.get(), RenderType.cutoutMipped());
 
         BYG.LOGGER.debug("BYG: Texture Cutouts Rendered!");

Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java

@@ -59,7 +59,8 @@
 public class BYGBlocks {
     public static final RegistrationProvider<Block> PROVIDER = RegistrationProvider.get(Registry.BLOCK_REGISTRY, BYG.MOD_ID);
 
-    public static List<BlockRegistryObject<Block>> flowerPotBlocks = new ArrayList<>();
+    public static final List<BlockRegistryObject<Block>> FLOWER_POT_BLOCKS = new ArrayList<>();
+    public static final List<BlockRegistryObject<Block>> SIGN_BLOCKS = new ArrayList<>();
 
     public static final BlockRegistryObject<Block> ASPEN_PLANKS = createPlanks("aspen_planks");
     public static final BlockRegistryObject<Block> BAOBAB_PLANKS = createPlanks("baobab_planks");
@@ -1731,7 +1732,7 @@ private static BlockRegistryObject<Block> createFloweringIndigoJacarandaBush(int
     public static BlockRegistryObject<Block> createPottedBlock(Supplier<Block> blockForPot, String id) {
         final var b = createBlock(blockForPot, id);
         final BlockRegistryObject<Block> potted = createBlock(() -> BYGBlockFactory.INSTANCE.createPottedBlock(b, BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion()), "potted_" + id);
-        flowerPotBlocks.add(potted);
+        FLOWER_POT_BLOCKS.add(potted);
         return b;
     }
 
@@ -1840,15 +1841,19 @@ private static BlockRegistryObject<Block> createSign(String id, WoodType type, B
     }
 
     private static BlockRegistryObject<Block> createSign(String id, WoodType type, Supplier<? extends MaterialColor> color) {
-        return BYGConstants.SIGNS ? createBlock(() -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN).color(color.get()), type), id) : null;
+        BlockRegistryObject<Block> signBlock = BYGConstants.SIGNS ? createBlock(() -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN).color(color.get()), type), id) : null;
+        SIGN_BLOCKS.add(signBlock);
+        return signBlock;
     }
 
     private static BlockRegistryObject<Block> createWallSign(String id, WoodType type, BlockRegistryObject<Block> color) {
         return createWallSign(id, type, () -> color.get().defaultMaterialColor());
     }
 
     private static BlockRegistryObject<Block> createWallSign(String id, WoodType type, Supplier<? extends MaterialColor> color) {
-        return BYGConstants.SIGNS ? createBlock(() -> new WallSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN).color(color.get()), type), id) : null;
+        BlockRegistryObject<Block> signBlock = BYGConstants.SIGNS ? createBlock(() -> new WallSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN).color(color.get()), type), id) : null;
+        SIGN_BLOCKS.add(signBlock);
+        return signBlock;
     }
 
     public static <B extends Block> BlockRegistryObject<B> createBlock(Supplier<? extends B> block, String id) {

Common/src/main/resources/assets/byg/blockstates/aspen_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/aspen_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/aspen_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/aspen_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/baobab_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/baobab_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/baobab_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/baobab_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/blue_enchanted_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/blue_enchanted_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/bulbis_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/bulbis_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/bulbis_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/bulbis_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/cherry_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/cherry_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/cherry_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/cherry_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/cika_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/cika_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/cika_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/cika_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/cypress_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/cypress_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/cypress_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/cypress_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/ebony_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/ebony_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/ebony_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/ebony_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/embur_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/embur_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/embur_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/embur_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/ether_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/ether_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/ether_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/ether_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/fir_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/fir_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/fir_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/fir_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/green_enchanted_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/green_enchanted_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/green_enchanted_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/holly_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/holly_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/holly_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/holly_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/imparius_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/imparius_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/imparius_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/imparius_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/jacaranda_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/jacaranda_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/jacaranda_wall_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/jacaranda_sign"
+    }
+  }
+}

Common/src/main/resources/assets/byg/blockstates/lament_sign.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "byg:block/lament_sign"
+    }
+  }
+}