mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-12 00:07:37 +00:00
Fix some non-critical errors/warnings, probably didn't break anything
This commit is contained in:
1 parent
6fb3cdf2e1
commit
4eb11ea35d
9 files changed
+11
-18
No files matched your search
@@ -17,7 +17,7 @@ import net.minecraft.world.World;
|
||||
|
||||
public class BlockVoidstone extends Block implements ICarvable{
|
||||
public CarvableHelper carverHelper;
|
||||
public static IIcon iconParticle;
|
||||
public IIcon iconParticle;
|
||||
|
||||
public BlockVoidstone() {
|
||||
super(Material.rock);
|
||||
@@ -30,7 +30,7 @@ public class BlockVoidstone extends Block implements ICarvable{
|
||||
public void registerBlockIcons(IIconRegister icon){
|
||||
iconParticle = icon.registerIcon(Chisel.MOD_ID + ":voidstone/particles/star");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void randomDisplayTick(World world, int x, int y, int z, Random random)
|
||||
{
|
||||
|
||||
@@ -120,8 +120,8 @@ public class TileEntityPresent extends TileEntityChest {
|
||||
if (!worldObj.isRemote && numPlayersUsing != 0 && (+xCoord + yCoord + zCoord) % 200 == 0) {
|
||||
numPlayersUsing = 0;
|
||||
f = 5.0F;
|
||||
List list = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord - f, yCoord - f, zCoord - f, (xCoord + 1) + f, (yCoord + 1) + f, (zCoord + 1) + f));
|
||||
Iterator iterator = list.iterator();
|
||||
List<?> list = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord - f, yCoord - f, zCoord - f, (xCoord + 1) + f, (yCoord + 1) + f, (zCoord + 1) + f));
|
||||
Iterator<?> iterator = list.iterator();
|
||||
|
||||
while (iterator.hasNext()) {
|
||||
EntityPlayer player = (EntityPlayer) iterator.next();
|
||||
|
||||
@@ -287,14 +287,14 @@ public class CarvableHelper
|
||||
registerBlock(block, name, ItemCarvable.class);
|
||||
}
|
||||
|
||||
void registerBlock(Block block, String name, Class cl)
|
||||
void registerBlock(Block block, String name, Class<? extends ItemCarvable> cl)
|
||||
{
|
||||
block.setBlockName(name);
|
||||
GameRegistry.registerBlock(block, cl, name);
|
||||
chiselBlocks.add(block);
|
||||
}
|
||||
|
||||
public void register(Block block, String name, Class cl)
|
||||
public void register(Block block, String name, Class<? extends ItemCarvable> cl)
|
||||
{
|
||||
registerBlock(block, name, cl);
|
||||
|
||||
@@ -417,7 +417,7 @@ public class CarvableHelper
|
||||
}
|
||||
}
|
||||
|
||||
public void registerSubBlocks(Block block, CreativeTabs tabs, List list)
|
||||
public void registerSubBlocks(Block block, CreativeTabs tabs, List<ItemStack> list)
|
||||
{
|
||||
for(CarvableVariation variation : variations)
|
||||
{
|
||||
|
||||
@@ -19,7 +19,7 @@ public class RenderPresent extends TileEntityChestRenderer {
|
||||
private ModelChest doubleChest = new ModelLargeChest();
|
||||
|
||||
//TODO: this will be changed so it actually chescks after I have crate textures :)
|
||||
private boolean isChristmas = true;
|
||||
//private boolean isChristmas = true;
|
||||
|
||||
public RenderPresent() {
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ public class MarbleCompatibility
|
||||
|
||||
abstract class ClassCompat
|
||||
{
|
||||
Class cl;
|
||||
Class<?> cl;
|
||||
|
||||
public ClassCompat(String name)
|
||||
{
|
||||
|
||||
@@ -13,7 +13,7 @@ public class ContainerPresent extends ContainerChest {
|
||||
lower = chest;
|
||||
rows = chest.getSizeInventory() / 9;
|
||||
chest.openInventory();
|
||||
int a = (rows - 4) * 18, b, c;
|
||||
int a = (rows - 4) * 18;
|
||||
|
||||
for (int d = 0; d < rows; d++) {
|
||||
for (int e = 0; e < 9; e++) {
|
||||
|
||||
@@ -29,11 +29,7 @@ public class ItemUpgrade extends Item{
|
||||
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int size, float hitX, float hitY, float hitZ){
|
||||
if(world.isRemote) return false;
|
||||
TileEntity tile = world.getTileEntity(x, y, z);
|
||||
TileEntityAutoChisel autoChisel;
|
||||
|
||||
if(tile != null && tile instanceof TileEntityAutoChisel){
|
||||
TileEntityAutoChisel autoChisel1 = (TileEntityAutoChisel) tile;
|
||||
//TODO: Finish the switch with upgrade
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ import java.util.Random;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
@@ -13,8 +12,6 @@ import net.minecraft.world.World;
|
||||
public class GeneralClient
|
||||
{
|
||||
public static Random rand = new Random();
|
||||
private static EntityItem ghostItem;
|
||||
|
||||
public static void playChiselSound(World world, int x, int y, int z, String sound)
|
||||
{
|
||||
Minecraft.getMinecraft().theWorld.playSound(x + 0.5, y + 0.5, z + 0.5, sound, 0.3f + 0.7f * rand.nextFloat(), 0.6f + 0.4f * rand.nextFloat(), true);
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.network.IGuiHandler;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
|
||||
public abstract class GuiHandler implements Comparable
|
||||
public abstract class GuiHandler implements Comparable<Object>
|
||||
{
|
||||
static ArrayList<GuiHandler> items = new ArrayList<GuiHandler>();
|
||||
|
||||
|
||||
Reference in new issue
Block a user