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

Merge 1.16 into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-07-17 16:08:27 -04:00
commit 92643a244e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/resources/CachedResourcePath.java
View File

@ -14,7 +14,7 @@ public class CachedResourcePath {
public static final Interner<String> PATH_COMPONENT_INTERNER = Interners.newStrongInterner(); public static final Interner<String> PATH_COMPONENT_INTERNER = Interners.newStrongInterner();
private static final Splitter SLASH_SPLITTER = Splitter.on('/'); private static final Splitter SLASH_SPLITTER = Splitter.on('/');
private static final String[] NO_PREFIX = new String[0]; public static final String[] NO_PREFIX = new String[0];
public CachedResourcePath(String[] prefix, Path path) { public CachedResourcePath(String[] prefix, Path path) {
this(prefix, path, path.getNameCount(), true); this(prefix, path, path.getNameCount(), true);

2
fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -449,7 +449,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
@Redirect(method = "loadModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;")) @Redirect(method = "loadModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;"))
private ImmutableList<BlockState> loadOnlyRelevantBlockState(StateDefinition<Block, BlockState> stateDefinition, ResourceLocation location) { private ImmutableList<BlockState> loadOnlyRelevantBlockState(StateDefinition<Block, BlockState> stateDefinition, ResourceLocation location) {
if(this.inTextureGatheringPass) if(this.inTextureGatheringPass || !(location instanceof ModelResourceLocation))
return stateDefinition.getPossibleStates(); return stateDefinition.getPossibleStates();
else else
return ModelBakeryHelpers.getBlockStatesForMRL(stateDefinition, (ModelResourceLocation)location); return ModelBakeryHelpers.getBlockStatesForMRL(stateDefinition, (ModelResourceLocation)location);

4
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -304,7 +304,9 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
} }
@Redirect(method = "loadModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;")) @Redirect(method = "loadModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition;getPossibleStates()Lcom/google/common/collect/ImmutableList;"))
private ImmutableList<BlockState> loadOnlyRelevantBlockState(StateDefinition<Block, BlockState> stateDefinition, ResourceLocation location) { private ImmutableList<BlockState> loadOnlyRelevantBlockState(StateDefinition<Block, BlockState> stateDefinition, ResourceLocation location) {
return ModelBakeryHelpers.getBlockStatesForMRL(stateDefinition, (ModelResourceLocation)location); if(!(location instanceof ModelResourceLocation))
return stateDefinition.getPossibleStates();
return ModelBakeryHelpers.getBlockStatesForMRL(stateDefinition, (ModelResourceLocation)location);
} }
@Override @Override