Recipe fixes, replaced spaces with tabs

src/main/java/ru/bclib/api/biomes/BCLBiomeBuilder.java

@@ -27,8 +27,6 @@ import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
 import net.minecraft.world.level.levelgen.Noises;
 import net.minecraft.world.level.levelgen.SurfaceRules;
-import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource;
-import net.minecraft.world.level.levelgen.SurfaceRules.SequenceRuleSource;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
@@ -38,7 +36,6 @@ import ru.bclib.util.ColorUtil;
 import ru.bclib.world.biomes.BCLBiome;
 import ru.bclib.world.features.BCLFeature;
 import ru.bclib.world.structures.BCLStructureFeature;
-import ru.bclib.world.surface.DoubleBlockSurfaceNoiseCondition;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/ru/bclib/api/biomes/BiomeAPI.java

@@ -35,7 +35,6 @@ import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.levelgen.GenerationStep.Carving;
 import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
@@ -68,7 +67,6 @@ import ru.bclib.world.structures.BCLStructureFeature;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;

src/main/java/ru/bclib/mixin/client/MinecraftMixin.java

@@ -1,12 +1,6 @@
 package ru.bclib.mixin.client;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
 import com.mojang.datafixers.util.Function4;
-import net.fabricmc.fabric.api.event.registry.DynamicRegistrySetupCallback;
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Minecraft.ExperimentalDialogType;
 import net.minecraft.client.color.block.BlockColors;
@@ -15,17 +9,10 @@ import net.minecraft.client.main.GameConfig;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.RegistryAccess.RegistryHolder;
-import net.minecraft.data.BuiltinRegistries;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.level.DataPackConfig;
 import net.minecraft.world.level.LevelSettings;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
-import net.minecraft.world.level.levelgen.SurfaceRules;
 import net.minecraft.world.level.levelgen.WorldGenSettings;
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess;
 import net.minecraft.world.level.storage.WorldData;
@@ -35,18 +22,12 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import ru.bclib.BCLib;
 import ru.bclib.api.LifeCycleAPI;
 import ru.bclib.api.biomes.BiomeAPI;
 import ru.bclib.api.dataexchange.DataExchangeAPI;
 import ru.bclib.api.datafixer.DataFixerAPI;
 import ru.bclib.interfaces.CustomColorProvider;
-import ru.bclib.mixin.common.StructureSettingsAccessor;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Consumer;
 import java.util.function.Function;
 
 @Mixin(Minecraft.class)

src/main/java/ru/bclib/mixin/common/NoiseGeneratorSettingsMixin.java

@@ -3,7 +3,6 @@ package ru.bclib.mixin.common;
 import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
 import net.minecraft.world.level.levelgen.SurfaceRules;
 import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource;
-import org.apache.commons.codec.language.bm.Rule;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;

src/main/java/ru/bclib/recipes/AnvilRecipe.java

@@ -175,8 +175,7 @@ public class AnvilRecipe implements Recipe<Container>, UnknownReceipBookCategory
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 		AnvilRecipe that = (AnvilRecipe) o;
-        return damage == that.damage && toolLevel == that.toolLevel && id.equals(that.id) && input.equals(that.input) && output
+		return damage == that.damage && toolLevel == that.toolLevel && id.equals(that.id) && input.equals(that.input) && output.equals(that.output);
-                .equals(that.output);
 	}
 
 	@Override
@@ -202,7 +201,7 @@ public class AnvilRecipe implements Recipe<Container>, UnknownReceipBookCategory
 		private boolean alright;
 		private boolean exist;
 
-        private Builder() { }
+		private Builder() {}
 
 		public Builder setInput(ItemLike... inputItems) {
 			this.alright &= RecipeHelper.exists(inputItems);
@@ -257,6 +256,9 @@ public class AnvilRecipe implements Recipe<Container>, UnknownReceipBookCategory
 
 		public void build() {
 			if (exist) {
+				return;
+			}
+			
 			if (input == null) {
 				BCLib.LOGGER.warning("Input for Anvil recipe can't be 'null', recipe {} will be ignored!", id);
 				return;
@@ -273,11 +275,7 @@ public class AnvilRecipe implements Recipe<Container>, UnknownReceipBookCategory
 				BCLib.LOGGER.debug("Can't add Anvil recipe {}! Ingeredient or output not exists.", id);
 				return;
 			}
-                BCLRecipeManager.addRecipe(
+			BCLRecipeManager.addRecipe(TYPE, new AnvilRecipe(id, input, output, inputCount, toolLevel, anvilLevel, damage));
-                        TYPE,
-                        new AnvilRecipe(id, input, output, inputCount, toolLevel, anvilLevel, damage)
-                );
-            }
 		}
 	}
 

