mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-21 12:42:57 +00:00
cleanup after enabling modern & generic. Primarily changing raw lists to their correct type, changing to pattern variable & enhanced switch and removing unused/unreachable code + ancient comments.
This commit is contained in:
1 parent
e7dc1d9bd4
commit
a5bec6c22b
52 files changed
+273
-489
No files matched your search
@@ -39,8 +39,8 @@ public class SlabBase extends MantleBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist,
|
||||
Entity entity) {
|
||||
public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb,
|
||||
List<AxisAlignedBB> arraylist, Entity entity) {
|
||||
setBlockBoundsBasedOnState(world, x, y, z);
|
||||
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity);
|
||||
}
|
||||
@@ -84,7 +84,7 @@ public class SlabBase extends MantleBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(Item id, CreativeTabs tab, List list) {
|
||||
public void getSubBlocks(Item id, CreativeTabs tab, List<ItemStack> list) {
|
||||
for (int iter = 0; iter < totalSize; iter++) {
|
||||
list.add(new ItemStack(id, 1, iter));
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ public class TConstructBlock extends MantleBlock {
|
||||
|
||||
// TODO getSubBlocks
|
||||
@Override
|
||||
public void getSubBlocks(Item block, CreativeTabs tab, List list) {
|
||||
public void getSubBlocks(Item block, CreativeTabs tab, List<ItemStack> list) {
|
||||
for (int iter = 0; iter < icons.length; iter++) {
|
||||
list.add(new ItemStack(block, 1, iter));
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import java.util.Random;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
@@ -58,5 +59,5 @@ public class SlimeFluid extends BlockFluidClassic {
|
||||
}
|
||||
}
|
||||
|
||||
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) {}
|
||||
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {}
|
||||
}
|
||||
@@ -70,7 +70,7 @@ public class SlimeGel extends TConstructBlock {
|
||||
/**
|
||||
* returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
|
||||
*/
|
||||
public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
|
||||
par3List.add(new ItemStack(b, 1, 0));
|
||||
par3List.add(new ItemStack(b, 1, 1));
|
||||
// par3List.add(new ItemStack(par1, 1, 2));
|
||||
|
||||
@@ -72,7 +72,7 @@ public class SlimeGrass extends MantleBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(Item b, CreativeTabs tab, List list) {
|
||||
public void getSubBlocks(Item b, CreativeTabs tab, List<ItemStack> list) {
|
||||
for (int iter = 0; iter < 1; iter++) {
|
||||
list.add(new ItemStack(b, 1, iter));
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ public class SlimeLeaves extends BlockLeaves {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(Item id, CreativeTabs tab, List list) {
|
||||
public void getSubBlocks(Item id, CreativeTabs tab, List<ItemStack> list) {
|
||||
for (int iter = 0; iter < leaves[0].length; iter++) {
|
||||
list.add(new ItemStack(id, 1, iter));
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ public class SlimeSapling extends BlockSapling {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
|
||||
for (int i = 0; i < 1; i++) par3List.add(new ItemStack(par1, 1, i));
|
||||
}
|
||||
}
|
||||
@@ -72,7 +72,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable {
|
||||
/**
|
||||
* returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
|
||||
*/
|
||||
public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
|
||||
for (int j = 0; j < 1; ++j) {
|
||||
par3List.add(new ItemStack(b, 1, j));
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ public class Landmine extends MantleBlock {
|
||||
boolean var5 = world.getBlockMetadata(posX, posY, posZ) == 1;
|
||||
boolean var6 = false;
|
||||
float var7 = 0.125F;
|
||||
List<Entity> var8 = null;
|
||||
List<? extends Entity> var8 = null;
|
||||
|
||||
if (this.triggerMobType == EnumCreatureType.creature) {
|
||||
var8 = world.getEntitiesWithinAABBExcludingEntity(
|
||||
|
||||
Reference in new issue
Block a user