mirror of
				https://github.com/SquidDev-CC/CC-Tweaked
				synced 2025-11-04 07:32:59 +00:00 
			
		
		
		
	Bump to Forge 1.12.2
Nobody is still using 1.12, so we might as well update to the latest - it makes it easier to test mod compatibility at least.
This commit is contained in:
		@@ -210,7 +210,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
 | 
			
		||||
    private static class TurtleItemColour implements IItemColor
 | 
			
		||||
    {
 | 
			
		||||
        @Override
 | 
			
		||||
        public int getColorFromItemstack( @Nonnull ItemStack stack, int tintIndex )
 | 
			
		||||
        public int colorMultiplier( @Nonnull ItemStack stack, int tintIndex )
 | 
			
		||||
        {
 | 
			
		||||
            if( tintIndex == 0 )
 | 
			
		||||
            {
 | 
			
		||||
 
 | 
			
		||||
@@ -569,7 +569,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        @Override
 | 
			
		||||
        public int getColorFromItemstack( @Nonnull ItemStack stack, int layer )
 | 
			
		||||
        public int colorMultiplier( @Nonnull ItemStack stack, int layer )
 | 
			
		||||
        {
 | 
			
		||||
            return layer == 0 ? 0xFFFFFF : disk.getColour( stack );
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -189,7 +189,7 @@ public final class ModelTransformer
 | 
			
		||||
        private BakedQuadBuilder( VertexFormat format )
 | 
			
		||||
        {
 | 
			
		||||
            this.format = format;
 | 
			
		||||
            this.vertexData = new int[ format.getNextOffset() ];
 | 
			
		||||
            this.vertexData = new int[ format.getSize() ];
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        @Nonnull
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,7 @@ public abstract class BlockGeneric extends Block implements
 | 
			
		||||
    protected BlockGeneric( Material material )
 | 
			
		||||
    {
 | 
			
		||||
        super( material );
 | 
			
		||||
        this.isBlockContainer = true;
 | 
			
		||||
        this.hasTileEntity = true;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected abstract IBlockState getDefaultBlockState( int damage, EnumFacing placedSide );
 | 
			
		||||
 
 | 
			
		||||
@@ -86,7 +86,7 @@ public class ColourableRecipe extends IForgeRegistryEntry.Impl<IRecipe> implemen
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public boolean isHidden()
 | 
			
		||||
    public boolean isDynamic()
 | 
			
		||||
    {
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -91,7 +91,7 @@ public class DiskRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRe
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public boolean isHidden()
 | 
			
		||||
    public boolean isDynamic()
 | 
			
		||||
    {
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -33,7 +33,7 @@ public class PrintoutRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public boolean isHidden()
 | 
			
		||||
    public boolean isDynamic()
 | 
			
		||||
    {
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -34,7 +34,7 @@ public class PocketComputerUpgradeRecipe extends IForgeRegistryEntry.Impl<IRecip
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public boolean isHidden()
 | 
			
		||||
    public boolean isDynamic()
 | 
			
		||||
    {
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -37,7 +37,7 @@ public class TurtleUpgradeRecipe extends IForgeRegistryEntry.Impl<IRecipe> imple
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public boolean isHidden()
 | 
			
		||||
    public boolean isDynamic()
 | 
			
		||||
    {
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -126,22 +126,8 @@ public class WorldUtil
 | 
			
		||||
    }
 | 
			
		||||
    
 | 
			
		||||
    public static Vec3d getRayEnd( EntityPlayer player) {
 | 
			
		||||
        double reach = 4.5;
 | 
			
		||||
        if( player instanceof EntityPlayerMP )
 | 
			
		||||
        {
 | 
			
		||||
            reach = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance();
 | 
			
		||||
        }
 | 
			
		||||
        else if( player.getEntityWorld().isRemote )
 | 
			
		||||
        {
 | 
			
		||||
            reach = Minecraft.getMinecraft().playerController.getBlockReachDistance();
 | 
			
		||||
        }
 | 
			
		||||
        else if( player.capabilities.isCreativeMode )
 | 
			
		||||
        {
 | 
			
		||||
            reach = 5.0;
 | 
			
		||||
        }
 | 
			
		||||
        
 | 
			
		||||
        double reach = player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).getAttributeValue();
 | 
			
		||||
        Vec3d look = player.getLookVec();
 | 
			
		||||
 | 
			
		||||
        return getRayStart( player ).addVector( look.x * reach, look.y * reach, look.z * reach );
 | 
			
		||||
    }
 | 
			
		||||
    
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user