R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.18' into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-04-16 14:45:04 -04:00
commit c090476925
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java
View File

@ -33,12 +33,18 @@ import team.chisel.ctm.client.model.AbstractCTMBakedModel;
import team.chisel.ctm.client.util.CTMPackReloadListener; import team.chisel.ctm.client.util.CTMPackReloadListener;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate; import java.util.function.Predicate;
@Mixin(CTMPackReloadListener.class) @Mixin(CTMPackReloadListener.class)
public abstract class CTMPackReloadListenerMixin { public abstract class CTMPackReloadListenerMixin {
/* caches the original render checks */
@Shadow @Final private static Map<Holder.Reference<Block>, Predicate<RenderType>> blockRenderChecks; @Shadow @Final private static Map<Holder.Reference<Block>, Predicate<RenderType>> blockRenderChecks;
private static Map<Holder.Reference<Block>, Predicate<RenderType>> renderCheckOverrides = new ConcurrentHashMap<>();
private static ChunkRenderTypeSet DEFAULT_TYPE_SET = ChunkRenderTypeSet.of(RenderType.solid());
@Shadow protected abstract Predicate<RenderType> getLayerCheck(BlockState state, BakedModel model); @Shadow protected abstract Predicate<RenderType> getLayerCheck(BlockState state, BakedModel model);
@Shadow protected abstract ChunkRenderTypeSet getExistingRenderCheck(Block block); @Shadow protected abstract ChunkRenderTypeSet getExistingRenderCheck(Block block);
@ -50,8 +56,24 @@ public abstract class CTMPackReloadListenerMixin {
@Overwrite(remap = false) @Overwrite(remap = false)
private void refreshLayerHacks() { private void refreshLayerHacks() {
blockRenderChecks.forEach((b, p) -> ItemBlockRenderTypes.setRenderLayer((Block) b.get(), p)); renderCheckOverrides.clear();
blockRenderChecks.clear(); if(blockRenderChecks.isEmpty()) {
for(Block block : ForgeRegistries.BLOCKS.getValues()) {
Holder.Reference<Block> holder = ForgeRegistries.BLOCKS.getDelegateOrThrow(block);
ChunkRenderTypeSet original = this.getExistingRenderCheck(block);
if(original == null)
original = DEFAULT_TYPE_SET;
blockRenderChecks.put(holder, original::contains);
ItemBlockRenderTypes.setRenderLayer(block, type -> this.useOverrideIfPresent(holder, type));
}
}
}
private boolean useOverrideIfPresent(Holder.Reference<Block> delegate, RenderType type) {
Predicate<RenderType> override = renderCheckOverrides.get(delegate);
if(override == null)
override = blockRenderChecks.get(delegate);
return override.test(type);
} }
private void onModelBake(DynamicModelBakeEvent event) { private void onModelBake(DynamicModelBakeEvent event) {
@ -60,7 +82,7 @@ public abstract class CTMPackReloadListenerMixin {
/* we construct a new ResourceLocation because an MRL is coming in */ /* we construct a new ResourceLocation because an MRL is coming in */
Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath())); Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath()));
Holder.Reference<Block> delegate = block != null ? ForgeRegistries.BLOCKS.getDelegateOrThrow(block) : null; Holder.Reference<Block> delegate = block != null ? ForgeRegistries.BLOCKS.getDelegateOrThrow(block) : null;
if(block == null || block == Blocks.AIR || blockRenderChecks.containsKey(delegate)) if(block == null || block == Blocks.AIR || renderCheckOverrides.containsKey(delegate))
return; return;
/* find all states that match this MRL */ /* find all states that match this MRL */
ImmutableList<BlockState> allStates; ImmutableList<BlockState> allStates;
@ -73,8 +95,7 @@ public abstract class CTMPackReloadListenerMixin {
for(BlockState state : allStates) { for(BlockState state : allStates) {
Predicate<RenderType> newPredicate = this.getLayerCheck(state, event.getModel()); Predicate<RenderType> newPredicate = this.getLayerCheck(state, event.getModel());
if(newPredicate != null) { if(newPredicate != null) {
blockRenderChecks.put(delegate, this.getExistingRenderCheck(block)::contains); renderCheckOverrides.put(delegate, newPredicate);
ItemBlockRenderTypes.setRenderLayer(block, newPredicate);
return; return;
} }
} }

2
src/main/java/org/embeddedt/modernfix/mixin/perf/modern_resourcepacks/PathPackResourcesMixin.java
View File

@ -99,6 +99,8 @@ public abstract class PathPackResourcesMixin {
if(path.getFileName() == null || path.getNameCount() == 0) if(path.getFileName() == null || path.getNameCount() == 0)
return false; return false;
String str = path.toString(); String str = path.toString();
if(str.length() == 0)
return false;
for(int i = 0; i < str.length(); i++) { for(int i = 0; i < str.length(); i++) {
if(!ResourceLocation.validPathChar(str.charAt(i))) { if(!ResourceLocation.validPathChar(str.charAt(i))) {
return false; return false;