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

misc refactoring

Browse source
This commit is contained in:
Sen 2025-05-14 15:12:11 +02:00
parent eba8f6ea98
commit 10ba39c70b
85 changed files with 512 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,7 @@ import client.window.Wheel;
import client.window.Window;
import client.window.WindowEvent;
import client.world.WorldClient;
import common.biome.BaseBiome;
import common.biome.Biome;
import common.block.Block;
import common.collect.Lists;
import common.collect.Maps;
@ -1730,7 +1730,7 @@ public class Client implements IThreadListener {
break;
}
BaseBiome biome = null;
Biome biome = null;
String bline;
String lline;
if(this.world.isBlockLoaded(blockpos)) {

6
client/src/client/renderer/EntityRenderer.java
View file

@ -14,7 +14,7 @@ import client.renderer.particle.EffectRenderer;
import client.renderer.texture.DynamicTexture;
import client.renderer.texture.TextureMap;
import client.world.WorldClient;
import common.biome.BaseBiome;
import common.biome.Biome;
import common.block.Block;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
@ -1144,7 +1144,7 @@ public class EntityRenderer {
for (int l = 0; l < k; ++l)
{
BlockPos blockpos1 = world.getPrecipitationHeight(blockpos.add(this.random.zrange(i) - this.random.zrange(i), 0, this.random.zrange(i) - this.random.zrange(i)));
BaseBiome biomegenbase = world.getBiomeGenForCoords(blockpos1);
Biome biomegenbase = world.getBiomeGenForCoords(blockpos1);
BlockPos blockpos2 = blockpos1.down();
Block block = world.getState(blockpos2).getBlock();
float temp = World.ABSOLUTE_ZERO + world.getTempOffset() + biomegenbase.getTemperature(blockpos1);
@ -1253,7 +1253,7 @@ public class EntityRenderer {
double d3 = (double)this.rainXCoords[i2] * 0.5D;
double d4 = (double)this.rainYCoords[i2] * 0.5D;
blockpos$mutableblockpos.set(l1, 0, k1);
BaseBiome biomegenbase = world.getBiomeGenForCoords(blockpos$mutableblockpos);
Biome biomegenbase = world.getBiomeGenForCoords(blockpos$mutableblockpos);
// if (biomegenbase.canRain() || biomegenbase.isSnowyBiome())
// {

4
client/src/client/renderer/RegionRenderCache.java
View file

@ -2,7 +2,7 @@ package client.renderer;
import java.util.Arrays;
import common.biome.BaseBiome;
import common.biome.Biome;
import common.init.Blocks;
import common.tileentity.TileEntity;
import common.util.BlockPos;
@ -125,7 +125,7 @@ public class RegionRenderCache extends ChunkCache implements IWorldAccess
return i << 20 | j << 4;
}
public BaseBiome getBiomeGenForCoords(BlockPos pos)
public Biome getBiomeGenForCoords(BlockPos pos)
{
return this.worldObj.getBiomeGenForCoords(pos);
}

4
client/src/client/renderer/blockmodel/ModelBakery.java
View file

@ -15,13 +15,13 @@ import common.collect.Maps;
import common.collect.Sets;
import common.init.BlockRegistry;
import common.init.FluidRegistry;
import common.init.IRegistry;
import common.init.ItemRegistry;
import common.init.RegistrySimple;
import common.item.Item;
import common.item.ItemStack;
import common.model.ModelRotation;
import common.util.Facing;
import common.util.IRegistry;
import common.util.RegistrySimple;
import common.world.State;
public abstract class ModelBakery

2
client/src/client/renderer/blockmodel/ModelManager.java
View file

@ -13,8 +13,8 @@ import common.collect.Maps;
import common.init.BlockRegistry;
import common.init.Blocks;
import common.init.FluidRegistry;
import common.init.IRegistry;
import common.properties.IProperty;
import common.util.IRegistry;
import common.world.State;
public class ModelManager

8
client/src/client/world/WorldClient.java
View file

@ -6,7 +6,7 @@ import java.util.Set;
import client.Client;
import client.renderer.particle.EntityFX;
import client.renderer.particle.EntityFirework;
import common.biome.BaseBiome;
import common.biome.Biome;
import common.block.Block;
import common.collect.Lists;
import common.collect.Sets;
@ -759,7 +759,7 @@ public class WorldClient extends AWorldClient
public Vec3 getSkyColor(Entity entity, float partial) {
BlockPos pos = new BlockPos(ExtMath.floord(entity.posX), ExtMath.floord(entity.posY),
ExtMath.floord(entity.posZ));
BaseBiome biome = this.getBiomeGenForCoords(pos);
Biome biome = this.getBiomeGenForCoords(pos);
Vec3 vec;
if(biome.skyColor != 0xffffffff)
vec = new Vec3(biome.skyColor);
@ -815,7 +815,7 @@ public class WorldClient extends AWorldClient
public Vec3 getCloudColour(Entity entity, float partialTicks) {
Vec3 color = new Vec3(this.dimension.getCloudColor());
BaseBiome biome = this.getBiomeGenForCoords(new BlockPos(ExtMath.floord(entity.posX), ExtMath.floord(entity.posY),
Biome biome = this.getBiomeGenForCoords(new BlockPos(ExtMath.floord(entity.posX), ExtMath.floord(entity.posY),
ExtMath.floord(entity.posZ)));
if(biome.cloudColor != 0xffffffff)
color = new Vec3(biome.cloudColor);
@ -854,7 +854,7 @@ public class WorldClient extends AWorldClient
public Vec3 getFogColor(Entity entity, float partialTicks) {
Vec3 color = new Vec3(this.dimension.getFogColor());
BaseBiome biome = this.getBiomeGenForCoords(new BlockPos(ExtMath.floord(entity.posX), ExtMath.floord(entity.posY),
Biome biome = this.getBiomeGenForCoords(new BlockPos(ExtMath.floord(entity.posX), ExtMath.floord(entity.posY),
ExtMath.floord(entity.posZ)));
if(biome.fogColor != 0xffffffff)
color = new Vec3(biome.fogColor);