mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 16:27:47 +00:00
Remove the remnants of the selective reload listener (#8072)
This commit is contained in:
1 parent
dc9a7f6ad5
commit
a784bdb0d0
18 files changed
+16
-131
No files matched your search
@@ -699,6 +699,10 @@ public class ForgeHooksClient
|
||||
MinecraftForge.EVENT_BUS.post(new InputUpdateEvent(player, movementInput));
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated use {@link Minecraft#reloadResourcePacks()} instead
|
||||
*/
|
||||
@Deprecated(since="1.17.1", forRemoval = true)
|
||||
public static void refreshResources(Minecraft mc, VanillaResourceType... types) {
|
||||
mc.reloadResourcePacks();
|
||||
}
|
||||
|
||||
@@ -39,8 +39,6 @@ import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.model.geometry.IModelGeometry;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.resource.IResourceType;
|
||||
import net.minecraftforge.resource.VanillaResourceType;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@@ -48,7 +46,6 @@ import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.ItemOverrides;
|
||||
import net.minecraft.client.resources.model.BakedModel;
|
||||
@@ -192,12 +189,6 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
|
||||
{
|
||||
INSTANCE;
|
||||
|
||||
@Override
|
||||
public IResourceType getResourceType()
|
||||
{
|
||||
return VanillaResourceType.MODELS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResourceManagerReload(ResourceManager resourceManager)
|
||||
{
|
||||
|
||||
@@ -21,13 +21,8 @@ package net.minecraftforge.client.model;
|
||||
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonObject;
|
||||
import net.minecraft.server.packs.resources.ResourceManager;
|
||||
import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
|
||||
import net.minecraftforge.client.model.geometry.IModelGeometry;
|
||||
import net.minecraftforge.resource.IResourceType;
|
||||
import net.minecraftforge.resource.VanillaResourceType;
|
||||
|
||||
import java.util.function.Predicate;
|
||||
|
||||
public interface IModelLoader<T extends IModelGeometry<T>> extends ResourceManagerReloadListener
|
||||
{
|
||||
|
||||
@@ -46,7 +46,6 @@ import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite;
|
||||
import com.mojang.blaze3d.vertex.VertexFormatElement;
|
||||
import net.minecraftforge.client.model.*;
|
||||
import net.minecraftforge.common.model.*;
|
||||
import net.minecraftforge.resource.IResourceType;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.lang3.tuple.Triple;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
|
||||
@@ -113,6 +113,8 @@ public class ForgeConfig {
|
||||
|
||||
public final BooleanValue experimentalForgeLightPipelineEnabled;
|
||||
|
||||
/** @deprecated Selective reloading is no longer supported due to vanilla now reloading resources in parallel */
|
||||
@Deprecated(since="1.17.1", forRemoval = true)
|
||||
public final BooleanValue selectiveResourceReloadEnabled;
|
||||
|
||||
public final BooleanValue showLoadWarnings;
|
||||
|
||||
@@ -21,7 +21,9 @@ package net.minecraftforge.resource;
|
||||
|
||||
/**
|
||||
* Represents a generic type of reloadable resource. Used for resource reload filtering.
|
||||
* @deprecated Selective reloading is no longer supported due to vanilla now reloading resources in parallel
|
||||
*/
|
||||
@Deprecated(since="1.17.1", forRemoval = true)
|
||||
public interface IResourceType
|
||||
{
|
||||
}
|
||||
@@ -29,8 +29,10 @@ import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
/**
|
||||
* Holds methods to create standard predicates to select {@link IResourceType}s that should be reloaded.
|
||||
* @deprecated Selective reloading is no longer supported due to vanilla now reloading resources in parallel
|
||||
*/
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
@Deprecated(since="1.17.1", forRemoval = true)
|
||||
public final class ReloadRequirements
|
||||
{
|
||||
/**
|
||||
|
||||
@@ -22,7 +22,9 @@ package net.minecraftforge.resource;
|
||||
/**
|
||||
* An enum of all {@link IResourceType}s used by the Vanilla game. These should be used if handling vanilla-related
|
||||
* resources.
|
||||
* @deprecated Selective reloading is no longer supported due to vanilla now reloading resources in parallel
|
||||
*/
|
||||
@Deprecated(since="1.17.1", forRemoval = true)
|
||||
public enum VanillaResourceType implements IResourceType
|
||||
{
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user