sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

cleanup, remove ambient occlusion from models

Browse source
This commit is contained in:
Sen 2025-05-30 18:08:07 +02:00
parent 8e0bbd06c2
commit d1a0847303
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
38 changed files with 175 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/main/java/client/Client.java
View file

@ -167,7 +167,7 @@ import common.util.CharValidator;
import common.util.ExtMath;
import common.util.Facing;
import common.util.HitPosition;
import common.util.LazyLoadBase;
import common.util.LazyLoader;
import common.util.Util;
import common.util.HitPosition.ObjectType;
import common.world.LightType;
@ -268,7 +268,7 @@ public class Client implements IThreadListener {
public static final String VERSION = Version.NAME + " Client " + Util.VERSION;
public static final int LOG_BUFFER = 32768;
private static final LazyLoadBase<NioEventLoopGroup> CLIENT_NIO_EVENTLOOP = new LazyLoadBase<NioEventLoopGroup>()
private static final LazyLoader<NioEventLoopGroup> CLIENT_NIO_EVENTLOOP = new LazyLoader<NioEventLoopGroup>()
{
protected NioEventLoopGroup load()
{

4
client/src/main/java/client/renderer/RenderGlobal.java
View file

@ -46,7 +46,7 @@ import common.tileentity.TileEntity;
import common.tileentity.TileEntityChest;
import common.util.BlockPos;
import common.util.BoundingBox;
import common.util.ClassInheritanceMultiMap;
import common.util.InheritanceMultiMap;
import common.util.ExtMath;
import common.util.Facing;
import common.util.HitPosition;
@ -605,7 +605,7 @@ public class RenderGlobal
for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation : this.renderInfos)
{
ChunkClient chunk = this.theWorld.getChunk(renderglobal$containerlocalrenderinformation.renderChunk.getPosition());
ClassInheritanceMultiMap<Entity> classinheritancemultimap = chunk.getEntities()[ExtMath.clampi(renderglobal$containerlocalrenderinformation.renderChunk.getPosition().getY() / 16, 0, 31)];
InheritanceMultiMap<Entity> classinheritancemultimap = chunk.getEntities()[ExtMath.clampi(renderglobal$containerlocalrenderinformation.renderChunk.getPosition().getY() / 16, 0, 31)];
if (!classinheritancemultimap.isEmpty())
{

11
client/src/main/java/client/renderer/blockmodel/ModelBlock.java
View file

@ -37,7 +37,6 @@ public class ModelBlock extends Model {
private final String[] layers;
private final ModelBlock parent;
private boolean occlusion;
private ModelRotation rotation;
private boolean uvLock;
private Transforms transform;
@ -49,11 +48,6 @@ public class ModelBlock extends Model {
ModelProvider.setProvider(PROVIDER);
}
public ModelBlock noOcclude() {
this.occlusion = false;
return this;
}
public ModelBlock uvLock() {
this.uvLock = true;
return this;
@ -151,7 +145,6 @@ public class ModelBlock extends Model {
layers[z] = layers[z].indexOf('/') == -1 ? "items/" + layers[z] : layers[z];
}
this.elements = parent == null ? elements : parent.getElements();
this.occlusion = parent == null ? occlude : parent.isAmbientOcclusion();
this.gui3d = gui3d;
this.primary = primary == null ? TextureMap.LOCATION_MISSING_TEXTURE : primary;
this.parent = parent;
@ -165,10 +158,6 @@ public class ModelBlock extends Model {
return this.elements;
}
public boolean isAmbientOcclusion() {
return this.occlusion;
}
public boolean isGui3d() {
return this.gui3d;
}