MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small fix & cleanup

Browse source
This commit is contained in:
paulevsGitch 2021-08-20 15:26:13 +03:00
parent 529565911f
commit 98121a30ef
6 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ru/bclib/api/BiomeAPI.java
View file

@ -310,10 +310,14 @@ public class BiomeAPI {
}
public static boolean isNetherBiome(ResourceLocation biomeID) {
return NETHER_BIOME_PICKER.getBiomes().contains(biomeID);
return pickerHasBiome(NETHER_BIOME_PICKER, biomeID);
}
public static boolean isEndBiome(ResourceLocation biomeID) {
return END_LAND_BIOME_PICKER.getBiomes().contains(biomeID) || END_VOID_BIOME_PICKER.getBiomes().contains(biomeID);
return pickerHasBiome(END_LAND_BIOME_PICKER, biomeID) || pickerHasBiome(END_VOID_BIOME_PICKER, biomeID);
}
private static boolean pickerHasBiome(BiomePicker picker, ResourceLocation key) {
return picker.getBiomes().stream().filter(biome -> biome.getID().equals(key)).findFirst().isPresent();
}
}

2
src/main/java/ru/bclib/api/dataexchange/DataExchangeAPI.java
View file

@ -5,10 +5,10 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.network.FriendlyByteBuf;
import ru.bclib.BCLib;
import ru.bclib.api.dataexchange.handler.DataExchange;
import ru.bclib.api.dataexchange.handler.autosync.AutoSync;
import ru.bclib.api.dataexchange.handler.autosync.AutoSync.NeedTransferPredicate;
import ru.bclib.api.dataexchange.handler.autosync.AutoSyncID;
import ru.bclib.api.dataexchange.handler.DataExchange;
import ru.bclib.config.Config;
import ru.bclib.util.ModUtil;

3
src/main/java/ru/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java
View file

@ -6,10 +6,9 @@ import ru.bclib.api.dataexchange.DataHandler;
import ru.bclib.api.dataexchange.SyncFileHash;
import ru.bclib.api.dataexchange.handler.autosync.AutoSync.NeedTransferPredicate;
import ru.bclib.api.dataexchange.handler.autosync.SyncFolderDescriptor.SubFile;
import ru.bclib.config.Config;
import ru.bclib.util.ModUtil;
import ru.bclib.util.Pair;
import ru.bclib.util.ModUtil.ModInfo;
import ru.bclib.util.Pair;
import ru.bclib.util.Triple;
import java.io.File;

2
src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java
View file

@ -18,9 +18,9 @@ import ru.bclib.api.dataexchange.handler.autosync.SyncFolderDescriptor.SubFile;
import ru.bclib.gui.screens.SyncFilesScreen;
import ru.bclib.gui.screens.WarnBCLibVersionMismatch;
import ru.bclib.util.ModUtil;
import ru.bclib.util.ModUtil.ModInfo;
import ru.bclib.util.Pair;
import ru.bclib.util.PathUtil;
import ru.bclib.util.ModUtil.ModInfo;
import java.io.File;
import java.io.IOException;

3
src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java
View file

@ -32,12 +32,9 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* API to manage Patches that need to get applied to a world

7
src/main/java/ru/bclib/mixin/common/RecipeManagerMixin.java
View file

@ -1,10 +1,7 @@
package ru.bclib.mixin.common;
import com.google.gson.JsonElement;
import net.minecraft.Util;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.profiling.ProfilerFiller;
import net.minecraft.world.Container;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeManager;
@ -13,10 +10,6 @@ import net.minecraft.world.level.Level;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
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.recipes.BCLRecipeManager;
import java.util.ArrayList;
import java.util.Collection;