Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[1.18.x] Allow safely registering RenderType predicates at any time #8671

Merged
merged 2 commits into from
Jun 30, 2022
Merged

[1.18.x] Allow safely registering RenderType predicates at any time #8671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c8842e
Allow safely registering RenderType predicates at any time
XFactHD Jun 6, 2022
db5a8b4
Requested changes
XFactHD Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 55 additions & 14 deletions patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
if (!Minecraft.m_91085_()) {
return Sheets.m_110792_();
} else {
@@ -340,9 +_,70 @@
@@ -340,9 +_,111 @@
}
}

Expand All @@ -55,8 +55,11 @@
+ // FORGE START
+
+ private static final java.util.function.Predicate<RenderType> SOLID_PREDICATE = type -> type == RenderType.m_110451_();
+ // Access to the two following editable maps is guarded by synchronization and they are lazily copied to the "readonly" maps on first read after modification
+ private static final Map<net.minecraftforge.registries.IRegistryDelegate<Block>, java.util.function.Predicate<RenderType>> blockRenderChecks = createRenderCheckMap(f_109275_);
+ private static final Map<net.minecraftforge.registries.IRegistryDelegate<Fluid>, java.util.function.Predicate<RenderType>> fluidRenderChecks = createRenderCheckMap(f_109276_);
+ @org.jetbrains.annotations.Nullable private static volatile Map<net.minecraftforge.registries.IRegistryDelegate<Block>, java.util.function.Predicate<RenderType>> blockRenderChecksReadOnly = null;
+ @org.jetbrains.annotations.Nullable private static volatile Map<net.minecraftforge.registries.IRegistryDelegate<Fluid>, java.util.function.Predicate<RenderType>> fluidRenderChecksReadOnly = null;
+
+ private static <T extends net.minecraftforge.registries.ForgeRegistryEntry<T>> Map<net.minecraftforge.registries.IRegistryDelegate<T>, java.util.function.Predicate<RenderType>> createRenderCheckMap(
+ Map<T, RenderType> vanillaMap
Expand All @@ -74,37 +77,75 @@
+ if (block instanceof LeavesBlock) {
+ return f_109277_ ? type == RenderType.m_110457_() : type == RenderType.m_110451_();
+ } else {
+ return blockRenderChecks.get(block.delegate).test(type);
+ return getBlockLayerPredicates().get(block.delegate).test(type);
+ }
+ }
+
+ public static boolean canRenderInLayer(FluidState fluid, RenderType type) {
+ return fluidRenderChecks.get(fluid.m_76152_().delegate).test(type);
+ return getFluidLayerPredicates().get(fluid.m_76152_().delegate).test(type);
+ }
+
+ public static void setRenderLayer(Block block, RenderType type) {
+ setRenderLayer(block, createMatchingLayerPredicate(type));
+ }
+
+ public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
+ checkClientLoading();
+ blockRenderChecks.put(block.delegate, predicate);
+ public static void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
+ synchronized (blockRenderChecks) {
+ blockRenderChecks.put(block.delegate, predicate);
+ blockRenderChecksReadOnly = null;
+ }
+ }
+
+ public static void setRenderLayer(Fluid fluid, RenderType type) {
+ setRenderLayer(fluid, createMatchingLayerPredicate(type));
+ }
+
+ public static synchronized void setRenderLayer(Fluid fluid, java.util.function.Predicate<RenderType> predicate) {
+ checkClientLoading();
+ fluidRenderChecks.put(fluid.delegate, predicate);
+ public static void setRenderLayer(Fluid fluid, java.util.function.Predicate<RenderType> predicate) {
+ synchronized (fluidRenderChecks) {
+ fluidRenderChecks.put(fluid.delegate, predicate);
+ fluidRenderChecksReadOnly = null;
+ }
+ }
+
+ public static Map<net.minecraftforge.registries.IRegistryDelegate<Block>, java.util.function.Predicate<RenderType>> getBlockLayerPredicatesView() {
+ return java.util.Collections.unmodifiableMap(getBlockLayerPredicates());
+ }
+
+ private static Map<net.minecraftforge.registries.IRegistryDelegate<Block>, java.util.function.Predicate<RenderType>> getBlockLayerPredicates() {
+ Map<net.minecraftforge.registries.IRegistryDelegate<Block>, java.util.function.Predicate<RenderType>> map = blockRenderChecksReadOnly;
+ if (map == null) {
+ synchronized (blockRenderChecks) {
+ map = blockRenderChecksReadOnly;
+ if (map == null) {
+ blockRenderChecksReadOnly = map = copy(blockRenderChecks);
+ }
+ }
+ }
+ return map;
+ }
+
+
+ public static Map<net.minecraftforge.registries.IRegistryDelegate<Fluid>, java.util.function.Predicate<RenderType>> getFluidLayerPredicatesView() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these view methods necessary? The map being wrapped is already a copy, creating an unmodifiable instance seems like unnecessary overhead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These methods only provide a view to prevent callers from modifying the map that may be concurrently accessed by the rendering process.

+ return java.util.Collections.unmodifiableMap(getFluidLayerPredicates());
+ }
+
+ private static Map<net.minecraftforge.registries.IRegistryDelegate<Fluid>, java.util.function.Predicate<RenderType>> getFluidLayerPredicates() {
+ Map<net.minecraftforge.registries.IRegistryDelegate<Fluid>, java.util.function.Predicate<RenderType>> map = fluidRenderChecksReadOnly;
+ if (map == null) {
+ synchronized (fluidRenderChecks) {
+ map = fluidRenderChecksReadOnly;
+ if (map == null) {
+ fluidRenderChecksReadOnly = map = copy(fluidRenderChecks);
+ }
+ }
+ }
+ return map;
+ }
+
+ private static void checkClientLoading() {
+ com.google.common.base.Preconditions.checkState(net.minecraftforge.client.loading.ClientModLoader.isLoading(),
+ "Render layers can only be set during client loading! " +
+ "This might ideally be done from `FMLClientSetupEvent`."
+ );
+ private static <T> Map<net.minecraftforge.registries.IRegistryDelegate<T>, java.util.function.Predicate<RenderType>> copy(Map<net.minecraftforge.registries.IRegistryDelegate<T>, java.util.function.Predicate<RenderType>> map) {
+ var newMap = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(map);
+ newMap.defaultReturnValue(SOLID_PREDICATE);
+ return newMap;
+ }
+
+ private static java.util.function.Predicate<RenderType> createMatchingLayerPredicate(RenderType type) {
Expand Down