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

general Block* code cleanup

Browse source
This commit is contained in:
Sen 2025-05-25 14:45:04 +02:00
parent 7fd8879c73
commit 7299ab8e5c
221 changed files with 1000 additions and 1340 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/client/gui/container/GuiContainer.java
View file

@ -42,7 +42,7 @@ public abstract class GuiContainer extends Gui
private static final List<ItemStack> ITEM_LIST = Lists.<ItemStack>newArrayList();
private static CheatTab selectedTab = CheatTab.tabBlocks;
private static CheatTab selectedTab = CheatTab.BLOCKS;
// /** The location of the inventory background texture */
// protected static final String inventoryBackground = "textures/gui/inventory.png";
@ -1151,7 +1151,7 @@ public abstract class GuiContainer extends Gui
protected void drawTab(CheatTab tab)
{
this.itemRender.zLevel = 100.0F;
ItemStack itemstack = tab.getIconItemStack();
ItemStack itemstack = tab.getIcon();
GlState.enableDepth();
this.itemRender.renderItemAndEffectIntoGUI(itemstack, this.xSize + 2 + 18 * tab.getHorizontal() + 1, 9 * 18 + 4 + 20 * tab.getVertical() + 1);
this.itemRender.zLevel = 0.0F;
@ -1176,7 +1176,7 @@ public abstract class GuiContainer extends Gui
selectedTab = tab;
this.dragSplittingSlots.clear();
ITEM_LIST.clear();
tab.displayAllReleventItems(ITEM_LIST);
tab.filter(ITEM_LIST);
this.currentScroll = 0.0F;
}

2
client/src/client/renderer/BlockRenderer.java
View file

@ -15,12 +15,12 @@ import client.renderer.texture.TextureAtlasSprite;
import client.renderer.texture.TextureMap;
import client.renderer.tileentity.TileEntityItemStackRenderer;
import common.block.Block;
import common.block.Material;
import common.block.liquid.BlockLiquid;
import common.collect.Maps;
import common.init.BlockRegistry;
import common.init.FluidRegistry;
import common.item.ItemStack;
import common.material.Material;
import common.util.BlockPos;
import common.util.ExtMath;
import common.util.Facing;

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

@ -16,6 +16,7 @@ import client.renderer.texture.TextureMap;
import client.world.WorldClient;
import common.biome.Biome;
import common.block.Block;
import common.block.Material;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal;
@ -23,7 +24,6 @@ import common.entity.types.EntityLiving;
import common.init.Blocks;
import common.init.Items;
import common.init.SoundEvent;
import common.material.Material;
import common.model.BlockLayer;
import common.model.ParticleType;
import common.potion.Potion;
@ -1155,7 +1155,7 @@ public class EntityRenderer {
double d3 = this.random.doublev();
double d4 = this.random.doublev();
if (temp >= 194.0f || block.getMaterial() == Material.lava)
if (temp >= 194.0f || block.getMaterial() == Material.LAVA)
{
if(temp >= 194.0f) {
++n;

4
client/src/client/renderer/particle/EntityBubbleFX.java
View file

@ -1,6 +1,6 @@
package client.renderer.particle;
import common.material.Material;
import common.block.Material;
import common.util.BlockPos;
import common.world.World;
@ -35,7 +35,7 @@ public class EntityBubbleFX extends EntityFX
this.motionY *= 0.8500000238418579D;
this.motionZ *= 0.8500000238418579D;
if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.water)
if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.WATER)
{
this.setDead();
}

2
client/src/client/renderer/particle/EntityDownfallFX.java
View file

@ -1,8 +1,8 @@
package client.renderer.particle;
import common.block.Block;
import common.block.Material;
import common.block.liquid.BlockLiquid;
import common.material.Material;
import common.util.BlockPos;
import common.util.ExtMath;
import common.world.State;

16
client/src/client/renderer/particle/EntityDropParticleFX.java
View file

@ -1,7 +1,7 @@
package client.renderer.particle;
import common.block.Material;
import common.block.liquid.BlockLiquid;
import common.material.Material;
import common.model.ParticleType;
import common.util.BlockPos;
import common.util.ExtMath;
@ -21,7 +21,7 @@ public class EntityDropParticleFX extends EntityFX
super(worldIn, xCoordIn, yCoordIn, zCoordIn, 0.0D, 0.0D, 0.0D);
this.motionX = this.motionY = this.motionZ = 0.0D;
if (p_i1203_8_ == Material.water)
if (p_i1203_8_ == Material.WATER)
{
this.particleRed = 0.0F;
this.particleGreen = 0.0F;
@ -45,7 +45,7 @@ public class EntityDropParticleFX extends EntityFX
public int getBrightnessForRender(float partialTicks)
{
return this.materialType == Material.water ? super.getBrightnessForRender(partialTicks) : 257;
return this.materialType == Material.WATER ? super.getBrightnessForRender(partialTicks) : 257;
}
/**
@ -53,7 +53,7 @@ public class EntityDropParticleFX extends EntityFX
*/
public float getBrightness(float partialTicks)
{
return this.materialType == Material.water ? super.getBrightness(partialTicks) : 1.0F;
return this.materialType == Material.WATER ? super.getBrightness(partialTicks) : 1.0F;
}
/**
@ -65,7 +65,7 @@ public class EntityDropParticleFX extends EntityFX
this.prevY = this.posY;
this.prevZ = this.posZ;
if (this.materialType == Material.water)
if (this.materialType == Material.WATER)
{
this.particleRed = 0.2F;
this.particleGreen = 0.3F;
@ -104,7 +104,7 @@ public class EntityDropParticleFX extends EntityFX
if (this.onGround)
{
if (this.materialType == Material.water)
if (this.materialType == Material.WATER)
{
this.setDead();
this.worldObj.spawnParticle(ParticleType.WATER_SPLASH, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D);
@ -144,7 +144,7 @@ public class EntityDropParticleFX extends EntityFX
{
public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_)
{
return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.lava);
return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.LAVA);
}
}
@ -152,7 +152,7 @@ public class EntityDropParticleFX extends EntityFX
{
public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_)
{
return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.water);
return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.WATER);
}
}
}

4
client/src/client/renderer/particle/EntitySuspendFX.java
View file

@ -1,6 +1,6 @@
package client.renderer.particle;
import common.material.Material;
import common.block.Material;
import common.util.BlockPos;
import common.world.World;
@ -31,7 +31,7 @@ public class EntitySuspendFX extends EntityFX
this.prevZ = this.posZ;
this.moveEntity(this.motionX, this.motionY, this.motionZ);
if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.water)
if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.WATER)
{
this.setDead();
}