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

cleanup; remove Block##getRenderType

Browse source
This commit is contained in:
Sen 2025-07-25 10:32:13 +02:00
parent d56f28e6d2
commit af68ad3f30
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
50 changed files with 35 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/common/block/Block.java
View file

@ -1069,10 +1069,6 @@ public class Block {
return light;
}
public int getRenderType() {
return 3;
}
@Clientside
public BlockLayer getRenderLayer() {
return BlockLayer.SOLID;

5
common/src/main/java/common/block/BlockAir.java
View file

@ -1,6 +1,5 @@
package common.block;
import common.item.Item;
import common.util.BlockPos;
import common.util.BoundingBox;
import common.world.State;
@ -11,10 +10,6 @@ public final class BlockAir extends Block {
super(Material.NONE);
}
public int getRenderType() {
return -1;
}
public BoundingBox getCollisionBox(World world, BlockPos pos, State state) {
return null;
}

1
common/src/main/java/common/block/artificial/BlockCarpet.java
View file

@ -6,7 +6,6 @@ import common.color.DyeColor;
import common.item.CheatTab;
import common.model.Model;
import common.model.ModelProvider;
import common.model.GuiPosition;
import common.util.BlockPos;
import common.util.Facing;
import common.world.AWorldServer;

1
common/src/main/java/common/block/artificial/BlockFence.java
View file

@ -8,7 +8,6 @@ import common.collect.Lists;
import common.entity.Entity;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.Item;
import common.item.tool.ItemLead;
import common.model.Model;
import common.model.ModelProvider;

1
common/src/main/java/common/block/artificial/BlockFenceGate.java
View file

@ -11,7 +11,6 @@ import common.item.CheatTab;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;
import common.model.GuiPosition;
import common.properties.Property;
import common.properties.PropertyBool;
import common.util.BlockPos;

1
common/src/main/java/common/block/artificial/BlockFloorPortal.java
View file

@ -8,7 +8,6 @@ import common.block.Block;
import common.block.Material;
import common.collect.Sets;
import common.entity.Entity;
import common.item.Item;
import common.model.Model;
import common.model.ModelProvider;
import common.rng.Random;

1
common/src/main/java/common/block/artificial/BlockFlowerPot.java
View file

@ -10,7 +10,6 @@ import common.entity.npc.EntityNPC;
import common.init.BlockRegistry;
import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.model.BlockLayer;

1
common/src/main/java/common/block/artificial/BlockHay.java
View file

@ -4,7 +4,6 @@ import common.block.BlockRotatedPillar;
import common.block.Material;
import common.entity.types.EntityLiving;
import common.item.CheatTab;
import common.item.ItemStack;
import common.properties.Property;
import common.util.BlockPos;
import common.util.Facing;

1
common/src/main/java/common/block/artificial/BlockMetalBlock.java
View file

@ -11,7 +11,6 @@ import common.block.SoundType;
import common.entity.npc.EntityNPC;
import common.init.MetalType;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
public class BlockMetalBlock extends Block {

4
common/src/main/java/common/block/artificial/BlockPortal.java
View file

@ -1,21 +1,17 @@
package common.block.artificial;
import java.util.List;
import java.util.Map;
import common.block.Block;
import common.block.Material;
import common.block.natural.BlockFire;
import common.collect.Lists;
import common.entity.Entity;
import common.init.Blocks;
import common.item.Item;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;
import common.properties.PropertyEnum;
import common.properties.PropertyInteger;
import common.rng.Random;
import common.util.BlockPos;
import common.util.BoundingBox;

1
common/src/main/java/common/block/artificial/BlockSlab.java
View file

@ -11,7 +11,6 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.init.BlockRegistry;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.model.Model;
import common.model.ModelProvider;

1
common/src/main/java/common/block/artificial/BlockStainedGlassPane.java
View file

@ -3,7 +3,6 @@ package common.block.artificial;
import common.block.Material;
import common.color.DyeColor;
import common.item.CheatTab;
import common.item.Item;
import common.model.BlockLayer;
import common.properties.Property;

1
common/src/main/java/common/block/artificial/BlockTrapDoor.java
View file

@ -11,7 +11,6 @@ import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;
import common.model.GuiPosition;
import common.properties.Property;
import common.properties.PropertyBool;
import common.properties.PropertyEnum;

1
common/src/main/java/common/block/artificial/BlockWall.java
View file

@ -7,7 +7,6 @@ import common.block.Material;
import common.collect.Lists;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;

3
common/src/main/java/common/block/foliage/BlockCarrot.java
View file

@ -1,10 +1,7 @@
package common.block.foliage;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.StackSize;
import common.item.consumable.ItemSeedFood;
import common.model.Model;
import common.model.ModelProvider;
import common.world.State;

2
common/src/main/java/common/block/foliage/BlockCrops.java
View file

@ -7,8 +7,6 @@ import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.item.StackSize;
import common.item.material.ItemSeeds;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

1
common/src/main/java/common/block/foliage/BlockLilyPad.java
View file

@ -23,7 +23,6 @@ import common.util.BlockPos;
import common.util.BoundingBox;
import common.util.Facing;
import common.util.HitPosition;
import common.world.IWorldAccess;
import common.world.State;
import common.world.World;

3
common/src/main/java/common/block/foliage/BlockPotato.java
View file

@ -1,11 +1,8 @@
package common.block.foliage;
import common.init.Blocks;
import common.init.Items;
import common.item.Item;
import common.item.ItemStack;
import common.item.StackSize;
import common.item.consumable.ItemSeedFood;
import common.model.Model;
import common.model.ModelProvider;
import common.util.BlockPos;

2
common/src/main/java/common/block/foliage/BlockReed.java
View file

@ -3,7 +3,6 @@ package common.block.foliage;
import common.block.Block;
import common.block.Material;
import common.init.Blocks;
import common.item.Item;
import common.item.StackSize;
import common.model.BlockLayer;
import common.model.Model;
@ -16,7 +15,6 @@ import common.util.BlockPos;
import common.util.BoundingBox;
import common.util.Facing;
import common.vars.Vars;
import common.world.IWorldAccess;
import common.world.State;
import common.world.World;
import common.world.AWorldServer;

3
common/src/main/java/common/block/foliage/BlockStem.java
View file

@ -4,10 +4,7 @@ import common.block.Block;
import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.item.StackSize;
import common.item.material.ItemSeeds;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

3
common/src/main/java/common/block/foliage/BlockWart.java
View file

@ -5,10 +5,7 @@ import common.block.Material;
import common.init.Blocks;
import common.init.Items;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.item.StackSize;
import common.item.material.ItemSeeds;
import common.model.Model;
import common.model.ModelProvider;
import common.properties.Property;

8
common/src/main/java/common/block/liquid/BlockLiquid.java
View file

@ -136,14 +136,6 @@ public abstract class BlockLiquid extends Block
return null;
}
/**
* The type of render function called. 3 for standard block models, 2 for TESR's, 1 for liquids, -1 is no render
*/
public int getRenderType()
{
return 1;
}
/**
* Get the Item that this Block should drop when harvested.
*/

2
common/src/main/java/common/block/natural/BlockFire.java
View file

@ -5,9 +5,7 @@ import java.util.Map;
import common.block.Block;
import common.block.Material;
import common.block.artificial.BlockPortal;
import common.init.Blocks;
import common.init.SoundEvent;
import common.item.Item;
import common.model.BlockLayer;
import common.model.Model;
import common.model.ModelProvider;

1
common/src/main/java/common/block/natural/BlockMetalOre.java
View file

@ -8,7 +8,6 @@ import common.attributes.UsageSlot;
import common.block.SoundType;
import common.entity.npc.EntityNPC;
import common.init.MetalType;
import common.item.Item;
import common.item.ItemStack;
public class BlockMetalOre extends BlockOre {

1
common/src/main/java/common/block/natural/BlockSnow.java
View file

@ -10,7 +10,6 @@ import common.item.Item;
import common.item.ItemStack;
import common.model.Model;
import common.model.ModelProvider;
import common.model.GuiPosition;
import common.properties.Property;
import common.properties.PropertyInteger;
import common.rng.Random;

2
common/src/main/java/common/block/tile/BlockSign.java → common/src/main/java/common/block/tech/BlockSign.java
View file

@ -1,4 +1,4 @@
package common.block.tile;
package common.block.tech;
import common.block.Block;
import common.block.ITileEntityProvider;

5
common/src/main/java/common/block/tile/BlockStandingSign.java → common/src/main/java/common/block/tech/BlockStandingSign.java
View file

@ -1,20 +1,17 @@
package common.block.tile;
package common.block.tech;
import common.block.Block;
import common.block.Rotatable;
import common.entity.npc.EntityNPC;
import common.init.Blocks;
import common.item.CheatTab;
import common.item.ItemStack;
import common.model.Model;
import common.model.ModelProvider;
import common.model.ModelRotation;
import common.properties.PropertyInteger;
import common.tileentity.TileEntity;
import common.tileentity.TileEntitySign;
import common.util.BlockPos;
import common.util.Clientside;
import common.util.ExtMath;
import common.util.Facing;
import common.world.AWorldServer;
import common.world.IWorldAccess;

1
common/src/main/java/common/block/tech/BlockTNT.java
View file

@ -2,7 +2,6 @@ package common.block.tech;
import common.block.Block;
import common.block.Material;
import common.color.DyeColor;
import common.color.TextColor;
import common.entity.Entity;
import common.entity.item.EntityTnt;

2
common/src/main/java/common/block/tile/BlockWallSign.java → common/src/main/java/common/block/tech/BlockWallSign.java
View file

@ -1,4 +1,4 @@
package common.block.tile;
package common.block.tech;
import common.block.Block;
import common.block.Rotatable;

1
common/src/main/java/common/dimension/Semi.java
View file

@ -1,6 +1,5 @@
package common.dimension;
import common.block.Block;
import common.world.State;
public final class Semi extends Dimension {

3
common/src/main/java/common/entity/Entity.java
View file

@ -10,7 +10,6 @@ import common.block.artificial.BlockFenceGate;
import common.block.artificial.BlockWall;
import common.block.liquid.BlockLiquid;
import common.color.TextColor;
import common.dimension.DimType;
import common.dimension.Dimension;
import common.dimension.Space;
import common.enchantment.Enchantment;
@ -1042,7 +1041,7 @@ public abstract class Entity
State iblockstate = this.worldObj.getState(blockpos);
Block block = iblockstate.getBlock();
if (block.getRenderType() != -1)
if (block != Blocks.air)
{
this.worldObj.clientParticle(ParticleType.BLOCK_CRACK, this.posX + ((double)this.rand.floatv() - 0.5D) * (double)this.width, this.getEntityBoundingBox().minY + 0.1D, this.posZ + ((double)this.rand.floatv() - 0.5D) * (double)this.width, BlockRegistry.getId(iblockstate));
}

4
common/src/main/java/common/init/BlockRegistry.java
View file

@ -113,6 +113,7 @@ import common.block.tech.BlockPistonHead;
import common.block.tech.BlockPressurePlate;
import common.block.tech.BlockPressurePlateWeighted;
import common.block.tech.BlockRail;
import common.block.tech.BlockStandingSign;
import common.block.tech.BlockToggleableLight;
import common.block.tech.BlockLitTorch;
import common.block.tech.BlockWire;
@ -121,10 +122,9 @@ import common.block.tech.BlockTianReactor;
import common.block.tech.BlockTripWire;
import common.block.tech.BlockTripWireHook;
import common.block.tech.BlockUnlitTorch;
import common.block.tech.BlockWallSign;
import common.block.tech.BlockWarpChest;
import common.block.tech.BlockWorkbench;
import common.block.tile.BlockStandingSign;
import common.block.tile.BlockWallSign;
import common.collect.BiMap;
import common.collect.HashBiMap;
import common.collect.Lists;

1
common/src/main/java/common/init/Blocks.java
View file

@ -13,7 +13,6 @@ import common.block.foliage.*;
import common.block.liquid.*;
import common.block.natural.*;
import common.block.tech.*;
import common.block.tile.*;
import common.collect.Lists;
import common.collect.Sets;
import common.util.Util;

1
common/src/main/java/common/item/consumable/ItemSeedFood.java
View file

@ -3,7 +3,6 @@ package common.item.consumable;
import common.block.Block;
import common.block.foliage.BlockCrops;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.ItemStack;
import common.util.BlockPos;
import common.util.Facing;