diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 75bc654fe7..24b44188e5 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -144,14 +144,6 @@ } } -@@ -779,6 +_,7 @@ - return this.m_168019_(false); - } - -+ @Deprecated // Forge: Use selective refreshResources method in FMLClientHandler - private CompletableFuture m_168019_(boolean p_168020_) { - if (this.f_91024_ != null) { - return this.f_91024_; @@ -876,10 +_,6 @@ f_90982_.error("setScreen called from non-game thread"); } @@ -501,14 +493,6 @@ } } -@@ -2318,6 +_,7 @@ - return f_90981_; - } - -+ @Deprecated // Forge: Use selective scheduleResourceRefresh method in FMLClientHandler - public CompletableFuture m_91088_() { - return this.m_18691_(() -> this.m_91391_()).thenCompose((p_167945_) -> { - return p_167945_; @@ -2768,7 +_,7 @@ return this.f_90993_; } diff --git a/patches/minecraft/net/minecraft/client/gui/screens/LanguageSelectScreen.java.patch b/patches/minecraft/net/minecraft/client/gui/screens/LanguageSelectScreen.java.patch deleted file mode 100644 index fe2b465559..0000000000 --- a/patches/minecraft/net/minecraft/client/gui/screens/LanguageSelectScreen.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/client/gui/screens/LanguageSelectScreen.java -+++ b/net/minecraft/client/gui/screens/LanguageSelectScreen.java -@@ -36,7 +_,7 @@ - if (languageselectscreen$languageselectionlist$entry != null && !languageselectscreen$languageselectionlist$entry.f_96116_.getCode().equals(this.f_96080_.m_118983_().getCode())) { - this.f_96080_.m_118974_(languageselectscreen$languageselectionlist$entry.f_96116_); - this.f_96282_.f_92075_ = languageselectscreen$languageselectionlist$entry.f_96116_.getCode(); -- this.f_96541_.m_91391_(); -+ net.minecraftforge.client.ForgeHooksClient.refreshResources(this.f_96541_, net.minecraftforge.resource.VanillaResourceType.LANGUAGES); - this.f_96282_.m_92169_(); - } - diff --git a/patches/minecraft/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java.patch b/patches/minecraft/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java.patch index 736ebca6fd..4dd1b853d6 100644 --- a/patches/minecraft/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java.patch @@ -18,12 +18,3 @@ } } -@@ -462,7 +_,7 @@ - - languagemanager.m_118974_(languageinfo); - this.f_100272_.f_91066_.f_92075_ = languageinfo.getCode(); -- this.f_100272_.m_91391_(); -+ net.minecraftforge.client.ForgeHooksClient.refreshResources(this.f_100272_, net.minecraftforge.resource.VanillaResourceType.LANGUAGES); - this.f_100272_.f_91066_.m_92169_(); - } - diff --git a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch index cdd538d1fc..b4b34864f8 100644 --- a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch @@ -67,15 +67,3 @@ this.f_109059_.m_91307_().m_6182_("hand"); if (this.f_109070_) { RenderSystem.m_69421_(256, Minecraft.f_91002_); -@@ -1151,6 +_,11 @@ - - public OverlayTexture m_109155_() { - return this.f_109075_; -+ } -+ -+ @Override -+ public net.minecraftforge.resource.IResourceType getResourceType() { -+ return net.minecraftforge.resource.VanillaResourceType.SHADERS; - } - - @Nullable diff --git a/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch index 7f2f71ea59..c6bbbc2a7f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch @@ -198,15 +198,3 @@ if (j < k) { j = k; } -@@ -2748,6 +_,11 @@ - @Nullable - public RenderTarget m_109832_() { - return this.f_109417_; -+ } -+ -+ @Override -+ public net.minecraftforge.resource.IResourceType getResourceType() { -+ return net.minecraftforge.resource.VanillaResourceType.MODELS; - } - - @OnlyIn(Dist.CLIENT) diff --git a/patches/minecraft/net/minecraft/client/renderer/block/BlockRenderDispatcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/BlockRenderDispatcher.java.patch index 2acda8e9d6..3582193ea6 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/BlockRenderDispatcher.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/BlockRenderDispatcher.java.patch @@ -64,14 +64,3 @@ } } -@@ -105,5 +_,10 @@ - - public void m_6213_(ResourceManager p_110909_) { - this.f_110901_.m_110944_(); -+ } -+ -+ @Override -+ public net.minecraftforge.resource.IResourceType getResourceType() { -+ return net.minecraftforge.resource.VanillaResourceType.MODELS; - } - } diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch index a38281a16a..5da41a664d 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/ItemRenderer.java.patch @@ -76,7 +76,7 @@ this.m_115152_(bufferbuilder, p_115177_ + 2, p_115178_ + 13, 13, 2, 0, 0, 0, 255); this.m_115152_(bufferbuilder, p_115177_ + 2, p_115178_ + 13, i, 1, j >> 16 & 255, j >> 8 & 255, j & 255, 255); RenderSystem.m_69478_(); -@@ -377,5 +_,14 @@ +@@ -377,5 +_,9 @@ public void m_6213_(ResourceManager p_115105_) { this.f_115095_.m_109403_(); @@ -84,10 +84,5 @@ + + public BlockEntityWithoutLevelRenderer getBlockEntityRenderer() { + return f_174223_; -+ } -+ -+ @Override -+ public net.minecraftforge.resource.IResourceType getResourceType() { -+ return net.minecraftforge.resource.VanillaResourceType.MODELS; } } diff --git a/patches/minecraft/net/minecraft/client/resources/language/LanguageManager.java.patch b/patches/minecraft/net/minecraft/client/resources/language/LanguageManager.java.patch deleted file mode 100644 index 39db884608..0000000000 --- a/patches/minecraft/net/minecraft/client/resources/language/LanguageManager.java.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/net/minecraft/client/resources/language/LanguageManager.java -+++ b/net/minecraft/client/resources/language/LanguageManager.java -@@ -80,4 +_,9 @@ - public LanguageInfo m_118976_(String p_118977_) { - return this.f_118966_.get(p_118977_); - } -+ -+ @Override -+ public net.minecraftforge.resource.IResourceType getResourceType() { -+ return net.minecraftforge.resource.VanillaResourceType.LANGUAGES; -+ } - } diff --git a/patches/minecraft/net/minecraft/client/searchtree/SearchRegistry.java.patch b/patches/minecraft/net/minecraft/client/searchtree/SearchRegistry.java.patch deleted file mode 100644 index 0d2b47e05b..0000000000 --- a/patches/minecraft/net/minecraft/client/searchtree/SearchRegistry.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/minecraft/client/searchtree/SearchRegistry.java -+++ b/net/minecraft/client/searchtree/SearchRegistry.java -@@ -31,6 +_,11 @@ - return (MutableSearchTree)this.f_119944_.get(p_119950_); - } - -+ @Override -+ public net.minecraftforge.resource.IResourceType getResourceType() { -+ return net.minecraftforge.resource.VanillaResourceType.LANGUAGES; -+ } -+ - @OnlyIn(Dist.CLIENT) - public static class Key { - } diff --git a/patches/minecraft/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java.patch b/patches/minecraft/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java.patch index 0742e14ae2..2ed9ee8ea6 100644 --- a/patches/minecraft/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java.patch +++ b/patches/minecraft/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java.patch @@ -1,22 +1,12 @@ --- a/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java +++ b/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java -@@ -5,6 +_,11 @@ - import net.minecraft.util.Unit; - import net.minecraft.util.profiling.ProfilerFiller; - -+/** -+ * @deprecated Forge: {@link net.minecraftforge.resource.ISelectiveResourceReloadListener}, which selectively allows -+ * individual resource types being reloaded should rather be used where possible. -+ */ -+@Deprecated - public interface ResourceManagerReloadListener extends PreparableReloadListener { - default CompletableFuture m_5540_(PreparableReloadListener.PreparationBarrier p_10752_, ResourceManager p_10753_, ProfilerFiller p_10754_, ProfilerFiller p_10755_, Executor p_10756_, Executor p_10757_) { - return p_10752_.m_6769_(Unit.INSTANCE).thenRunAsync(() -> { -@@ -17,4 +_,9 @@ +@@ -17,4 +_,11 @@ } void m_6213_(ResourceManager p_10758_); + ++ /** @deprecated Selective reloading is no longer supported due to vanilla now reloading resources in parallel, so this is no longer needed */ ++ @Deprecated(since="1.17.1", forRemoval = true) + @javax.annotation.Nullable + default net.minecraftforge.resource.IResourceType getResourceType() { + return null; diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 1dc3051ebc..0d8270d9a2 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -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(); } diff --git a/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java b/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java index 93a05f88f5..caf4630a75 100644 --- a/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java +++ b/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java @@ -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> extends ResourceManagerReloadListener { diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java index d2989461a4..a3a9765dd8 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -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; diff --git a/src/main/java/net/minecraftforge/common/ForgeConfig.java b/src/main/java/net/minecraftforge/common/ForgeConfig.java index d5a4632006..e95013acdb 100644 --- a/src/main/java/net/minecraftforge/common/ForgeConfig.java +++ b/src/main/java/net/minecraftforge/common/ForgeConfig.java @@ -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; diff --git a/src/main/java/net/minecraftforge/resource/IResourceType.java b/src/main/java/net/minecraftforge/resource/IResourceType.java index 87bb2dd1d3..9646fd02d5 100644 --- a/src/main/java/net/minecraftforge/resource/IResourceType.java +++ b/src/main/java/net/minecraftforge/resource/IResourceType.java @@ -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 { } diff --git a/src/main/java/net/minecraftforge/resource/ReloadRequirements.java b/src/main/java/net/minecraftforge/resource/ReloadRequirements.java index f431c381b3..d062ff3244 100644 --- a/src/main/java/net/minecraftforge/resource/ReloadRequirements.java +++ b/src/main/java/net/minecraftforge/resource/ReloadRequirements.java @@ -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 { /** diff --git a/src/main/java/net/minecraftforge/resource/VanillaResourceType.java b/src/main/java/net/minecraftforge/resource/VanillaResourceType.java index 2cfa0f3383..818109fc6d 100644 --- a/src/main/java/net/minecraftforge/resource/VanillaResourceType.java +++ b/src/main/java/net/minecraftforge/resource/VanillaResourceType.java @@ -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 { /**