FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-07-28 15:09:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge.

Browse source 
Its always checkstyle...
This commit is contained in:
modmuss50 2020-12-23 20:30:07 +00:00
parent f3da4d8bf5
commit 27f445e70d
3 changed files with 1 additions and 3 deletions
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric
impl/resource/loader
FabricModResourcePack.javaModResourcePackUtil.java
mixin/resource/loader
ReloadableResourceManagerImplMixin.java

2
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/FabricModResourcePack.java
View file

@ -23,10 +23,10 @@ import java.nio.file.Files;
import java.util.List;
import com.google.common.base.Charsets;
import net.minecraft.SharedConstants;
import org.apache.commons.io.IOUtils;
import org.jetbrains.annotations.Nullable;
import net.minecraft.SharedConstants;
import net.minecraft.resource.AbstractFileResourcePack;
import net.minecraft.resource.ResourceType;
import net.minecraft.resource.metadata.ResourceMetadataReader;

1
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackUtil.java
View file

@ -38,7 +38,6 @@ import net.fabricmc.loader.api.metadata.ModMetadata;
* Internal utilities for managing resource packs.
*/
public final class ModResourcePackUtil {
private ModResourcePackUtil() {
}

1
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/ReloadableResourceManagerImplMixin.java
View file

@ -32,7 +32,6 @@ import net.minecraft.resource.ReloadableResourceManagerImpl;
import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourceReloadListener;
import net.minecraft.resource.ResourceType;
import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourceReloadMonitor;
import net.minecraft.util.Unit;