Merge branch 'dev/1.15' into release/1.15

Author: thecatcore

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.7.9+build.190
 fabric_version=0.5.1+build.294-1.15
 
 # Mod Properties
-mod_version = 2.1.3
+mod_version = 2.1.4
 maven_group = io.github.vampirestudios.raa
 archives_base_name = raa
 beta_version = 18

src/main/java/io/github/vampirestudios/raa/RandomlyAddingAnythingClient.java

@@ -44,7 +44,7 @@ public class RandomlyAddingAnythingClient implements ClientModInitializer {
     private static final Map<Identifier, Map.Entry<DimensionMaterial, RAABlockItem.BlockType>> DIMENSION_MATERIAL_ORE_IDENTIFIERS = new HashMap<>();
 
     public static void initColoring() {
-        ColorProviderRegistry.ITEM.register((stack, var2) ->
+        ColorProviderRegistryImpl.ITEM.register((stack, var2) ->
                         MinecraftClient.getInstance().world.getBiomeAccess().getBiome(Objects.requireNonNull(MinecraftClient.getInstance().player).getBlockPos()).getFoliageColor(),
                 Items.OAK_LEAVES, Items.SPRUCE_LEAVES, Items.BIRCH_LEAVES, Items.JUNGLE_LEAVES, Items.ACACIA_LEAVES, Items.DARK_OAK_LEAVES, Items.FERN, Items.LARGE_FERN, Items.GRASS, Items.TALL_GRASS, Items.VINE);
 
@@ -55,7 +55,7 @@ public static void initColoring() {
     @Override
     @Environment(EnvType.CLIENT)
     public void onInitializeClient() {
-        initColoring();
+//        initColoring();
 
         ClientSpriteRegistryCallback.event(SpriteAtlasTexture.BLOCK_ATLAS_TEX)
                 .register((spriteAtlasTexture, registry) -> {

src/main/java/io/github/vampirestudios/raa/config/GeneralConfig.java

@@ -10,11 +10,11 @@
 public class GeneralConfig implements ConfigData {
 
     @Comment("Amount of materials to generate")
-    public int materialGenAmount = 40;
+    public int materialGenAmount = 30;
     @Comment("Amount of unique materials to generate per dimension")
     public int dimensionalMaterialGenAmount = 10;
     @Comment("Amount of dimensions to generate")
-    public int dimensionsGenAmount = 50;
+    public int dimensionsGenAmount = 10;
     @Comment("Mostly for us developers")
     public boolean debug = false;
     @Comment("If this is set to true materials will regenerate each time you restart your game, you can also just delete the raa folder in the configs folder")