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

Merge 1.19.2 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-12-23 21:28:42 -05:00
commit 6ef5654bb6
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/org/embeddedt/modernfix/render/SimpleItemModelView.java
View File

@ -1,6 +1,5 @@
package org.embeddedt.modernfix.render; package org.embeddedt.modernfix.render;
import com.google.common.collect.ImmutableList;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.block.model.ItemOverrides;
@ -42,11 +41,13 @@ public class SimpleItemModelView implements BakedModel {
@Override @Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand) { public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand) {
if(side != null) { boolean isWholeListValid = isCorrectDirectionForType(side);
return isCorrectDirectionForType(side) ? wrappedItem.getQuads(state, side, rand) : ImmutableList.of(); List<BakedQuad> realList = wrappedItem.getQuads(state, side, rand);
} else { if (isWholeListValid) {
return realList;
}
nullQuadList.clear(); nullQuadList.clear();
List<BakedQuad> realList = wrappedItem.getQuads(state, null, rand); //noinspection ForLoopReplaceableByForEach
for(int i = 0; i < realList.size(); i++) { for(int i = 0; i < realList.size(); i++) {
BakedQuad quad = realList.get(i); BakedQuad quad = realList.get(i);
if(isCorrectDirectionForType(quad.getDirection())) { if(isCorrectDirectionForType(quad.getDirection())) {
@ -55,7 +56,6 @@ public class SimpleItemModelView implements BakedModel {
} }
return nullQuadList; return nullQuadList;
} }
}
@Override @Override
public boolean useAmbientOcclusion() { public boolean useAmbientOcclusion() {