src/main/java/ru/bclib/recipes/FurnaceRecipe.java

@@ -9,7 +9,6 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.crafting.SmeltingRecipe;
 import net.minecraft.world.item.crafting.SmokingRecipe;
 import net.minecraft.world.level.ItemLike;
-import ru.bclib.BCLib;
 import ru.bclib.config.PathConfig;
 
 public class FurnaceRecipe {
@@ -77,6 +76,9 @@ public class FurnaceRecipe {
 	
 	public void build(boolean blasting, boolean campfire, boolean smoker) {
 		if (exist) {
+			return;
+		}
+		
 		SmeltingRecipe recipe = new SmeltingRecipe(
 			id,
 			group,
@@ -123,8 +125,4 @@ public class FurnaceRecipe {
 			BCLRecipeManager.addRecipe(RecipeType.SMOKING, recipe2);
 		}
 	}
-		else {
-			BCLib.LOGGER.debug("Furnace recipe {} couldn't be added", id);
-		}
-	}
 }

src/main/java/ru/bclib/recipes/GridRecipe.java

@@ -12,7 +12,6 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.crafting.ShapedRecipe;
 import net.minecraft.world.item.crafting.ShapelessRecipe;
 import net.minecraft.world.level.ItemLike;
-import ru.bclib.BCLib;
 import ru.bclib.config.PathConfig;
 
 import java.util.Arrays;
@@ -30,7 +29,7 @@ public class GridRecipe {
 	private String[] shape;
 	private Map<Character, Ingredient> materialKeys = Maps.newHashMap();
 	private int count;
-	private boolean exist = true;
+	private boolean exist;
 	
 	private GridRecipe() {}
 
@@ -114,7 +113,10 @@ public class GridRecipe {
 	}
 	
 	public void build() {
-		if (exist) {
+		if (!exist) {
+			return;
+		}
+		
 		int height = shape.length;
 		int width = shape[0].length();
 		ItemStack result = new ItemStack(output, count);
@@ -130,8 +132,4 @@ public class GridRecipe {
 		) : new ShapelessRecipe(id, group, result, materials);
 		BCLRecipeManager.addRecipe(type, recipe);
 	}
-		else {
-			BCLib.LOGGER.debug("Recipe {} couldn't be added", id);
-		}
-	}
 }

src/main/java/ru/bclib/recipes/SmithingTableRecipe.java

@@ -25,7 +25,7 @@ public class SmithingTableRecipe {
 		BUILDER.base = null;
 		BUILDER.addition = null;
 		BUILDER.result = null;
-		BUILDER.alright = true;
+		BUILDER.exist = true;
 		
 		return BUILDER;
 	}
@@ -34,7 +34,6 @@ public class SmithingTableRecipe {
 	private Ingredient base;
 	private Ingredient addition;
 	private ItemStack result;
-	private boolean alright;
 	private boolean exist;
 	
 	private SmithingTableRecipe() {}
@@ -49,13 +48,13 @@ public class SmithingTableRecipe {
 	}
 	
 	public SmithingTableRecipe setResult(ItemLike item, int count) {
-		this.alright &= BCLRecipeManager.exists(item);
+		this.exist &= BCLRecipeManager.exists(item);
 		this.result = new ItemStack(item, count);
 		return this;
 	}
 	
 	public SmithingTableRecipe setBase(ItemLike... items) {
-		this.alright &= BCLRecipeManager.exists(items);
+		this.exist &= BCLRecipeManager.exists(items);
 		this.base = Ingredient.of(items);
 		return this;
 	}
@@ -66,7 +65,7 @@ public class SmithingTableRecipe {
 	}
 	
 	public SmithingTableRecipe setAddition(ItemLike... items) {
-		this.alright &= BCLRecipeManager.exists(items);
+		this.exist &= BCLRecipeManager.exists(items);
 		this.addition = Ingredient.of(items);
 		return this;
 	}
@@ -97,10 +96,7 @@ public class SmithingTableRecipe {
 			BCLib.LOGGER.warning("Can't add Smithing recipe! Id {} already exists!", id);
 			return;
 		}
-		if (!alright) {
+		
-			BCLib.LOGGER.debug("Can't add Smithing recipe {}! Ingeredients or output not exists.", id);
-			return;
-		}
 		BCLRecipeManager.addRecipe(TYPE, new UpgradeRecipe(id, base, addition, result));
 	}
 }